diff options
| author | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 18:47:37 (GMT) |
|---|---|---|
| committer | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 18:47:37 (GMT) |
| commit | e29ba42d591a6bf24f38fecc4409af1e597732db (patch) | |
| tree | d11e1d16b985ff093c7139586af95566e1f4bc83 /src | |
| parent | 0eacddfd8148f14ee0ddfe2eb66b82774c88afbe (diff) | |
bring inline with master
Diffstat (limited to 'src')
| -rw-r--r-- | src/CSGTermEvaluator.h | 4 | ||||
| -rw-r--r-- | src/dxfdata.h | 3 | ||||
| -rw-r--r-- | src/linalg.h | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h index 9d1fabe..3a8122b 100644 --- a/src/CSGTermEvaluator.h +++ b/src/CSGTermEvaluator.h @@ -7,10 +7,6 @@ #include <cstddef> #include "visitor.h" -#if defined __WIN32__ && ! defined _MSC_VER -#include <cstddef> -#endif - class CSGTermEvaluator : public Visitor { public: diff --git a/src/dxfdata.h b/src/dxfdata.h index 17da1b9..7eea6a9 100644 --- a/src/dxfdata.h +++ b/src/dxfdata.h @@ -1,8 +1,5 @@ #ifndef DXFDATA_H_ #define DXFDATA_H_ -#ifndef EIGEN_DONT_ALIGN -#define EIGEN_DONT_ALIGN -#endif #include "linalg.h" #include <vector> diff --git a/src/linalg.h b/src/linalg.h index 744e810..e20d8d8 100644 --- a/src/linalg.h +++ b/src/linalg.h @@ -1,8 +1,6 @@ #ifndef LINALG_H_ #define LINALG_H_ -#ifndef EIGEN_DONT_ALIGN -#define EIGEN_DONT_ALIGN -#endif + #include <Eigen/Core> #include <Eigen/Geometry> #include <Eigen/Dense> |