[tuplestest] Test all available tuple implementations.

[[Imported from SVN: r6312]]

dune/common/test/Makefile.am

@@ -43,7 +43,9 @@ TESTPROGS = \
     testfassign_fail4 \
     testfassign_fail5 \
     testfassign_fail6 \
-    tuplestest \
+    tuplestest_dune \
+    tuplestest_std \
+    tuplestest_tr1 \
     tupleutilitytest \
     utilitytest
 
@@ -103,7 +105,15 @@ arraylisttest_SOURCES = arraylisttest.cc
 
 shared_ptrtest_SOURCES = shared_ptrtest.cc
 
-tuplestest_SOURCES = tuplestest.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
 

dune/common/test/tuplestest.cc

@@ -7,6 +7,14 @@
 #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 <dune/common/tuples.hh>
 #include <string>
 #include <iostream>