diff options
| author |  Antonio Sanchez <cantonios@google.com> | 2021-04-09 19:50:19 -0700 |
|---|---|---|
| committer | Antonio Sanchez <cantonios@google.com> | 2021-04-12 19:00:39 -0700 |
| commit | 69adf26aa3e853418002562f623c42a9c7008271 (patch) | |
| tree | 0b09d0d1158f93ae0af28318ef47142781b58c2a /test | |
| parent | 9357feedc7635105a23974ddf30e17560ba2c182 (diff) | |
Modify googlehash use to account for namespace issues.
The namespace declaration for googlehash is a configurable macro that
can be disabled. In particular, it is disabled within google, causing
compile errors since `dense_hash_map`/`sparse_hash_map` are then in
the global namespace instead of in `::google`.
Here we play a bit of gynastics to allow for both `google::*_hash_map`
and `*_hash_map`, while limiting namespace polution. Symbols within
the `::google` namespace are imported into `Eigen::google`.
We also remove checks based on `_SPARSE_HASH_MAP_H_`, as this is
fragile, and instead require `EIGEN_GOOGLEHASH_SUPPORT` to be
defined.
Diffstat (limited to 'test')
| -rw-r--r-- | test/sparse.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/sparse.h b/test/sparse.h index df471b4e2..6cd07fc0a 100644 --- a/test/sparse.h +++ b/test/sparse.h @@ -29,10 +29,6 @@ #endif -#ifdef EIGEN_GOOGLEHASH_SUPPORT - #include <google/sparse_hash_map> -#endif - #include <Eigen/Cholesky> #include <Eigen/LU> #include <Eigen/Sparse> |