Delete a few unnecessary checks for standard C++ features (#779)

* nullptr ought to be provided by any C++ compiler we support
* HAVE_NULLPTR_T was unused while std::nullptr_t is used w/o it
* HAVE_UNIQUE_PTR was almost unused while std::unique_ptr is used w/o it

diff --git a/CREDITS b/CREDITS
index 62efccbd48d639474d9e6e577d036699245ae3ba..90eefc9391040b5e249a01bf4b0211f5434b6138 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -84,14 +84,6 @@ research project called The Harvest Information Discovery and Access System:
 
 ==============================================================================
 
-acinclude/ax_cxx_0x_types.m4:
-
-##
-## AX_CXX_TYPE_NULLPTR shamelessly copied from the DUNE sources under GPL version 2
-##
-
-==============================================================================
-
 acinclude/ax_cxx_compile_stdcxx_11.m4:
 
 #   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>

diff --git a/acinclude/ax_cxx_0x_types.m4 b/acinclude/ax_cxx_0x_types.m4
index 59d9017f3c9a09fcd4e4970c56ff3d30eefdbf30..0110849b05501fc61c39dc97752e4fd365ea1c02 100644 (file)
--- a/acinclude/ax_cxx_0x_types.m4
+++ b/acinclude/ax_cxx_0x_types.m4
@@ -5,52 +5,6 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-##
-## AX_CXX_TYPE_NULLPTR shamelessly copied from the DUNE sources under GPL version 2
-## 
-AC_DEFUN([AX_CXX_TYPE_NULLPTR],[
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_LANG_PUSH([C++])
-  AC_MSG_CHECKING([whether nullptr is supported])
-  AC_TRY_COMPILE([],[char* ch = nullptr;], [
-    HAVE_NULLPTR=yes
-    AC_MSG_RESULT(yes)], [
-    HAVE_NULLPTR=no
-    AC_MSG_RESULT(no)])
-  if test "x$HAVE_NULLPTR" = xno; then
-    AC_DEFINE(nullptr, NULL, [Leave undefined if nullptr is supported])
-  fi
-  AC_MSG_CHECKING([whether nullptr_t is supported])
-  AC_TRY_COMPILE([#include <cstddef>],[typedef nullptr_t peng;], [
-    HAVE_NULLPTR_T=yes
-    AC_MSG_RESULT(yes)], [
-    HAVE_NULLPTR_T=no
-    AC_MSG_RESULT(no)])
-  if test "x$HAVE_NULLPTR_T" = xyes; then
-    AC_DEFINE(HAVE_NULLPTR_T, 1, [Define to 1 if nullptr_t is supported])
-  fi
-  AC_LANG_POP
-])
-
-## Hand crafted for Squid under GPL version 2
-AC_DEFUN([AX_CXX_TYPE_UNIQUE_PTR],[
-  AC_REQUIRE([AC_PROG_CXX])
-  AC_LANG_PUSH([C++])
-  AC_MSG_CHECKING([whether std::unique_ptr<T> is supported])
-  AC_TRY_COMPILE([#include <memory>],[std::unique_ptr<char> c;], [
-    HAVE_UNIQUE_PTR=yes
-    AC_MSG_RESULT(yes)], [
-    HAVE_UNIQUE_PTR=no
-    AC_MSG_RESULT(no)])
-  if test "x$HAVE_UNIQUE_PTR" = xno; then
-    AC_DEFINE(unique_ptr, auto_ptr, [Leave undefined if std::unique_ptr<T> is supported])
-  fi
-  if test "x$HAVE_UNIQUE_PTR" = xyes; then
-    AC_DEFINE(HAVE_UNIQUE_PTR, 1, [Define to 1 if std::unique_ptr<T> is supported])
-  fi
-  AC_LANG_POP
-])
-
 ## Hand crafted for Squid under GPL version 2
 AC_DEFUN([AX_CXX_TYPE_UNIFORM_DISTRIBUTIONS],[
   AC_REQUIRE([AC_PROG_CXX])

diff --git a/compat/cppunit.h b/compat/cppunit.h
index 2996c02af37b80d20c3cf37e313f1a93111e888d..8475848e6b72e0c33eb6d431650479c161c9526f 100644 (file)
--- a/compat/cppunit.h
+++ b/compat/cppunit.h
@@ -12,7 +12,7 @@
 // CPPUNIT test suite uses auto_ptr which is deprecated in C++0x
 
 #if HAVE_CPPUNIT_EXTENSIONS_HELPERMACROS_H
-#if defined(__cplusplus) && HAVE_UNIQUE_PTR
+#if defined(__cplusplus)
 #include <cppunit/extensions/HelperMacros.h>
 
 #undef CPPUNIT_TEST_SUITE_END
@@ -36,7 +36,7 @@
   private: /* dummy typedef so that the macro can still end with ';'*/         \
     typedef int CppUnitDummyTypedefForSemiColonEnding__
 
-#endif /* HAVE_UNIQUE_PTR */
+#endif /* __cplusplus */
 #endif /* HAVE_CPPUNIT_EXTENSIONS_HELPERMACROS_H */
 #endif /* SQUID_COMPAT_CPPUNIT_H */
 

diff --git a/configure.ac b/configure.ac
index f24a62998f56813a36f2c81a69cc4ecfd299d68a..f0651498264b22c6c15988cb486c37a892399df8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2895,8 +2895,6 @@ AC_CHECK_SIZEOF(off_t)
 AC_CHECK_SIZEOF(size_t)
 
 dnl Some C++11 types we try to use
-AX_CXX_TYPE_NULLPTR
-AX_CXX_TYPE_UNIQUE_PTR
 AX_CXX_TYPE_UNIFORM_DISTRIBUTIONS
 SQUID_CXX_STD_UNDERLYING_TYPE