From patchwork Fri Sep 2 13:50:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 113142 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 74CB4B6F88 for ; Fri, 2 Sep 2011 23:50:54 +1000 (EST) Received: (qmail 9068 invoked by alias); 2 Sep 2011 13:50:50 -0000 Received: (qmail 9052 invoked by uid 22791); 2 Sep 2011 13:50:49 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 02 Sep 2011 13:50:34 +0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by rcsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id p82DoUSx001160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Sep 2011 13:50:32 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id p82DoUlI009128 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Sep 2011 13:50:30 GMT Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p82DoPVX017306; Fri, 2 Sep 2011 08:50:25 -0500 Received: from [192.168.1.4] (/79.47.211.91) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Sep 2011 06:50:24 -0700 Message-ID: <4E60DF1D.40602@oracle.com> Date: Fri, 02 Sep 2011 15:50:21 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: [v3] Trivial formatting fixes to 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 over the last day or so, committed to mainline. Paolo. ////////////////// 2011-09-02 Paolo Carlini * include/std/bitset: Trivial formatting fixes. Index: include/std/bitset =================================================================== --- include/std/bitset (revision 178473) +++ include/std/bitset (working copy) @@ -94,19 +94,19 @@ #endif static _GLIBCXX_CONSTEXPR size_t - _S_whichword(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichword(size_t __pos) _GLIBCXX_NOEXCEPT { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; } static _GLIBCXX_CONSTEXPR size_t - _S_whichbyte(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichbyte(size_t __pos) _GLIBCXX_NOEXCEPT { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; } static _GLIBCXX_CONSTEXPR size_t - _S_whichbit(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichbit(size_t __pos) _GLIBCXX_NOEXCEPT { return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; } static _GLIBCXX_CONSTEXPR _WordT - _S_maskbit(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_maskbit(size_t __pos) _GLIBCXX_NOEXCEPT { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); } _WordT& @@ -389,19 +389,19 @@ { } static _GLIBCXX_CONSTEXPR size_t - _S_whichword(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichword(size_t __pos) _GLIBCXX_NOEXCEPT { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; } static _GLIBCXX_CONSTEXPR size_t - _S_whichbyte(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichbyte(size_t __pos) _GLIBCXX_NOEXCEPT { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; } static _GLIBCXX_CONSTEXPR size_t - _S_whichbit(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichbit(size_t __pos) _GLIBCXX_NOEXCEPT { return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; } static _GLIBCXX_CONSTEXPR _WordT - _S_maskbit(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_maskbit(size_t __pos) _GLIBCXX_NOEXCEPT { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); } _WordT& @@ -533,19 +533,19 @@ { } static _GLIBCXX_CONSTEXPR size_t - _S_whichword(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichword(size_t __pos) _GLIBCXX_NOEXCEPT { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; } static _GLIBCXX_CONSTEXPR size_t - _S_whichbyte(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichbyte(size_t __pos) _GLIBCXX_NOEXCEPT { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; } static _GLIBCXX_CONSTEXPR size_t - _S_whichbit(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_whichbit(size_t __pos) _GLIBCXX_NOEXCEPT { return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; } static _GLIBCXX_CONSTEXPR _WordT - _S_maskbit(size_t __pos ) _GLIBCXX_NOEXCEPT + _S_maskbit(size_t __pos) _GLIBCXX_NOEXCEPT { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); } // This would normally give access to the data. The bounds-checking @@ -650,17 +650,17 @@ { typedef unsigned long _WordT; - static void + static void _S_do_sanitize(_WordT& __val) _GLIBCXX_NOEXCEPT { __val &= ~((~static_cast<_WordT>(0)) << _Extrabits); } }; template<> struct _Sanitize<0> - { + { typedef unsigned long _WordT; - static void + static void _S_do_sanitize(_WordT) _GLIBCXX_NOEXCEPT { } }; @@ -1364,7 +1364,7 @@ * @sa _Find_first */ size_t - _Find_next(size_t __prev ) const _GLIBCXX_NOEXCEPT + _Find_next(size_t __prev) const _GLIBCXX_NOEXCEPT { return this->_M_do_find_next(__prev, _Nb); } };