diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-06-23 10:32:23 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-06-23 11:32:23 +0100 |
| commit | 6f20ac347a219ef84e43bfdc11c010a6e79adc7b (patch) | |
| tree | ed7915fa5f1889488a3cbd7c925cf16d662473f4 /libstdc++-v3 | |
| parent | 6aad1e387ffc71cc2027f0d22fc21e2eb86e040f (diff) | |
| download | gcc-6f20ac347a219ef84e43bfdc11c010a6e79adc7b.zip gcc-6f20ac347a219ef84e43bfdc11c010a6e79adc7b.tar.gz gcc-6f20ac347a219ef84e43bfdc11c010a6e79adc7b.tar.bz2 | |
tie2.cc: Fix for C++0x mode.
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.
From-SVN: r175329
Diffstat (limited to 'libstdc++-v3')
4 files changed, 22 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 200c286..d16aa1e 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 c16b96d..9dd28a5 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 4d88593..ecdbee0 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 7aea516..ea9df08 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++" ); } |