1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
|
Description: Use C++11 tuple, boost1.65 has removed the TR1 library.
Author: Dimitri John Ledkov <xnox@ubuntu.com>
Debian-Bug: https://bugs.debian.org/880465
--- 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;
|