From ab44b018f66c0bdf4bd64fb171029afc853d2914 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Sat, 14 Jan 2006 20:59:41 +0000
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                 | 4 ++++
 libstdc++-v3/testsuite/testsuite_tr1.h | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 49384c9508f..481e264974c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+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:
diff --git a/libstdc++-v3/testsuite/testsuite_tr1.h b/libstdc++-v3/testsuite/testsuite_tr1.h
index 8fddc889062..7d5677f85ef 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; }