diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-08 13:31:19 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-04-08 13:31:19 +0000 |
| commit | 2307c21b4bc4f77e62d170023a6b0d97a2c5b2f1 (patch) | |
| tree | 738c91081194ee06e9d6fca46a61d855ae6e6607 /libstdc++-v3 | |
| parent | 27fbd5b67b69cb35ed6cdd78a5ae7f0315e913f2 (diff) | |
| download | gcc-2307c21b4bc4f77e62d170023a6b0d97a2c5b2f1.tar.gz | |
2014-04-08 Basile Starynkevitch <basile@starynkevitch.net>
{{merge using svnmerge.py with trunk GCC 4.9 svn
rev.209216...}}
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@209217 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/exchange/1.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/pair/40925.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c65abca0943..dfab69de0d7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2014-04-07 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/20_util/exchange/1.cc: Add missing return statements. + * testsuite/20_util/pair/40925.cc: Avoid most vexing parse. + * testsuite/22_locale/codecvt_byname/50714.cc: Add missing exception + specifications. + 2014-04-02 Dominique d'Humieres <dominiq@lps.ens.fr> Jack Howarth <howarth@bromo.med.uc.edu> diff --git a/libstdc++-v3/testsuite/20_util/exchange/1.cc b/libstdc++-v3/testsuite/20_util/exchange/1.cc index 923920edda7..2f8825d1eca 100644 --- a/libstdc++-v3/testsuite/20_util/exchange/1.cc +++ b/libstdc++-v3/testsuite/20_util/exchange/1.cc @@ -78,8 +78,8 @@ void test04() To() = default; To(const To&) = default; To(const From&) = delete; - To& operator=(const From&) { value = 1; } - To& operator=(From&&) { value = 2; } + To& operator=(const From&) { value = 1; return *this; } + To& operator=(From&&) { value = 2; return *this; } }; To t; diff --git a/libstdc++-v3/testsuite/20_util/pair/40925.cc b/libstdc++-v3/testsuite/20_util/pair/40925.cc index 599fd3875e5..5b34a626eb1 100644 --- a/libstdc++-v3/testsuite/20_util/pair/40925.cc +++ b/libstdc++-v3/testsuite/20_util/pair/40925.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++0x" } +// { dg-options "-std=gnu++11" } // { dg-do compile } // Copyright (C) 2009-2014 Free Software Foundation, Inc. @@ -63,5 +63,5 @@ void test01() std::pair<move_only, int*> p15(move_only(), ip); std::pair<move_only, int X::*> p16(move_only(), mp); - std::pair<move_only, move_only> p17(move_only(), move_only()); + std::pair<move_only, move_only> p17{move_only(), move_only()}; } diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc b/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc index e40717ba168..d42caa54e05 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc @@ -52,12 +52,12 @@ namespace std template<> int - codecvt<mychar, char, mbstate_t>::do_encoding() const + codecvt<mychar, char, mbstate_t>::do_encoding() const throw() { return 0; } template<> bool - codecvt<mychar, char, mbstate_t>::do_always_noconv() const + codecvt<mychar, char, mbstate_t>::do_always_noconv() const throw() { return false; } template<> @@ -69,7 +69,7 @@ namespace std template<> int - codecvt<mychar, char, mbstate_t>::do_max_length() const + codecvt<mychar, char, mbstate_t>::do_max_length() const throw() { return 4; } } |