diff options
| -rw-r--r-- | bench/BenchTimer.h | 15 | ||||
| -rw-r--r-- | unsupported/Eigen/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | unsupported/test/nesting_profiling.cpp | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/bench/BenchTimer.h b/bench/BenchTimer.h index 70173427f..b2d0fc5f6 100644 --- a/bench/BenchTimer.h +++ b/bench/BenchTimer.h @@ -26,12 +26,13 @@ #ifndef EIGEN_BENCH_TIMER_H #define EIGEN_BENCH_TIMER_H -#ifndef WIN32 -#include <time.h> -#include <unistd.h> -#else +#if defined(_WIN32) || defined(__CYGWIN__) #define NOMINMAX +#define WIN32_LEAN_AND_MEAN #include <windows.h> +#else +#include <time.h> +#include <unistd.h> #endif #include <cstdlib> @@ -53,7 +54,7 @@ public: BenchTimer() { -#ifdef WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) LARGE_INTEGER freq; QueryPerformanceFrequency(&freq); m_frequency = (double)freq.QuadPart; @@ -77,7 +78,7 @@ public: return m_best; } -#ifdef WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) inline double getTime(void) #else static inline double getTime(void) @@ -95,7 +96,7 @@ public: } protected: -#ifdef WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) double m_frequency; #endif double m_best, m_start; diff --git a/unsupported/Eigen/src/CMakeLists.txt b/unsupported/Eigen/src/CMakeLists.txt index 195808c59..a0870d3af 100644 --- a/unsupported/Eigen/src/CMakeLists.txt +++ b/unsupported/Eigen/src/CMakeLists.txt @@ -2,6 +2,6 @@ ADD_SUBDIRECTORY(IterativeSolvers) ADD_SUBDIRECTORY(BVH) ADD_SUBDIRECTORY(AutoDiff) ADD_SUBDIRECTORY(MoreVectorization) -ADD_SUBDIRECTORY(FFT) -ADD_SUBDIRECTORY(Skyline) +# ADD_SUBDIRECTORY(FFT) +# ADD_SUBDIRECTORY(Skyline) ADD_SUBDIRECTORY(MatrixFunctions) diff --git a/unsupported/test/nesting_profiling.cpp b/unsupported/test/nesting_profiling.cpp index c19081e5a..bee5b3c70 100644 --- a/unsupported/test/nesting_profiling.cpp +++ b/unsupported/test/nesting_profiling.cpp @@ -132,7 +132,7 @@ struct MatrixScaling typedef MatrixType ReturnType; EIGEN_DONT_INLINE static MatrixType run(int num_runs) { - ei_traits<MatrixType>::Scalar s; + typename ei_traits<MatrixType>::Scalar s; MatrixType a,b; return s*a; } |