From patchwork Thu Sep 9 10:47:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 64282 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]) by ozlabs.org (Postfix) with SMTP id D5C32B6F01 for ; Thu, 9 Sep 2010 20:48:02 +1000 (EST) Received: (qmail 4735 invoked by alias); 9 Sep 2010 10:47:39 -0000 Received: (qmail 4715 invoked by uid 22791); 9 Sep 2010 10:47:36 -0000 X-SWARE-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL, BAYES_40, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from vsmtp21.tin.it (HELO vsmtp21.tin.it) (212.216.176.109) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 09 Sep 2010 10:47:22 +0000 Received: from [192.168.0.4] (79.53.13.46) by vsmtp21.tin.it (8.5.113) id 4BC86A490A882651; Thu, 9 Sep 2010 12:47:19 +0200 Message-ID: <4C88BB36.7090605@oracle.com> Date: Thu, 09 Sep 2010 12:47:18 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Minor uglification fixes to cxxabi.h X-IsSubscribed: yes 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 Hi, noticed earlier today. Committed to mainline. Paolo. ///////////////// 2010-09-09 Paolo Carlini * libsupc++/cxxabi.h: Uglify nothrow to __nothrow__; fix a few inconsistent uglifications everywhere. Index: libsupc++/cxxabi.h =================================================================== --- libsupc++/cxxabi.h (revision 164057) +++ libsupc++/cxxabi.h (working copy) @@ -53,7 +53,7 @@ #ifdef __cplusplus #define _GLIBCXX_NOTHROW throw() #else -#define _GLIBCXX_NOTHROW __attribute__((nothrow)) +#define _GLIBCXX_NOTHROW __attribute__((__nothrow__)) #endif #ifdef __cplusplus @@ -68,55 +68,55 @@ // Allocate array. void* __cxa_vec_new(size_t __element_count, size_t __element_size, - size_t __padding_size, __cxa_cdtor_type constructor, - __cxa_cdtor_type destructor); + size_t __padding_size, __cxa_cdtor_type __constructor, + __cxa_cdtor_type __destructor); void* __cxa_vec_new2(size_t __element_count, size_t __element_size, - size_t __padding_size, __cxa_cdtor_type constructor, - __cxa_cdtor_type destructor, void *(*__alloc) (size_t), + size_t __padding_size, __cxa_cdtor_type __constructor, + __cxa_cdtor_type __destructor, void *(*__alloc) (size_t), void (*__dealloc) (void*)); void* __cxa_vec_new3(size_t __element_count, size_t __element_size, - size_t __padding_size, __cxa_cdtor_type constructor, - __cxa_cdtor_type destructor, void *(*__alloc) (size_t), + size_t __padding_size, __cxa_cdtor_type __constructor, + __cxa_cdtor_type __destructor, void *(*__alloc) (size_t), void (*__dealloc) (void*, size_t)); // Construct array. __cxa_vec_ctor_return_type __cxa_vec_ctor(void* __array_address, size_t __element_count, - size_t __element_size, __cxa_cdtor_type constructor, - __cxa_cdtor_type destructor); + size_t __element_size, __cxa_cdtor_type __constructor, + __cxa_cdtor_type __destructor); __cxa_vec_ctor_return_type - __cxa_vec_cctor(void* dest_array, void* src_array, size_t element_count, - size_t element_size, - __cxa_cdtor_return_type (*constructor) (void*, void*), - __cxa_cdtor_type destructor); + __cxa_vec_cctor(void* __dest_array, void* __src_array, + size_t __element_count, size_t __element_size, + __cxa_cdtor_return_type (*__constructor) (void*, void*), + __cxa_cdtor_type __destructor); // Destruct array. void __cxa_vec_dtor(void* __array_address, size_t __element_count, - size_t __element_size, __cxa_cdtor_type destructor); + size_t __element_size, __cxa_cdtor_type __destructor); void - __cxa_vec_cleanup(void* __array_address, size_t __element_count, - size_t __s, __cxa_cdtor_type destructor) _GLIBCXX_NOTHROW; + __cxa_vec_cleanup(void* __array_address, size_t __element_count, size_t __s, + __cxa_cdtor_type __destructor) _GLIBCXX_NOTHROW; // Destruct and release array. void __cxa_vec_delete(void* __array_address, size_t __element_size, - size_t __padding_size, __cxa_cdtor_type destructor); + size_t __padding_size, __cxa_cdtor_type __destructor); void __cxa_vec_delete2(void* __array_address, size_t __element_size, - size_t __padding_size, __cxa_cdtor_type destructor, + size_t __padding_size, __cxa_cdtor_type __destructor, void (*__dealloc) (void*)); void __cxa_vec_delete3(void* __array_address, size_t __element_size, - size_t __padding_size, __cxa_cdtor_type destructor, + size_t __padding_size, __cxa_cdtor_type __destructor, void (*__dealloc) (void*, size_t)); int