Source: dssp Version: 3.0.0-1 Severity: wishlist Tags: patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Dear Maintainer, as part of transition to boost1.65 dssp will start to FTBFS. Please see that attached patch. Regards, Dimitri. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJZ+ORGAAoJEMrC2LnNLKX5GJEH/1eSw7k9gS1W1N8f3mFCC5XI 8QZWiJgsAIOLgMu5x7YdfRmoDZIAbTg8MoYNndtYnuQiZ60k9OqSJFVR53EHRsGd tZQsaPMCZTdPVBwNpErnm7U2h93BBd2MVefnjbx6hSyOVAtEHuxpw/ynX/Tpefqz TeBMY0eQ80blHBTfxJTMWbfjgMeO3pP0iJ3AN2+EmwqafjqWTRuAwQq8G+Xn5DLg klFdc5jBH+XmtsWitQQHfTNWJi5o2AkefPzpgsmYCi8X66F+TQPL9ZveZfDKCrsv SCaOOt2OrJO4+bRFYiVS81kLWPMXUErJ8cU2vB75L7QY4wsy9mUt3Ze2iuVlnWA= =sNG7 -----END PGP SIGNATURE-----
Description: Use C++11 tuple, boost1.65 has removed the TR1 library. Author: Dimitri John Ledkov <x...@ubuntu.com> --- a/src/dssp.cpp +++ b/src/dssp.cpp @@ -73,7 +73,7 @@ double alpha; char chirality; - std::tr1::tie(alpha,chirality) = residue.Alpha(); + std::tie(alpha,chirality) = residue.Alpha(); uint32 bp[2] = {}; char bridgelabel[2] = { ' ', ' ' }; --- a/src/primitives-3d.cpp +++ b/src/primitives-3d.cpp @@ -152,7 +152,7 @@ // -------------------------------------------------------------------- -std::tr1::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q) +std::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q) { if (q.R_component_1() > 1) q = Normalize(q); @@ -168,7 +168,7 @@ MPoint axis(q.R_component_2() / s, q.R_component_3() / s, q.R_component_4() / s); - return std::tr1::make_tuple(angle, axis); + return std::make_tuple(angle, axis); } MPoint CenterPoints(std::vector<MPoint>& points) --- a/src/primitives-3d.h +++ b/src/primitives-3d.h @@ -12,8 +12,8 @@ #pragma once #include <boost/math/quaternion.hpp> -#include <boost/tr1/tuple.hpp> +#include <tuple> #include <vector> typedef boost::math::quaternion<double> MQuaternion; @@ -71,7 +71,7 @@ MQuaternion Normalize(MQuaternion q); -std::tr1::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q); +std::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q); MPoint Centroid(std::vector<MPoint>& points); MPoint CenterPoints(std::vector<MPoint>& points); MQuaternion AlignPoints(const std::vector<MPoint>& a, --- a/src/structure.cpp +++ b/src/structure.cpp @@ -554,7 +554,7 @@ return result; } -std::tr1::tuple<double,char> MResidue::Alpha() const +std::tuple<double,char> MResidue::Alpha() const { double alhpa = 360; char chirality = ' '; @@ -571,7 +571,7 @@ else chirality = '+'; } - return std::tr1::make_tuple(alhpa, chirality); + return std::make_tuple(alhpa, chirality); } double MResidue::Kappa() const --- a/src/structure.h +++ b/src/structure.h @@ -171,7 +171,7 @@ double Phi() const; double Psi() const; - std::tr1::tuple<double,char> + std::tuple<double,char> Alpha() const; double Kappa() const; double TCO() const;