diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-23 09:11:20 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-23 09:11:40 (GMT) |
commit | ac6660b6716f14815bdd0f75cf1da4cf3ad7381c (patch) | |
tree | e062c9597c77691cca746308a951eee16c1af75e /Source/cmDefinitions.h | |
parent | 7526b1ed3285e29565415701756cfe7db1967cd9 (diff) | |
parent | cbcfb79f9c38c1dac28e9353cc7d7e5efec0357f (diff) | |
download | CMake-ac6660b6716f14815bdd0f75cf1da4cf3ad7381c.zip CMake-ac6660b6716f14815bdd0f75cf1da4cf3ad7381c.tar.gz CMake-ac6660b6716f14815bdd0f75cf1da4cf3ad7381c.tar.bz2 |
Merge topic 'cxx11-unordered'
cbcfb79f Use C++11 unordered containers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1174
Diffstat (limited to 'Source/cmDefinitions.h')
-rw-r--r-- | Source/cmDefinitions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h index ddb8918..528b157 100644 --- a/Source/cmDefinitions.h +++ b/Source/cmDefinitions.h @@ -6,10 +6,10 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <string> +#include <unordered_map> #include <vector> #include "cmLinkedTree.h" -#include "cm_unordered_map.hxx" /** \class cmDefinitions * \brief Store a scope of variable definitions for CMake language. @@ -70,7 +70,7 @@ private: }; static Def NoDef; - typedef CM_UNORDERED_MAP<std::string, Def> MapType; + typedef std::unordered_map<std::string, Def> MapType; MapType Map; static Def const& GetInternal(const std::string& key, StackIter begin, |