Browse Source

Merge branch 'master' of https://github.com/libigl/libigl

# Conflicts:
#	external/tetgen
#	external/tinyxml2
#	external/triangle


Former-commit-id: fc6f2ebdede0ba109a933eb7dac4a384e319332d
Daniele Panozzo 9 years ago
parent
commit
cf69d52aaf

+ 2 - 2
include/igl/bbw/bbw.h

@@ -51,9 +51,9 @@ namespace igl
         // 2: louder
         int verbosity;
       public:
-        BBWData();
+        inline BBWData();
         // Print current state of object
-        void print();
+        inline void print();
     };
 
     // Compute Bounded Biharmonic Weights on a given domain (V,Ele) with a given

+ 1 - 1
include/igl/copyleft/cgal/RemeshSelfIntersectionsParam.h

@@ -21,7 +21,7 @@ namespace igl
         bool detect_only;
         bool first_only;
         bool stitch_all;
-        RemeshSelfIntersectionsParam(
+        inline RemeshSelfIntersectionsParam(
           bool _detect_only=false, 
           bool _first_only=false,
           bool _stitch_all=false):

+ 1 - 0
include/igl/matlab/prepare_lhs.h

@@ -10,6 +10,7 @@
 #include <igl/igl_inline.h>
 #include <mex.h>
 #include <Eigen/Dense>
+#include <Eigen/Sparse>
 namespace igl
 {
   namespace matlab

+ 1 - 1
include/igl/mosek/mosek_quadprog.h

@@ -28,7 +28,7 @@ namespace igl
       // Double parameters
       std::map<MSKdparame,double> douparam;
       // Default values
-      MosekData();
+      inline MosekData();
     };
     // Solve a convex quadratic optimization problem with linear and constant
     // bounds, that is: