diff options
| author |  Benoit Steiner <bsteiner@google.com> | 2017-05-10 21:12:21 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-05-11 11:02:28 -0700 |
| commit | ee112cff56081fb9d0b74c987a8935acc360b05c (patch) | |
| tree | 6026d8b42ccc09d9c0d1b2d091916cfcb4f5a057 /third_party/eigen3 | |
| parent | 27c89207d2f31fe4b4b42c789b96d62cde4e2133 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 155709893
Diffstat (limited to 'third_party/eigen3')
| -rw-r--r-- | third_party/eigen3/unsupported/Eigen/CXX11/Tensor | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor index 00d2e7c0c7..861a87b68b 100644 --- a/third_party/eigen3/unsupported/Eigen/CXX11/Tensor +++ b/third_party/eigen3/unsupported/Eigen/CXX11/Tensor @@ -1,9 +1,11 @@ -#ifdef _WIN32 -#define sleep(seconds) Sleep(1000*seconds) -#endif // _WIN32 #include "unsupported/Eigen/CXX11/Tensor" #ifdef _WIN32 +#ifndef SLEEP_FUNC_HEADER_GUARD +#define SLEEP_FUNC_HEADER_GUARD +inline void sleep(unsigned int seconds) { Sleep(1000*seconds); } +#endif + // On Windows, Eigen will include Windows.h, which defines various // macros that conflict with TensorFlow symbols. Undefine them here to // prevent clashes. |