diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-16 04:57:53 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-18 22:07:02 (GMT) |
| commit | d7923b82ade9f84d0fc4c6d44b9719f2f7c0e9af (patch) | |
| tree | 2d563a0bbb66f63bc9e03b03fc3ff15cd14cbc02 /Source/cmGlobalGenerator.h | |
| parent | 820777af03041c21d7b36e80135382e7161c1ebd (diff) | |
| download | CMake-d7923b82ade9f84d0fc4c6d44b9719f2f7c0e9af.zip CMake-d7923b82ade9f84d0fc4c6d44b9719f2f7c0e9af.tar.gz CMake-d7923b82ade9f84d0fc4c6d44b9719f2f7c0e9af.tar.bz2 | |
Use std::unordered_map instead of hash_map where available.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 3b2a41f..c4c98ea 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -24,7 +24,11 @@ #if defined(CMAKE_BUILD_WITH_CMAKE) # include "cmFileLockPool.h" -# include <cmsys/hash_map.hxx> +# ifdef CMake_HAVE_CXX11_UNORDERED_MAP +# include <unordered_map> +# else +# include <cmsys/hash_map.hxx> +# endif #endif class cmake; @@ -429,7 +433,11 @@ protected: // All targets in the entire project. #if defined(CMAKE_BUILD_WITH_CMAKE) +#ifdef CMake_HAVE_CXX11_UNORDERED_MAP + typedef std::unordered_map<std::string, cmTarget*> TargetMap; +#else typedef cmsys::hash_map<std::string, cmTarget*> TargetMap; +#endif #else typedef std::map<std::string,cmTarget *> TargetMap; #endif |