diff options
| author |  Antonio Sanchez <cantonios@google.com> | 2021-01-26 13:39:34 -0800 |
|---|---|---|
| committer | Antonio Sanchez <cantonios@google.com> | 2021-01-26 14:23:05 -0800 |
| commit | 3f4684f87da4303063a194c7340f1485d1752ae0 (patch) | |
| tree | dac3259ba28becb0888c115756600c5762410f3e /unsupported | |
| parent | 0784d9f87b6602160e8f3e3d507d69999b92d539 (diff) | |
Include `<cstdint>` in one place, remove custom typedefs
Originating from
[this SO issue](https://stackoverflow.com/questions/65901014/how-to-solve-this-all-error-2-in-this-case),
some win32 compilers define `__int32` as a `long`, but MinGW defines
`std::int32_t` as an `int`, leading to a type conflict.
To avoid this, we remove the custom `typedef` definitions for win32. The
Tensor module requires C++11 anyways, so we are guaranteed to have
included `<cstdint>` already in `Eigen/Core`.
Also re-arranged the headers to only include `<cstdint>` in one place to
avoid this type of error again.
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/Tensor | 12 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/ThreadPool | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor index beed2308a..d73c6008d 100644 --- a/unsupported/Eigen/CXX11/Tensor +++ b/unsupported/Eigen/CXX11/Tensor @@ -42,18 +42,6 @@ #include <thread> #ifdef _WIN32 -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#include <windows.h> -#else -#include <stdint.h> -#endif - -#ifdef _WIN32 #include <windows.h> #elif defined(__APPLE__) #include <mach/mach_time.h> diff --git a/unsupported/Eigen/CXX11/ThreadPool b/unsupported/Eigen/CXX11/ThreadPool index 71a6afe39..5f59e9714 100644 --- a/unsupported/Eigen/CXX11/ThreadPool +++ b/unsupported/Eigen/CXX11/ThreadPool @@ -33,7 +33,6 @@ #if __cplusplus > 199711L || EIGEN_COMP_MSVC >= 1900 #include <cstddef> #include <cstring> -#include <stdint.h> #include <time.h> #include <vector> |