This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3c5549e5d6d8b3651f7696e5f9daade18ffab621 (commit)
via b0c31f93c84207b3c3a8ba31241ff2ee22886acf (commit)
from 54fd0836989e2a4bb8711265499e09e6ffd5c3d8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c5549e5d6d8b3651f7696e5f9daade18ffab621
commit 3c5549e5d6d8b3651f7696e5f9daade18ffab621
Merge: 54fd083 b0c31f9
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Wed Dec 28 16:31:37 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 28 16:31:37 2016 -0500
Merge topic 'require-tr1' into next
b0c31f93 Require TR1
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0c31f93c84207b3c3a8ba31241ff2ee22886acf
commit b0c31f93c84207b3c3a8ba31241ff2ee22886acf
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Wed Dec 28 20:41:17 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Wed Dec 28 20:41:17 2016 +0100
Require TR1
diff --git a/Source/Checks/cm_cxx_features.cmake
b/Source/Checks/cm_cxx_features.cmake
index 80c9f3b..23805be 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -40,6 +40,4 @@ if(CMAKE_CXX_STANDARD)
cm_check_cxx_feature(nullptr)
cm_check_cxx_feature(override)
cm_check_cxx_feature(unique_ptr)
- cm_check_cxx_feature(unordered_map)
- cm_check_cxx_feature(unordered_set)
endif()
diff --git a/Source/Checks/cm_cxx_unordered_map.cxx
b/Source/Checks/cm_cxx_unordered_map.cxx
deleted file mode 100644
index be3de25..0000000
--- a/Source/Checks/cm_cxx_unordered_map.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <unordered_map>
-int main()
-{
- std::unordered_map<int, int> map;
- map[0] = 0;
- return 0;
-}
diff --git a/Source/Checks/cm_cxx_unordered_set.cxx
b/Source/Checks/cm_cxx_unordered_set.cxx
deleted file mode 100644
index de4bb77..0000000
--- a/Source/Checks/cm_cxx_unordered_set.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <unordered_set>
-int main()
-{
- std::unordered_set<int> set;
- set.insert(0);
- return 0;
-}
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in
index 26f1df2..07eba12 100644
--- a/Source/cmConfigure.cmake.h.in
+++ b/Source/cmConfigure.cmake.h.in
@@ -25,8 +25,6 @@
#cmakedefine CMake_HAVE_CXX_NULLPTR
#cmakedefine CMake_HAVE_CXX_OVERRIDE
#cmakedefine CMake_HAVE_CXX_UNIQUE_PTR
-#cmakedefine CMake_HAVE_CXX_UNORDERED_MAP
-#cmakedefine CMake_HAVE_CXX_UNORDERED_SET
#define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@"
#define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@"
diff --git a/Source/cm_unordered_map.hxx b/Source/cm_unordered_map.hxx
index dc8ca35..3a0d88a 100644
--- a/Source/cm_unordered_map.hxx
+++ b/Source/cm_unordered_map.hxx
@@ -4,22 +4,29 @@
#define CM_UNORDERED_MAP_HXX
#include <cmConfigure.h>
+#include <cstddef>
-#if defined(CMake_HAVE_CXX_UNORDERED_MAP)
-
+#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L)
+#include <tr1/unordered_map>
+#else
#include <unordered_map>
-#define CM_UNORDERED_MAP std::unordered_map
+#endif
-#elif defined(CMAKE_BUILD_WITH_CMAKE)
+namespace cm {
-#include <cmsys/hash_map.hxx>
-#define CM_UNORDERED_MAP cmsys::hash_map
+#if (defined(_CPPLIB_VER) && _CPPLIB_VER < 520) || \
+ (defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L))
+
+using namespace std::tr1;
#else
-#include <map>
-#define CM_UNORDERED_MAP std::map
+using namespace std;
#endif
+} // end namespace cm
+
+#define CM_UNORDERED_MAP cm::unordered_map
+
#endif
diff --git a/Source/cm_unordered_set.hxx b/Source/cm_unordered_set.hxx
index ce58dbf..1f66e00 100644
--- a/Source/cm_unordered_set.hxx
+++ b/Source/cm_unordered_set.hxx
@@ -4,22 +4,29 @@
#define CM_UNORDERED_SET_HXX
#include <cmConfigure.h>
+#include <cstddef>
-#if defined(CMake_HAVE_CXX_UNORDERED_SET)
-
+#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L)
+#include <tr1/unordered_set>
+#else
#include <unordered_set>
-#define CM_UNORDERED_SET std::unordered_set
+#endif
-#elif defined(CMAKE_BUILD_WITH_CMAKE)
+namespace cm {
-#include <cmsys/hash_set.hxx>
-#define CM_UNORDERED_SET cmsys::hash_set
+#if (defined(_CPPLIB_VER) && _CPPLIB_VER < 520) || \
+ (defined(__GLIBCXX__) && (__GLIBCXX__ < 20080306 || __cplusplus < 201103L))
+
+using namespace std::tr1;
#else
-#include <set>
-#define CM_UNORDERED_SET std::set
+using namespace std;
#endif
+} // end namespace cm
+
+#define CM_UNORDERED_SET cm::unordered_set
+
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/Checks/cm_cxx_features.cmake | 2 --
Source/Checks/cm_cxx_unordered_map.cxx | 7 -------
Source/Checks/cm_cxx_unordered_set.cxx | 7 -------
Source/cmConfigure.cmake.h.in | 2 --
Source/cm_unordered_map.hxx | 23 +++++++++++++++--------
Source/cm_unordered_set.hxx | 23 +++++++++++++++--------
6 files changed, 30 insertions(+), 34 deletions(-)
delete mode 100644 Source/Checks/cm_cxx_unordered_map.cxx
delete mode 100644 Source/Checks/cm_cxx_unordered_set.cxx
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
