Merge commit '756687b56dabf2b3a97122451418a7537c3040bc [formerly 3efe381b5a07304c05b5e78971b40d2019d40f31]'

# Conflicts:
#	external/tetgen
#	external/tinyxml2
#	external/triangle
#	include/igl/bbw/bbw.h


Former-commit-id: 780d36ad00d621f96b0e23c12a6870ea68857d00

include/igl/bbw/bbw.cpp

@@ -19,6 +19,20 @@
 #include <iostream>
 #include <cstdio>
 
+igl::bbw::BBWData::BBWData():
+  partition_unity(false),
+  W0(),
+#ifndef IGL_NO_MOSEK
+  mosek_data(),
+#endif
+  active_set_params(),
+  qp_solver(QP_SOLVER_IGL_ACTIVE_SET),
+  verbosity(0)
+{
+  // We know that the Bilaplacian is positive semi-definite
+  active_set_params.Auu_pd = true;
+}
+
 void igl::bbw::BBWData::print()
 {
   using namespace std;

include/igl/bbw/bbw.h

@@ -51,22 +51,10 @@ namespace igl
         // 2: louder
         int verbosity;
       public:
-        inline BBWData():
-          partition_unity(false),
-          W0(),
-        #ifndef IGL_NO_MOSEK
-          mosek_data(),
-        #endif
-          active_set_params(),
-          qp_solver(QP_SOLVER_IGL_ACTIVE_SET),
-          verbosity(0)
-        {
-          // We know that the Bilaplacian is positive semi-definite
-          active_set_params.Auu_pd = true;
-        }
+        IGL_INLINE BBWData();
 
         // Print current state of object
-        inline void print();
+        IGL_INLINE void print();
     };
 
     // Compute Bounded Biharmonic Weights on a given domain (V,Ele) with a given

include/igl/mosek/mosek_quadprog.h

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