[multiple changes]

[thirdparty/gcc.git] / libstdc++-v3 / testsuite / util / testsuite_tr1.h

diff --git a/libstdc++-v3/testsuite/util/testsuite_tr1.h b/libstdc++-v3/testsuite/util/testsuite_tr1.h
index c92de4378107a4f88ee1b5a2dcea8f3d3dfda151..7ac45bdcaa0895a31f68a0e07836985debb1e056 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_tr1.h
+++ b/libstdc++-v3/testsuite/util/testsuite_tr1.h
@@ -67,6 +67,18 @@ namespace __gnu_test
       return ret;
     }
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+  template<template<typename...> class Relationship,
+           typename... Types>
+    bool
+    test_relationship(bool value)
+    {
+      bool ret = true;
+      ret &= Relationship<Types...>::value == value;
+      ret &= Relationship<Types...>::type::value == value;
+      return ret;
+    }
+#else
   template<template<typename, typename> class Relationship,
            typename Type1, typename Type2>
     bool
@@ -77,6 +89,7 @@ namespace __gnu_test
       ret &= Relationship<Type1, Type2>::type::value == value;
       return ret;
     }
+#endif
 
   // Test types.
   class ClassType { };
@@ -112,6 +125,12 @@ namespace __gnu_test
 
   class IncompleteClass;
 
+  struct ExplicitClass
+  {
+    ExplicitClass(double&);
+    explicit ExplicitClass(int&);
+  };
+
   int truncate_float(float x) { return (int)x; }
   long truncate_double(double x) { return (long)x; }