Sfoglia il codice sorgente

added missing std::

Former-commit-id: 686bb00905bf3958447c57f02646a74d8b120009
Daniele Panozzo 12 anni fa
parent
commit
4709fbf3f8
3 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 2 1
      Makefile.conf
  2. 1 1
      include/igl/readOBJ.cpp
  3. 1 1
      include/igl/readOBJ.h

+ 2 - 1
Makefile.conf

@@ -68,7 +68,8 @@ ifeq ($(IGL_USERNAME),jalec_linux)
 endif
 endif
 
 
 ifeq ($(IGL_USERNAME),daniele)
 ifeq ($(IGL_USERNAME),daniele)
-	IGL_WITH_MATLAB=1
+	IGL_WITH_MATLAB=0
+	AFLAGS = -m64
 endif
 endif
 
 
 
 

+ 1 - 1
include/igl/readOBJ.cpp

@@ -280,7 +280,7 @@ template <typename DerivedV, typename DerivedF, typename DerivedT, typename Inde
 IGL_INLINE bool igl::readOBJPoly(
 IGL_INLINE bool igl::readOBJPoly(
                              const std::string str,
                              const std::string str,
                              Eigen::PlainObjectBase<DerivedV>& V,
                              Eigen::PlainObjectBase<DerivedV>& V,
-                             vector<vector< Index > >& F,
+                             std::vector<std::vector< Index > >& F,
                              Eigen::PlainObjectBase<DerivedV>& CN,
                              Eigen::PlainObjectBase<DerivedV>& CN,
                              Eigen::PlainObjectBase<DerivedF>& FN,
                              Eigen::PlainObjectBase<DerivedF>& FN,
                              Eigen::PlainObjectBase<DerivedT>& TC,
                              Eigen::PlainObjectBase<DerivedT>& TC,

+ 1 - 1
include/igl/readOBJ.h

@@ -90,7 +90,7 @@ namespace igl
   IGL_INLINE bool readOBJPoly(
   IGL_INLINE bool readOBJPoly(
                           const std::string str,
                           const std::string str,
                           Eigen::PlainObjectBase<DerivedV>& V,
                           Eigen::PlainObjectBase<DerivedV>& V,
-                          vector<vector<Index> >& F,
+                          std::vector<std::vector<Index> >& F,
                           Eigen::PlainObjectBase<DerivedV>& CN,
                           Eigen::PlainObjectBase<DerivedV>& CN,
                           Eigen::PlainObjectBase<DerivedF>& FN,
                           Eigen::PlainObjectBase<DerivedF>& FN,
                           Eigen::PlainObjectBase<DerivedT>& TC,
                           Eigen::PlainObjectBase<DerivedT>& TC,