compilation fixes for VS2015

Former-commit-id: aaf852e824a796f81071baa98635a738dbd442b2

include/igl/integrable_polyvector_fields.cpp

@@ -190,7 +190,8 @@ makeFieldCCW(Eigen::MatrixXd &sol3D)
   {
     //take all 4 vectors (including opposites) and pick two that are in ccw order
     all << sol3D.row(fi), -sol3D.row(fi);
-    igl::sort_vectors_ccw(all, FN.row(fi).eval(), order, true, t);
+	Eigen::VectorXi inv_order_unused;
+    igl::sort_vectors_ccw(all, FN.row(fi).eval(), order, true, t, false, inv_order_unused);
     //if we are in a constrained face, we need to make sure that the first vector is always the same vector as in the constraints
     if(is_constrained_face[fi])
     {
@@ -240,7 +241,7 @@ computeInteriorEdges()
   // Flag border edges
   numInteriorEdges = 0;
   isBorderEdge.setZero(numE,1);
-  indFullToInterior = -1.*Eigen::VectorXi::Ones(numE,1);
+  indFullToInterior = -1*Eigen::VectorXi::Ones(numE,1);
 
   for(unsigned i=0; i<numE; ++i)
   {

include/igl/polyvector_field_matchings.cpp

@@ -24,8 +24,10 @@ IGL_INLINE void igl::polyvector_field_matching(
   Eigen::Matrix<typename DerivedS::Scalar,1,Eigen::Dynamic> ua (1,N*3); ua <<_ua, -_ua;
   Eigen::Matrix<typename DerivedS::Scalar,1,Eigen::Dynamic> ub (1,N*3); ub <<_ub, -_ub;
   Eigen::Matrix<typename DerivedM::Scalar,Eigen::Dynamic,1> order_a, order_b;
-  igl::sort_vectors_ccw(ua, na, order_a);
-  igl::sort_vectors_ccw(ub, nb, order_b);
+  Eigen::Matrix<typename DerivedS::Scalar, 1, Eigen::Dynamic> sorted_unused;
+  Eigen::VectorXi inv_order_unused;
+  igl::sort_vectors_ccw(ua, na, order_a,false,sorted_unused,false,inv_order_unused);
+  igl::sort_vectors_ccw(ub, nb, order_b,false,sorted_unused,false,inv_order_unused);
 
   //checking all possible circshifts of order_b as matches for order_a
   Eigen::Matrix<typename DerivedM::Scalar,Eigen::Dynamic,Eigen::Dynamic> all_matches(N,N);

include/igl/sort.cpp

@@ -174,8 +174,8 @@ IGL_INLINE void igl::sort2(
     Index & bi = (dim==1 ? IX(1,i) : IX(i,1));
     if((ascending && a>b) || (!ascending && a<b))
     {
-      swap(a,b);
-      swap(ai,bi);
+      std::swap(a,b);
+      std::swap(ai,bi);
     }
   }
 }

include/igl/sort_vectors_ccw.h

@@ -35,10 +35,10 @@ namespace igl {
                                    const Eigen::PlainObjectBase<DerivedS>& P,
                                    const Eigen::PlainObjectBase<DerivedS>& N,
                                    Eigen::PlainObjectBase<DerivedI> &order,
-                                   const bool do_sorted = false,
-                                   Eigen::PlainObjectBase<DerivedS> &sorted = *(Eigen::PlainObjectBase<DerivedS>*)NULL,
-                                   const bool do_inv_order = false,
-                                   Eigen::PlainObjectBase<DerivedI> &inv_order = *(Eigen::PlainObjectBase<DerivedI> *)NULL);
+                                   const bool do_sorted,
+                                   Eigen::PlainObjectBase<DerivedS> &sorted,
+                                   const bool do_inv_order,
+                                   Eigen::PlainObjectBase<DerivedI> &inv_order);
 };
 
 

include/igl/xml/serialize_xml.cpp

@@ -7,6 +7,7 @@
 // obtain one at http://mozilla.org/MPL/2.0/.
 
 #include "serialize_xml.h"
+#include <iterator>
 
 namespace igl
 {