aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2006-01-14 20:59:41 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2006-01-14 20:59:41 +0000
commitab44b018f66c0bdf4bd64fb171029afc853d2914 (patch)
tree5bad88e0d5584fc983883fa4b7e49db3636a1f95
parent9b61327b890150182672aa21eb45c6c3bcab0441 (diff)
downloadgcc-ab44b018f66c0bdf4bd64fb171029afc853d2914.zip
gcc-ab44b018f66c0bdf4bd64fb171029afc853d2914.tar.gz
gcc-ab44b018f66c0bdf4bd64fb171029afc853d2914.tar.bz2
testsuite_tr1.h: Add missing include; use std::__are_same.
2006-01-14 Paolo Carlini <pcarlini@suse.de> * testsuite/testsuite_tr1.h: Add missing include; use std::__are_same. From-SVN: r109705
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/testsuite/testsuite_tr1.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 49384c9..481e264 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
2006-01-14 Paolo Carlini <pcarlini@suse.de>
+ * testsuite/testsuite_tr1.h: Add missing include; use std::__are_same.
+
+2006-01-14 Paolo Carlini <pcarlini@suse.de>
+
* testsuite/tr1/8_c_compatibility/complex/overloads_int.cc:
Fix wrong test (don't pick by mistake the (const complex<>&, int)
overload); add some.
diff --git a/libstdc++-v3/testsuite/testsuite_tr1.h b/libstdc++-v3/testsuite/testsuite_tr1.h
index 8fddc88..7d5677f 100644
--- a/libstdc++-v3/testsuite/testsuite_tr1.h
+++ b/libstdc++-v3/testsuite/testsuite_tr1.h
@@ -31,6 +31,8 @@
#ifndef _GLIBCXX_TESTSUITE_TR1_H
#define _GLIBCXX_TESTSUITE_TR1_H
+#include <bits/cpp_type_traits.h>
+
namespace __gnu_test
{
// For tr1/type_traits.
@@ -167,7 +169,7 @@ namespace __gnu_test
// For use in 8_c_compatibility.
template<typename R, typename T>
- typename std::__enable_if<bool, std::tr1::is_same<R, T>::value>::__type
+ typename std::__enable_if<bool, std::__are_same<R, T>::__value>::__type
check_ret_type(T)
{ return true; }