aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-05-28 07:57:28 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-05-28 07:57:28 -0700
commitf13b3d4433bca0670fd57e41808d331b1ddfb1d8 (patch)
treeb91d69b98482de4fb2e5d8dc2a2f2b0bff34cf16 /unsupported
parentabec18bae0ff4f88b4228c229f0995d0126c7c79 (diff)
Added missing include files
Diffstat (limited to 'unsupported')
-rw-r--r--unsupported/Eigen/CXX11/Tensor8
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor
index 05c5127a1..54d3cc18b 100644
--- a/unsupported/Eigen/CXX11/Tensor
+++ b/unsupported/Eigen/CXX11/Tensor
@@ -34,6 +34,14 @@
#include <random>
#endif
+#ifdef _WIN32
+#include <winbase.h>
+#elif defined(__APPLE__)
+#include <mach/mach_time.h>
+#else
+#include <time.h>
+#endif
+
#ifdef EIGEN_USE_THREADS
#include <condition_variable>
#include <deque>
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
index da9763a3d..1b031b7a1 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
@@ -196,7 +196,7 @@ int get_random_seed() {
GetSystemTime(&st);
return st.wSecond + 1000 * st.wMilliseconds;
#elif defined __APPLE__
- return mach_absolute_time();
+ return static_cast<int>(mach_absolute_time());
#else
timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);