summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/bits/c++config
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2011-05-24 10:28:13 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2011-05-24 10:28:13 +0000
commit22a5fa5e6e6cd368875b8dc5da05b892645477da (patch)
tree4a2f39e0af06628e39c4a0ab421272957db7ffa7 /libstdc++-v3/include/bits/c++config
parent4288ce5adbccd9620d86403f1effcfd2551ff716 (diff)
downloadppe42-gcc-22a5fa5e6e6cd368875b8dc5da05b892645477da.tar.gz
ppe42-gcc-22a5fa5e6e6cd368875b8dc5da05b892645477da.zip
2011-05-24 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/c++config (_GLIBCXX_NOTHROW): Update for noexcept. * testsuite/ext/profile/mutex_extensions_neg.cc: Adjust dg-error line number. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174107 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/c++config')
-rw-r--r--libstdc++-v3/include/bits/c++config9
1 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 5cb654b45b7..e8a2946dcc3 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -52,10 +52,9 @@
# define _GLIBCXX_NORETURN __attribute__ ((__noreturn__))
#endif
+// See below for C++
#ifndef _GLIBCXX_NOTHROW
-# ifdef __cplusplus
-# define _GLIBCXX_NOTHROW throw()
-# else
+# ifndef __cplusplus
# define _GLIBCXX_NOTHROW __attribute__((__nothrow__))
# endif
#endif
@@ -110,6 +109,10 @@
# endif
#endif
+#ifndef _GLIBCXX_NOTHROW
+# define _GLIBCXX_NOTHROW _GLIBCXX_USE_NOEXCEPT
+#endif
+
// Macro for extern template, ie controling template linkage via use
// of extern keyword on template declaration. As documented in the g++
// manual, it inhibits all implicit instantiations and is used
OpenPOWER on IntegriCloud