diff options
| author |  Eamon Nerbonne <eamon@nerbonne.org> | 2010-03-02 08:46:11 +0100 |
|---|---|---|
| committer | Eamon Nerbonne <eamon@nerbonne.org> | 2010-03-02 08:46:11 +0100 |
| commit | ff6b94d6d089e3def456c4eceecde94bd17b9a5f (patch) | |
| tree | fe62e2a83e88a98d9df2265bb138937461ae2c85 /bench/BenchTimer.h | |
| parent | f1d310195653e1d84f6b606354ea1c5babfa3d5d (diff) | |
BenchTimer: avoid warning about symbol redefinition on win32, and include <Eigen/Core> (required to compile)
Diffstat (limited to 'bench/BenchTimer.h')
| -rw-r--r-- | bench/BenchTimer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bench/BenchTimer.h b/bench/BenchTimer.h index e49afa07f..5e5945b57 100644 --- a/bench/BenchTimer.h +++ b/bench/BenchTimer.h @@ -27,8 +27,12 @@ #define EIGEN_BENCH_TIMERR_H #if defined(_WIN32) || defined(__CYGWIN__) +#ifndef NOMINMAX #define NOMINMAX +#endif +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #else #include <sys/time.h> @@ -39,6 +43,7 @@ #include <cmath> #include <cstdlib> #include <numeric> +#include <Eigen/Core> namespace Eigen { |