[cleanup] Remove check and fallback code for std::tuple.

cmake/modules/CheckCXX11Features.cmake

@@ -63,11 +63,11 @@ include(CheckIncludeFileCXX)
 
 if(NOT DISABLE_TR1_HEADERS)
 # Search for some tr1 headers
-foreach(_HEADER tuple tr1/tuple type_traits tr1/type_traits)
+foreach(_HEADER type_traits tr1/type_traits)
   string(REPLACE "/" "_" _HEADER_VAR ${_HEADER})
   string(TOUPPER ${_HEADER_VAR} _HEADER_VAR )
   check_include_file_cxx(${_HEADER} "HAVE_${_HEADER_VAR}")
-endforeach(_HEADER tuple tr1/tuple tr1/type_traits)
+endforeach()
 
 # Check for hash support
 check_include_file_cxx("functional" "HAVE_FUNCTIONAL")

config.h.cmake

@@ -73,9 +73,6 @@
 /* Define to 1 if the std::tr1::hash template from TR1 is available. */
 #cmakedefine HAVE_TR1_HASH 1
 
-/* Define to 1 if you have the <tr1/tuple> header file. */
-#cmakedefine HAVE_TR1_TUPLE 1
-
 /* Define to 1 if you have the <tr1/type_traits> header file. */
 #cmakedefine HAVE_TR1_TYPE_TRAITS 1
 
@@ -87,9 +84,6 @@
 /* Define to 1 if the std::hash template from C++11 is available. */
 #cmakedefine HAVE_STD_HASH 1
 
-/* Define to 1 if you have the <tuple> header file. */
-#cmakedefine HAVE_TUPLE 1
-
 /* Define to 1 if you have the <type_traits> header file. */
 #cmakedefine HAVE_TYPE_TRAITS 1
 

dune/common/test/CMakeLists.txt

@@ -36,8 +36,6 @@ set(TESTS
     testfconstruct
     testfloatcmp
     tuplestest_config
-    tuplestest_dune
-    tuplestest_tr1
     tupleutilitytest
     utilitytest)
 
@@ -217,10 +215,6 @@ add_executable("testfconstruct_fail2" EXCLUDE_FROM_ALL testfconstruct.cc)
 set_target_properties(testfconstruct_fail2 PROPERTIES COMPILE_FLAGS "-DFVSIZE=5")
 target_link_libraries(testfconstruct_fail2 "dunecommon")
 add_executable("tuplestest_config" tuplestest.cc)
-add_executable("tuplestest_dune" tuplestest.cc)
-set_target_properties(tuplestest_dune PROPERTIES COMPILE_FLAGS "-DDISABLE_TR1_TUPLE -DDISABLE_STD_TUPLE")
-add_executable("tuplestest_tr1" tuplestest.cc)
-set_target_properties(tuplestest_tr1 PROPERTIES COMPILE_FLAGS "-DDISABLE_STD_TUPLE")
 add_executable("tupleutilitytest" tupleutilitytest.cc)
 add_executable("utilitytest" utilitytest.cc)
 

dune/common/test/Makefile.am

@@ -49,9 +49,7 @@ TESTPROGS = \
     testfassign_fail6 \
     testfconstruct \
     testfloatcmp \
-    tuplestest_dune \
     tuplestest_std \
-    tuplestest_tr1 \
     tupleutilitytest \
     typetraitstest \
     utilitytest
@@ -251,16 +249,8 @@ testfconstruct_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=5
 
 testfloatcmp_SOURCES = testfloatcmp.cc
 
-tuplestest_dune_SOURCES = tuplestest.cc
-tuplestest_dune_CPPFLAGS = $(AM_CPPFLAGS)       \
-    -DDISABLE_TR1_TUPLE -DDISABLE_STD_TUPLE
-
 tuplestest_std_SOURCES = tuplestest.cc
 
-tuplestest_tr1_SOURCES = tuplestest.cc
-tuplestest_tr1_CPPFLAGS = $(AM_CPPFLAGS)        \
-    -DDISABLE_STD_TUPLE
-
 tupleutilitytest_SOURCES = tupleutilitytest.cc
 
 typetraitstest_SOURCES = typetraitstest.cc

dune/common/test/tuplestest.cc

@@ -12,14 +12,6 @@
 #include "config.h"
 #endif
 
-#if defined(DISABLE_TR1_TUPLE) && defined(HAVE_TR1_TUPLE)
-#undef HAVE_TR1_TUPLE
-#endif
-
-#if defined(DISABLE_STD_TUPLE) && defined(HAVE_TUPLE)
-#undef HAVE_TUPLE
-#endif
-
 #include <cassert>
 #include <cstdlib>
 #include <iostream>

m4/dune_tr1_headers.m4

@@ -9,7 +9,7 @@ AC_DEFUN([DUNE_TR1_HEADERS], [
     [],
     [enable_tr1_headers=yes])
   AS_IF([test "x$enable_tr1_headers" != "xno"],
-    [AC_CHECK_HEADERS([type_traits tr1/type_traits tuple tr1/tuple])
+    [AC_CHECK_HEADERS([type_traits tr1/type_traits])
      AC_CACHE_CHECK([whether integral_constant conforming to C++11 is supported], dune_cv_integral_constant_cplusplus11, [
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([