Advertisement
Guest User

Untitled

a guest
Mar 13th, 2018
122
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 2.15 KB | None | 0 0
  1. --- a/src/dssp.cpp
  2. +++ b/src/dssp.cpp
  3. @@ -73,7 +73,7 @@
  4.  
  5.     double alpha;
  6.     char chirality;
  7. -   tr1::tie(alpha,chirality) = residue.Alpha();
  8. +   boost::tie(alpha,chirality) = residue.Alpha();
  9.  
  10.     uint32 bp[2] = {};
  11.     char bridgelabel[2] = { ' ', ' ' };
  12. --- a/src/primitives-3d.cpp
  13. +++ b/src/primitives-3d.cpp
  14. @@ -153,7 +153,7 @@
  15.  
  16.  // --------------------------------------------------------------------
  17.  
  18. -tr1::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q)
  19. +boost::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q)
  20.  {
  21.     if (q.R_component_1() > 1)
  22.         q = Normalize(q);
  23. @@ -169,7 +169,7 @@
  24.  
  25.     MPoint axis(q.R_component_2() / s, q.R_component_3() / s, q.R_component_4() / s);
  26.  
  27. -   return tr1::make_tuple(angle, axis);
  28. +   return boost::make_tuple(angle, axis);
  29.  }
  30.  
  31.  MPoint CenterPoints(vector<MPoint>& points)
  32. --- a/src/primitives-3d.h
  33. +++ b/src/primitives-3d.h
  34. @@ -9,7 +9,7 @@
  35.  
  36.  #include <vector>
  37.  
  38. -#include <boost/tr1/tuple.hpp>
  39. +#include <boost/tuple/tuple.hpp>
  40.  #include <boost/math/quaternion.hpp>
  41.  
  42.  typedef boost::math::quaternion<double> MQuaternion;
  43. @@ -64,7 +64,7 @@
  44.  
  45.  MQuaternion Normalize(MQuaternion q);
  46.  
  47. -std::tr1::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q);
  48. +boost::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q);
  49.  MPoint Centroid(std::vector<MPoint>& points);
  50.  MPoint CenterPoints(std::vector<MPoint>& points);
  51.  MQuaternion AlignPoints(const std::vector<MPoint>& a, const std::vector<MPoint>& b);
  52. --- a/src/structure.cpp
  53. +++ b/src/structure.cpp
  54. @@ -544,7 +544,7 @@
  55.     return result;
  56.  }
  57.  
  58. -tr1::tuple<double,char> MResidue::Alpha() const
  59. +boost::tuple<double,char> MResidue::Alpha() const
  60.  {
  61.     double alhpa = 360;
  62.     char chirality = ' ';
  63. @@ -558,7 +558,7 @@
  64.         else
  65.             chirality = '+';
  66.     }
  67. -   return tr1::make_tuple(alhpa, chirality);
  68. +   return boost::make_tuple(alhpa, chirality);
  69.  }
  70.  
  71.  double MResidue::Kappa() const
  72. --- a/src/structure.h
  73. +++ b/src/structure.h
  74. @@ -168,7 +168,7 @@
  75.  
  76.     double              Phi() const;
  77.     double              Psi() const;
  78. -   std::tr1::tuple<double,char>
  79. +   boost::tuple<double,char>
  80.                         Alpha() const;
  81.     double              Kappa() const;
  82.     double              TCO() const;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement