fix warning when assertions disabled.

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

diff --git a/autoconf/m4/cxx_bidi_iterator.m4 b/autoconf/m4/cxx_bidi_iterator.m4
index e16976d389ea3e639965cdcfed4696698118ff2e..d7de85630b5f1766e2e9c797720e1a0f89052420 100644 (file)
--- a/autoconf/m4/cxx_bidi_iterator.m4
+++ b/autoconf/m4/cxx_bidi_iterator.m4
@@ -6,18 +6,17 @@ AC_DEFUN([AC_CXX_HAVE_BI_ITERATOR],
 [AC_CACHE_CHECK(whether the compiler has the bidirectional iterator,
 ac_cv_cxx_have_bi_iterator,
 [AC_REQUIRE([AC_CXX_NAMESPACES])
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([#include <iterator>
+  AC_LANG_PUSH([C++])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <iterator>
 #ifdef HAVE_NAMESPACES
 using namespace std;
-#endif],[bidirectional_iterator<int,int> t; return 0;],
-  ac_cv_cxx_have_bi_iterator=yes, ac_cv_cxx_have_bi_iterator=no)
-  AC_LANG_RESTORE
+#endif]], [[bidirectional_iterator<int,int> t; return 0;]])],[ac_cv_cxx_have_bi_iterator=yes],[ac_cv_cxx_have_bi_iterator=no])
+  AC_LANG_POP([C++])
 ])
-HAVE_BI_ITERATOR=0
 if test "$ac_cv_cxx_have_bi_iterator" = yes
 then
-   HAVE_BI_ITERATOR=1
+  AC_DEFINE(HAVE_BI_ITERATOR,1,[Have bi-directional iterator])
+else
+  AC_DEFINE(HAVE_BI_ITERATOR,0,[Does not have bi-directional iterator])
 fi
-AC_SUBST(HAVE_BI_ITERATOR)])
+])