diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 49384c9508f27f6c528ce2c371cc38f636b416e6..481e264974c37a09b20d8c8f71b38aedad5a17d0 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 8fddc8890620db023946440a0280feb54e4ca31e..7d5677f85ef67db24ec6e529146cb6e7c8d4c3f1 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; }