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/cmTarget.cxx | |
| 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/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 501aebf..a116ea3 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -9,6 +9,7 @@ #include <set> #include <sstream> #include <string.h> +#include <unordered_set> #include "cmAlgorithms.h" #include "cmGeneratorExpression.h" @@ -26,7 +27,6 @@ #include "cmStateSnapshot.h" #include "cmSystemTools.h" #include "cmTargetPropertyComputer.h" -#include "cm_unordered_set.hxx" #include "cmake.h" template <> @@ -1180,7 +1180,7 @@ const char* cmTarget::GetComputedProperty( const char* cmTarget::GetProperty(const std::string& prop) const { - static CM_UNORDERED_SET<std::string> specialProps; + static std::unordered_set<std::string> specialProps; #define MAKE_STATIC_PROP(PROP) static const std::string prop##PROP = #PROP MAKE_STATIC_PROP(LINK_LIBRARIES); MAKE_STATIC_PROP(TYPE); |