Browse Source

fix namespace/include order errors

Former-commit-id: c2b6e8b85cb98a15ba7236e3524d4de422eadc53
Alec Jacobson 8 years ago
parent
commit
0667cbcb2a

+ 3 - 3
include/igl/active_set.cpp

@@ -170,10 +170,10 @@ IGL_INLINE igl::SolverStatus igl::active_set(
       old_Z = Z;
       old_Z = Z;
     }
     }
 
 
-    const int as_lx_count = count(as_lx.data(),as_lx.data()+n,TRUE);
-    const int as_ux_count = count(as_ux.data(),as_ux.data()+n,TRUE);
+    const int as_lx_count = std::count(as_lx.data(),as_lx.data()+n,TRUE);
+    const int as_ux_count = std::count(as_ux.data(),as_ux.data()+n,TRUE);
     const int as_ieq_count =
     const int as_ieq_count =
-      count(as_ieq.data(),as_ieq.data()+as_ieq.size(),TRUE);
+      std::count(as_ieq.data(),as_ieq.data()+as_ieq.size(),TRUE);
 #ifndef NDEBUG
 #ifndef NDEBUG
     {
     {
       int count = 0;
       int count = 0;

+ 6 - 6
include/igl/flip_avoiding_line_search.cpp

@@ -82,8 +82,8 @@ namespace igl
       assert (std::isfinite(t1));
       assert (std::isfinite(t1));
       assert (std::isfinite(t2));
       assert (std::isfinite(t2));
 
 
-      double tmp_n = min(t1,t2);
-      t1 = max(t1,t2); t2 = tmp_n;
+      double tmp_n = std::min(t1,t2);
+      t1 = std::max(t1,t2); t2 = tmp_n;
       if (t1 == t2)
       if (t1 == t2)
       {
       {
         return INFINITY; // means the orientation flips twice = doesn't flip
         return INFINITY; // means the orientation flips twice = doesn't flip
@@ -251,7 +251,7 @@ namespace igl
           return (res[0] >= 0) ? res[0]:INFINITY;
           return (res[0] >= 0) ? res[0]:INFINITY;
         case 2:
         case 2:
         {
         {
-          double max_root = max(res[0],res[1]); double min_root = min(res[0],res[1]);
+          double max_root = std::max(res[0],res[1]); double min_root = std::min(res[0],res[1]);
           if (min_root > 0) return min_root;
           if (min_root > 0) return min_root;
           if (max_root > 0) return max_root;
           if (max_root > 0) return max_root;
           return INFINITY;
           return INFINITY;
@@ -281,7 +281,7 @@ namespace igl
         for (int f = 0; f < F.rows(); f++)
         for (int f = 0; f < F.rows(); f++)
         {
         {
           double min_positive_root = get_min_pos_root_2D(uv,F,d,f);
           double min_positive_root = get_min_pos_root_2D(uv,F,d,f);
-          max_step = min(max_step, min_positive_root);
+          max_step = std::min(max_step, min_positive_root);
         }
         }
       }
       }
       else
       else
@@ -289,7 +289,7 @@ namespace igl
         for (int f = 0; f < F.rows(); f++)
         for (int f = 0; f < F.rows(); f++)
         {
         {
           double min_positive_root = get_min_pos_root_3D(uv,F,d,f);
           double min_positive_root = get_min_pos_root_3D(uv,F,d,f);
-          max_step = min(max_step, min_positive_root);
+          max_step = std::min(max_step, min_positive_root);
         }
         }
       }
       }
       return max_step;
       return max_step;
@@ -308,7 +308,7 @@ IGL_INLINE double igl::flip_avoiding_line_search(
   Eigen::MatrixXd d = dst_v - cur_v;
   Eigen::MatrixXd d = dst_v - cur_v;
 
 
   double min_step_to_singularity = igl::flip_avoiding::compute_max_step_from_singularities(cur_v,F,d);
   double min_step_to_singularity = igl::flip_avoiding::compute_max_step_from_singularities(cur_v,F,d);
-  double max_step_size = min(1., min_step_to_singularity*0.8);
+  double max_step_size = std::min(1., min_step_to_singularity*0.8);
 
 
   return igl::line_search(cur_v,d,max_step_size, energy, cur_energy);
   return igl::line_search(cur_v,d,max_step_size, energy, cur_energy);
 }
 }

+ 4 - 4
include/igl/line_segment_in_rectangle.cpp

@@ -94,10 +94,10 @@ IGL_INLINE bool igl::line_segment_in_rectangle(
 
 
     return true;
     return true;
   };
   };
-  const double minX = min(A(0),B(0));
-  const double minY = min(A(1),B(1));
-  const double maxX = max(A(0),B(0));
-  const double maxY = max(A(1),B(1));
+  const double minX = std::min(A(0),B(0));
+  const double minY = std::min(A(1),B(1));
+  const double maxX = std::max(A(0),B(0));
+  const double maxY = std::max(A(1),B(1));
   bool ret = SegmentIntersectRectangle(minX,minY,maxX,maxY,s(0),s(1),d(0),d(1));
   bool ret = SegmentIntersectRectangle(minX,minY,maxX,maxY,s(0),s(1),d(0),d(1));
   return ret;
   return ret;
 }
 }

+ 1 - 1
include/igl/remove_unreferenced.cpp

@@ -45,7 +45,7 @@ IGL_INLINE void igl::remove_unreferenced(
   const size_t n = V.rows();
   const size_t n = V.rows();
   remove_unreferenced(n,F,I,J);
   remove_unreferenced(n,F,I,J);
   NF = F;
   NF = F;
-  for_each(NF.data(),NF.data()+NF.size(),
+  std::for_each(NF.data(),NF.data()+NF.size(),
     [&I](typename DerivedNF::Scalar & a){a=I(a);});
     [&I](typename DerivedNF::Scalar & a){a=I(a);});
   slice(V,J,1,NV);
   slice(V,J,1,NV);
 }
 }

+ 3 - 2
include/igl/swept_volume_signed_distance.cpp

@@ -16,6 +16,7 @@
 #include "per_edge_normals.h"
 #include "per_edge_normals.h"
 #include <Eigen/Geometry>
 #include <Eigen/Geometry>
 #include <cmath>
 #include <cmath>
+#include <algorithm>
 
 
 IGL_INLINE void igl::swept_volume_signed_distance(
 IGL_INLINE void igl::swept_volume_signed_distance(
   const Eigen::MatrixXd & V,
   const Eigen::MatrixXd & V,
@@ -80,7 +81,7 @@ IGL_INLINE void igl::swept_volume_signed_distance(
         pseudonormal_test(V,F,FN,VN,EN,EMAP,gv,i,c,s,n);
         pseudonormal_test(V,F,FN,VN,EN,EMAP,gv,i,c,s,n);
         if(S(g) == S(g))
         if(S(g) == S(g))
         {
         {
-          S(g) = min(S(g),s*sqrt(sqrd));
+          S(g) = std::min(S(g),s*sqrt(sqrd));
         }else
         }else
         {
         {
           S(g) = s*sqrt(sqrd);
           S(g) = s*sqrt(sqrd);
@@ -96,7 +97,7 @@ IGL_INLINE void igl::swept_volume_signed_distance(
   {
   {
 #ifndef NDEBUG
 #ifndef NDEBUG
     // Check for nans
     // Check for nans
-    for_each(S.data(),S.data()+S.size(),[](const double s){assert(s==s);});
+    std::for_each(S.data(),S.data()+S.size(),[](const double s){assert(s==s);});
 #endif
 #endif
   }
   }
 }
 }