浏览代码

warnings

Former-commit-id: 8650c15bcecfd6c4f3d793186308eab3aa84fe47
Alec Jacobson 9 年之前
父节点
当前提交
4d773331ee
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5 0
      include/igl/Singular_Value_Decomposition_Preamble.hpp
  2. 1 1
      include/igl/polar_svd3x3.cpp

+ 5 - 0
include/igl/Singular_Value_Decomposition_Preamble.hpp

@@ -19,6 +19,11 @@
 #include <iostream>
 #include <iostream>
 #endif
 #endif
 
 
+// Prevent warnings
+#ifdef ENABLE_SCALAR_IMPLEMENTATION
+#  undef ENABLE_SCALAR_IMPLEMENTATION
+#endif
+
 #ifdef USE_SCALAR_IMPLEMENTATION
 #ifdef USE_SCALAR_IMPLEMENTATION
 #define ENABLE_SCALAR_IMPLEMENTATION(X) X
 #define ENABLE_SCALAR_IMPLEMENTATION(X) X
 #else
 #else

+ 1 - 1
include/igl/polar_svd3x3.cpp

@@ -85,7 +85,7 @@ IGL_INLINE void igl::polar_svd3x3_avx(const Eigen::Matrix<T, 3*8, 3>& A, Eigen::
     Eigen::Matrix3f Rpart_SSE = R.block(3*k, 0, 3, 3);
     Eigen::Matrix3f Rpart_SSE = R.block(3*k, 0, 3, 3);
     Eigen::Matrix3f diff = Rpart - Rpart_SSE;
     Eigen::Matrix3f diff = Rpart - Rpart_SSE;
     float diffNorm = diff.norm();
     float diffNorm = diff.norm();
-    if (abs(diffNorm) > 0.001)
+    if (std::abs(diffNorm) > 0.001)
     {
     {
       printf("Huh: diffNorm = %15f (k = %i)\n", diffNorm, k);
       printf("Huh: diffNorm = %15f (k = %i)\n", diffNorm, k);
     }
     }