Silence the compiler warning differently. The

[oota-llvm.git] / autoconf / m4 / cxx_hash_set.m4

diff --git a/autoconf/m4/cxx_hash_set.m4 b/autoconf/m4/cxx_hash_set.m4
index 0e736d9a7d503589e05eb85fbe7b588429449482..e9d28bfe35b97c6009b7b8d25c06732316587f77 100644 (file)
--- a/autoconf/m4/cxx_hash_set.m4
+++ b/autoconf/m4/cxx_hash_set.m4
@@ -4,56 +4,53 @@ AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET],
 [AC_CACHE_CHECK([whether the compiler has <ext/hash_set> defining template class std::hash_set],
  ac_cv_cxx_have_std_ext_hash_set,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <ext/hash_set>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_set>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[hash_set<int> t; ],
-  [ac_cv_cxx_have_std_ext_hash_set=yes], [ac_cv_cxx_have_std_ext_hash_set=no])
-  AC_LANG_RESTORE])
- HAVE_STD_EXT_HASH_SET=0
+#endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_std_ext_hash_set=yes],[ac_cv_cxx_have_std_ext_hash_set=no])
+  AC_LANG_POP([C++])])
  if test "$ac_cv_cxx_have_std_ext_hash_set" = yes
  then
-   HAVE_STD_EXT_HASH_SET=1
+   AC_DEFINE(HAVE_STD_EXT_HASH_SET,1,[Have hash_set in std namespace])
+ else
+   AC_DEFINE(HAVE_STD_EXT_HASH_SET,0,[Does not have hash_set in std namespace])
  fi
- AC_SUBST(HAVE_STD_EXT_HASH_SET)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET],
 [AC_CACHE_CHECK(
  [whether the compiler has <ext/hash_set> defining template class __gnu_cxx::hash_set],
  ac_cv_cxx_have_gnu_ext_hash_set,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <ext/hash_set>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_set>
 #ifdef HAVE_NAMESPACES
 using namespace __gnu_cxx;
-#endif],[hash_set<int> t; ],
-  [ac_cv_cxx_have_gnu_ext_hash_set=yes], [ac_cv_cxx_have_gnu_ext_hash_set=no])
-  AC_LANG_RESTORE])
- HAVE_GNU_EXT_HASH_SET=0
+#endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_set=yes],[ac_cv_cxx_have_gnu_ext_hash_set=no])
+  AC_LANG_POP([C++])])
  if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes
  then
-   HAVE_GNU_EXT_HASH_SET=1
+   AC_DEFINE(HAVE_GNU_EXT_HASH_SET,1,[Have hash_set in gnu namespace])
+ else
+   AC_DEFINE(HAVE_GNU_EXT_HASH_SET,0,[Does not have hash_set in gnu namespace])
  fi
- AC_SUBST(HAVE_GNU_EXT_HASH_SET)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET],
 [AC_CACHE_CHECK([whether the compiler has <hash_set> defining template class ::hash_set],
  ac_cv_cxx_have_global_hash_set,
  [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <hash_set>],[hash_set<int> t; return 0;],
-  [ac_cv_cxx_have_global_hash_set=yes], [ac_cv_cxx_have_global_hash_set=no])
-  AC_LANG_RESTORE])
- HAVE_GLOBAL_HASH_SET=0
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_set>]], [[hash_set<int> t; return 0;]])],[ac_cv_cxx_have_global_hash_set=yes],[ac_cv_cxx_have_global_hash_set=no])
+  AC_LANG_POP([C++])])
  if test "$ac_cv_cxx_have_global_hash_set" = yes
  then
-   HAVE_GLOBAL_HASH_SET=1
+   AC_DEFINE(HAVE_GLOBAL_HASH_SET,1,[Have hash_set in global namespace])
+ else
+   AC_DEFINE(HAVE_GLOBAL_HASH_SET,0,[Does not have hash_set in global namespace])
  fi
- AC_SUBST(HAVE_GLOBAL_HASH_SET)])
+ ])
 
 AC_DEFUN([AC_CXX_HAVE_HASH_SET],
 [AC_CXX_HAVE_STD_EXT_HASH_SET