From patchwork Fri Dec 12 15:58:57 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jonathan Wakely
X-Patchwork-Id: 420533
Return-Path:
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
bits)) (No client certificate requested)
by ozlabs.org (Postfix) with ESMTPS id B5E4B14003E
for ;
Sat, 13 Dec 2014 02:59:11 +1100 (AEDT)
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
:list-unsubscribe:list-archive:list-post:list-help:sender:date
:from:to:subject:message-id:mime-version:content-type
:content-transfer-encoding; q=dns; s=default; b=wzBJriOa4PB93xFu
x+5NV8tRb4l1oR5C5aHtISsbNx8L53D/hn0DAi0g6rHNTus2NbDgF4R01GexEECS
2R4PJNG4H4zTTvrXD8QMzffc3LZALbrswRPtYVAp1hxoTOf8OLnz7vhsYJX+sYLn
DcuMEC1LXcOkswJ/QoI1n+KoS8g=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id
:list-unsubscribe:list-archive:list-post:list-help:sender:date
:from:to:subject:message-id:mime-version:content-type
:content-transfer-encoding; s=default; bh=S9gTftMyZdJ58F8zlrHccA
5HXI8=; b=nnHTP5C0GBS4KAY1qD/zixxHAlgItYYS/7iaAAgxSP18l8kSRCjO63
dDgTYvpAKGZwItIIdeg68IZPB8DG5EgdEAzfFf+EmlraPiu7MxiXcKYouHjkUHbW
FREPro48ZBV1ShpnBFH1JtMUW6AnQJzf40lwNc/PERdOWL+ONS8Q0=
Received: (qmail 23625 invoked by alias); 12 Dec 2014 15:59:03 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id:
List-Unsubscribe:
List-Archive:
List-Post:
List-Help:
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org
Received: (qmail 23597 invoked by uid 89); 12 Dec 2014 15:59:02 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00,
SPF_HELO_PASS, SPF_PASS,
T_RP_MATCHES_RCVD autolearn=ham version=3.3.2
X-Spam-User: qpsmtpd, 2 recipients
X-HELO: mx1.redhat.com
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by
sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with
(AES256-GCM-SHA384 encrypted) ESMTPS;
Fri, 12 Dec 2014 15:59:00 +0000
Received: from int-mx14.intmail.prod.int.phx2.redhat.com
(int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by
mx1.redhat.com (8.14.4/8.14.4) with ESMTP id
sBCFwwk6006913 (version=TLSv1/SSLv3
cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL);
Fri, 12 Dec 2014 10:58:58 -0500
Received: from localhost (ovpn-116-46.ams2.redhat.com [10.36.116.46]) by
int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4)
with ESMTP id sBCFwvTa027777; Fri, 12 Dec 2014 10:58:58 -0500
Date: Fri, 12 Dec 2014 15:58:57 +0000
From: Jonathan Wakely
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [patch] libstdc++/64276 replace __EXCEPTIONS and __GXX_RTTI with
SD-6 macros
Message-ID: <20141212155857.GP3134@redhat.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)
This replaces the GCC-specific macros with the portable
feature-testing macros that are now supported by GCC.
Tested x86_64-linux, committed to trunk.
commit 6565657776c8c9ebe4055510f2485ccc695e23ef
Author: Jonathan Wakely
Date: Fri Dec 12 15:11:39 2014 +0000
PR libstdc++/64276
* doc/doxygen/user.cfg.in: Define __cpp_exceptions and __cpp_rtti.
* doc/html/manual/using_exceptions.html: Regenerate.
* doc/xml/manual/using_exceptions.xml: Use SD-6 feature-testing
macros, __cpp_exceptions and __cpp_rtti, instead of __EXCEPTIONS and
__GXX_RTTI.
* include/bits/c++config: Likewise.
* include/bits/locale_classes.tcc: Likewise.
* include/bits/shared_ptr.h: Likewise.
* include/bits/shared_ptr_base.h: Likewise.
* include/debug/formatter.h: Likewise.
* include/experimental/any: Likewise.
* include/ext/rope: Likewise.
* include/ext/ropeimpl.h: Likewise.
* include/std/functional: Likewise.
* include/tr1/functional: Likewise.
* include/tr1/shared_ptr.h: Likewise.
* libsupc++/eh_call.cc: Likewise.
* libsupc++/eh_personality.cc: Likewise.
* libsupc++/exception_defines.h: Likewise.
* libsupc++/exception_ptr.h: Likewise.
* libsupc++/guard.cc: Likewise.
* libsupc++/pbase_type_info.cc: Likewise.
* libsupc++/pointer_type_info.cc: Likewise.
* libsupc++/vterminate.cc: Likewise.
* src/c++11/thread.cc: Likewise.
diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in
index 7ec91a1..019462e 100644
--- a/libstdc++-v3/doc/doxygen/user.cfg.in
+++ b/libstdc++-v3/doc/doxygen/user.cfg.in
@@ -2142,8 +2142,8 @@ PREDEFINED = __cplusplus=201103L \
_GLIBCXX_USE_C99_STDINT_TR1 \
_GLIBCXX_USE_SCHED_YIELD \
_GLIBCXX_USE_NANOSLEEP \
- __EXCEPTIONS \
- __GXX_RTTI \
+ __cpp_exceptions \
+ __cpp_rtti \
ATOMIC_INT_LOCK_FREE \
PB_DS_DATA_TRUE_INDICATOR \
PB_DS_STATIC_ASSERT=// \
diff --git a/libstdc++-v3/doc/html/manual/using_exceptions.html b/libstdc++-v3/doc/html/manual/using_exceptions.html
index 83e4ba6..f1dd099 100644
--- a/libstdc++-v3/doc/html/manual/using_exceptions.html
+++ b/libstdc++-v3/doc/html/manual/using_exceptions.html
@@ -151,7 +151,7 @@ exception neutrality and exception safety.
and __throw_exception_again
. They are defined
as follows.
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
# define __try try
# define __catch(X) catch(X)
# define __throw_exception_again throw
@@ -165,7 +165,7 @@ exception neutrality and exception safety.
class exception
, there exists a corresponding
function with C language linkage. An example:
-#ifdef __EXCEPTIONS
+#if __cpp_exceptions
void __throw_bad_exception(void)
{ throw bad_exception(); }
#else
@@ -310,4 +310,4 @@ is called.
GCC Bug 25191: exception_defines.h #defines try/catch
- .