From 1808e8a479e53ad48832cf409f8b1d96694a75cb Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 15 Dec 2015 01:32:27 +0000 Subject: Add the docs claimed define for HAVE_UNORDERED_MAP Make the code match what the docs claimed, to return a define for HAVE_UNORDERED_MAP --- m4/stl_hash.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/stl_hash.m4 b/m4/stl_hash.m4 index 0722b14a..dd77caab 100644 --- a/m4/stl_hash.m4 +++ b/m4/stl_hash.m4 @@ -53,6 +53,9 @@ AC_DEFUN([AC_CXX_STL_HASH], if test -n "$ac_cv_cxx_hash_map"; then AC_DEFINE(HAVE_HASH_MAP, 1, [define if the compiler has hash_map]) AC_DEFINE(HAVE_HASH_SET, 1, [define if the compiler has hash_set]) + if test "$ac_cv_cxx_hash_map_class" = "unordered_map"; then + AC_DEFINE(HAVE_UNORDERED_MAP, 1, [define if the hash_map class is unordered_map]) + fi AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map, [the location of or ]) AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set, -- cgit v1.2.3 From 4af1cc7445ddc72785e7df5bf0a208940f2b2d9c Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 9 Jan 2016 13:38:42 +0000 Subject: Revert the change and remove an incorrect comment --- m4/stl_hash.m4 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/m4/stl_hash.m4 b/m4/stl_hash.m4 index dd77caab..d7def1af 100644 --- a/m4/stl_hash.m4 +++ b/m4/stl_hash.m4 @@ -4,8 +4,7 @@ # include AC_TRY_COMPILE for all the combinations we've seen in the # wild. We define HASH_MAP_H to the location of the header file, and # HASH_NAMESPACE to the namespace the class (unordered_map or -# hash_map) is in. We define HAVE_UNORDERED_MAP if the class we found -# is named unordered_map, or leave it undefined if not. +# hash_map) is in. # This also checks if unordered map exists. AC_DEFUN([AC_CXX_STL_HASH], @@ -53,9 +52,6 @@ AC_DEFUN([AC_CXX_STL_HASH], if test -n "$ac_cv_cxx_hash_map"; then AC_DEFINE(HAVE_HASH_MAP, 1, [define if the compiler has hash_map]) AC_DEFINE(HAVE_HASH_SET, 1, [define if the compiler has hash_set]) - if test "$ac_cv_cxx_hash_map_class" = "unordered_map"; then - AC_DEFINE(HAVE_UNORDERED_MAP, 1, [define if the hash_map class is unordered_map]) - fi AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map, [the location of or ]) AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set, -- cgit v1.2.3