diff options
4 files changed, 22 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 200c28653c9..d16aa1e3bc7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-06-23 Jonathan Wakely <jwakely.gcc@gmail.com> + + * testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc: Fix for + C++0x mode. + * testsuite/25_algorithms/sort/35588.cc: Likewise. + * testsuite/26_numerics/headers/complex/synopsis.cc: Likewise. + 2011-06-22 Jonathan Wakely <jwakely.gcc@gmail.com> * testsuite/20_util/bind/socket.cc: Use variable and remove attribute. diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/35588.cc b/libstdc++-v3/testsuite/25_algorithms/sort/35588.cc index c16b96dfd7a..9dd28a5c4f9 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sort/35588.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sort/35588.cc @@ -23,9 +23,8 @@ int main() { using namespace std; - using namespace tr1; using namespace std::tr1::placeholders; int t[10]; - sort(t, t+10, bind(less<int>(), _1, _2)); + sort(t, t+10, tr1::bind(less<int>(), _1, _2)); } diff --git a/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc b/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc index 4d885930b45..ecdbee0d1c6 100644 --- a/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc +++ b/libstdc++-v3/testsuite/26_numerics/headers/complex/synopsis.cc @@ -44,15 +44,20 @@ namespace std { template<class T> complex<T> operator/(const T&, const complex<T>&); template<class T> complex<T> operator+(const complex<T>&); template<class T> complex<T> operator-(const complex<T>&); - template<class T> bool operator== + template<class T> _GLIBCXX_CONSTEXPR bool operator== (const complex<T>&, const complex<T>&); - template<class T> bool operator==(const complex<T>&, const T&); - template<class T> bool operator==(const T&, const complex<T>&); + template<class T> _GLIBCXX_CONSTEXPR bool operator== + (const complex<T>&, const T&); + template<class T> _GLIBCXX_CONSTEXPR bool operator== + (const T&, const complex<T>&); - template<class T> bool operator!=(const complex<T>&, const complex<T>&); - template<class T> bool operator!=(const complex<T>&, const T&); - template<class T> bool operator!=(const T&, const complex<T>&); + template<class T> _GLIBCXX_CONSTEXPR bool operator!= + (const complex<T>&, const complex<T>&); + template<class T> _GLIBCXX_CONSTEXPR bool operator!= + (const complex<T>&, const T&); + template<class T> _GLIBCXX_CONSTEXPR bool operator!= + (const T&, const complex<T>&); template<class T, class charT, class traits> basic_istream<charT, traits>& operator>>(basic_istream<charT, traits>&, complex<T>&); @@ -61,8 +66,8 @@ namespace std { operator<<(basic_ostream<charT, traits>&, const complex<T>&); // 26.2.7 values: - template<class T> T real(const complex<T>&); - template<class T> T imag(const complex<T>&); + template<class T> _GLIBCXX_CONSTEXPR T real(const complex<T>&); + template<class T> _GLIBCXX_CONSTEXPR T imag(const complex<T>&); template<class T> T abs(const complex<T>&); template<class T> T arg(const complex<T>&); template<class T> T norm(const complex<T>&); diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc index 7aea51643fc..ea9df08f174 100644 --- a/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc +++ b/libstdc++-v3/testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc @@ -30,7 +30,7 @@ main() int i; std::string s; - tie(i, ignore, s) = make_tuple(42, 3.14, "C++"); + std::tr1::tie(i, ignore, s) = make_tuple(42, 3.14, "C++"); VERIFY( i == 42 ); VERIFY( s == "C++" ); } |