summaryrefslogtreecommitdiff
path: root/libstdc++-v3/src/c++11/functional.cc
diff options
context:
space:
mode:
authorbviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-07 16:42:49 +0000
committerbviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-07 16:42:49 +0000
commit5391d40fb4321a779e2a0fcb7353b421a20121ba (patch)
tree270c2cd1491c40f8ae4b82d95b25b0e914a1f0a8 /libstdc++-v3/src/c++11/functional.cc
parenta94856bbd406ecad873946beeeeabec5db7eb7ac (diff)
downloadgcc-5391d40fb4321a779e2a0fcb7353b421a20121ba.tar.gz
Merged with trunk at revision 194958.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/cilkplus@194982 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/c++11/functional.cc')
-rw-r--r--libstdc++-v3/src/c++11/functional.cc9
1 files changed, 6 insertions, 3 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