diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-07 00:50:16 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-07 00:50:16 +0000 |
| commit | 7aab08a2b6a392510877a2cd639fea16b478f7d4 (patch) | |
| tree | ecf9ebe03a77251e2a455aa79bb45c39aac2be8c /libstdc++-v3/src | |
| parent | f1d5fb49d867293258e717b595f0db7baa3828ac (diff) | |
| download | gcc-7aab08a2b6a392510877a2cd639fea16b478f7d4.tar.gz | |
PR libstdc++/55847
* src/c++11/shared_ptr.cc (bad_weak_ptr::what()): Correct string.
* testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc: Verify
string.
PR libstdc++/55728
* include/std/functional (bad_function_call::what()): Declare.
* src/c++11/functional.cc (bad_function_call::what()): Define.
* config/abi/pre/gnu.ver (bad_function_call::what()): Export.
* testsuite/20_util/bad_function_call/what.cc: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194958 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++11/functional.cc | 9 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/shared_ptr.cc | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libstdc++-v3/src/c++11/functional.cc b/libstdc++-v3/src/c++11/functional.cc index 2ab34051432..8d81f6028eb 100644 --- a/libstdc++-v3/src/c++11/functional.cc +++ b/libstdc++-v3/src/c++11/functional.cc @@ -1,7 +1,6 @@ // Support for <functional> -*- C++ -*- -// Copyright (C) 2011 -// Free Software Foundation, Inc. +// Copyright (C) 2011-2013 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -29,7 +28,11 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - bad_function_call::~bad_function_call() throw() = default; + bad_function_call::~bad_function_call() noexcept = default; + + const char* + bad_function_call::what() const noexcept + { return "bad_function_call"; } _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/src/c++11/shared_ptr.cc b/libstdc++-v3/src/c++11/shared_ptr.cc index 911e745ebe2..ca5714a318d 100644 --- a/libstdc++-v3/src/c++11/shared_ptr.cc +++ b/libstdc++-v3/src/c++11/shared_ptr.cc @@ -1,7 +1,6 @@ // Support for pointer abstractions -*- C++ -*- -// Copyright (C) 2011 -// Free Software Foundation, Inc. +// Copyright (C) 2011-2013 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -33,7 +32,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION char const* bad_weak_ptr::what() const noexcept - { return "std::bad_weak_ptr"; } + { return "bad_weak_ptr"; } _GLIBCXX_END_NAMESPACE_VERSION } // namespace |