浏览代码

fixed bugs caught with gcc

Former-commit-id: 248bb81369f52bfe3081945fd2a2cd087fc7d525
Alec Jacobson (jalec 12 年之前
父节点
当前提交
e0a98389cb
共有 5 个文件被更改,包括 12 次插入9 次删除
  1. 2 1
      Makefile
  2. 1 1
      include/igl/matlab/Makefile
  3. 6 6
      include/igl/matlab/MatlabWorkspace.cpp
  4. 1 1
      include/igl/png/Makefile
  5. 2 0
      include/igl/reorder.h

+ 2 - 1
Makefile

@@ -7,7 +7,8 @@ include Makefile.conf
 # optimized default settings
 all: LFLAGS +=
 OPTFLAGS=-O3 -DNDEBUG
-debug: OPTFLAGS= -g -Wall -Werror
+#debug: OPTFLAGS= -g -Wall -Werror
+debug: OPTFLAGS= -g -Wall
 CFLAGS += $(OPTFLAGS)
 
 EXTRA_DIRS=

+ 1 - 1
include/igl/matlab/Makefile

@@ -1,5 +1,5 @@
 include ../../../Makefile.conf
-all: CFLAGS += -O3 -DNDEBUG -j 
+all: CFLAGS += -O3 -DNDEBUG
 debug: CFLAGS += -g -Wall -Werror
 
 .PHONY: all

+ 6 - 6
include/igl/matlab/MatlabWorkspace.cpp

@@ -52,7 +52,7 @@ IGL_INLINE bool igl::MatlabWorkspace::write(const std::string & path) const
 
 // Treat everything as a double
 template <typename DerivedM>
-IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save(
+IGL_INLINE igl::MatlabWorkspace& igl::MatlabWorkspace::save(
   const Eigen::PlainObjectBase<DerivedM>& M,
   const std::string & name)
 {
@@ -69,7 +69,7 @@ IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save(
 }
 
 template <typename ScalarM>
-IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save(
+IGL_INLINE igl::MatlabWorkspace& igl::MatlabWorkspace::save(
   const std::vector<std::vector<ScalarM> > & vM,
   const std::string & name)
 {
@@ -79,7 +79,7 @@ IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save(
 }
 
 template <typename ScalarV>
-IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save(
+IGL_INLINE igl::MatlabWorkspace& igl::MatlabWorkspace::save(
   const std::vector<ScalarV> & vV,
   const std::string & name)
 {
@@ -89,7 +89,7 @@ IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save(
 }
 
 template <typename DerivedM>
-IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& 
+IGL_INLINE igl::MatlabWorkspace& 
   igl::MatlabWorkspace::save_index(
     const Eigen::PlainObjectBase<DerivedM>& M,
     const std::string & name)
@@ -100,7 +100,7 @@ IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace&
 }
 
 template <typename ScalarM>
-IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save_index(
+IGL_INLINE igl::MatlabWorkspace& igl::MatlabWorkspace::save_index(
   const std::vector<std::vector<ScalarM> > & vM,
   const std::string & name)
 {
@@ -110,7 +110,7 @@ IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save_ind
 }
 
 template <typename ScalarV>
-IGL_INLINE igl::MatlabWorkspace::MatlabWorkspace& igl::MatlabWorkspace::save_index(
+IGL_INLINE igl::MatlabWorkspace& igl::MatlabWorkspace::save_index(
   const std::vector<ScalarV> & vV,
   const std::string & name)
 {

+ 1 - 1
include/igl/png/Makefile

@@ -1,5 +1,5 @@
 include ../../../Makefile.conf
-all: CFLAGS += -O3 -DNDEBUG -j 
+all: CFLAGS += -O3 -DNDEBUG 
 debug: CFLAGS += -g -Wall -Werror
 
 .PHONY: all

+ 2 - 0
include/igl/reorder.h

@@ -2,6 +2,8 @@
 #define IGL_REORDER_H
 #include "igl_inline.h"
 #include <vector>
+// For size_t
+#include <stddef.h>
 
 namespace igl
 {