diff options
| author | Yi Kong <yikong@google.com> | 2022-02-25 16:17:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-25 16:17:02 +0000 |
| commit | 7cb50013986f04dce5fac87bebf319bb8db37a36 (patch) | |
| tree | fb979fb4cf4f8052c8cc66b1ec9516d91fcd859b /test/sparse.h | |
| parent | 26a30e76965432e5088c271df90759e49d9636a2 (diff) | |
| parent | 10f298fc4175c1b8537c674f654a070c871960e5 (diff) | |
| download | eigen-7cb50013986f04dce5fac87bebf319bb8db37a36.tar.gz | |
Merge changes Iee153445,Iee274471 am: 79df15ea88 am: 10f298fc41
Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/1999079
Change-Id: I3dd349f9a45d37f37441ff7a7742ebe953b70516
Diffstat (limited to 'test/sparse.h')
| -rw-r--r-- | test/sparse.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/test/sparse.h b/test/sparse.h index 9912e1e24..6cd07fc0a 100644 --- a/test/sparse.h +++ b/test/sparse.h @@ -14,7 +14,7 @@ #include "main.h" -#if EIGEN_GNUC_AT_LEAST(4,0) && !defined __ICC && !defined(__clang__) +#if EIGEN_HAS_CXX11 #ifdef min #undef min @@ -24,15 +24,9 @@ #undef max #endif -#include <tr1/unordered_map> +#include <unordered_map> #define EIGEN_UNORDERED_MAP_SUPPORT -namespace std { - using std::tr1::unordered_map; -} -#endif -#ifdef EIGEN_GOOGLEHASH_SUPPORT - #include <google/sparse_hash_map> #endif #include <Eigen/Cholesky> |