From stdcxx-commits-return-1548-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Wed Jul 18 17:53:12 2007 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 3733 invoked from network); 18 Jul 2007 17:53:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jul 2007 17:53:11 -0000 Received: (qmail 79527 invoked by uid 500); 18 Jul 2007 17:52:39 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 79498 invoked by uid 500); 18 Jul 2007 17:52:39 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 79462 invoked by uid 99); 18 Jul 2007 17:52:39 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jul 2007 10:52:39 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jul 2007 10:52:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 18D2C1A981A; Wed, 18 Jul 2007 10:52:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r557340 - /incubator/stdcxx/trunk/include/loc/_ctype.h Date: Wed, 18 Jul 2007 17:52:16 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070718175216.18D2C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebor Date: Wed Jul 18 10:52:15 2007 New Revision: 557340 URL: http://svn.apache.org/viewvc?view=rev&rev=557340 Log: 2007-07-18 Martin Sebor * _ctype.h (ctype): Moved definitions of public members above those of protected virtual functions and removed an outdated comment explaining the unusual class layout. Modified: incubator/stdcxx/trunk/include/loc/_ctype.h Modified: incubator/stdcxx/trunk/include/loc/_ctype.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_ctype.h?view=diff&rev=557340&r1=557339&r2=557340 ============================================================================== --- incubator/stdcxx/trunk/include/loc/_ctype.h (original) +++ incubator/stdcxx/trunk/include/loc/_ctype.h Wed Jul 18 10:52:15 2007 @@ -421,56 +421,8 @@ typedef wchar_t char_type; -protected: - // inline virtual functions defined first to allow compilers to - // inline their definitions when being called from nonvirtuals - - virtual ~ctype (); - - // 22.2.1.1.2, p1 - virtual bool do_is (mask, char_type) const; - - virtual const char_type* - do_is (const char_type*, const char_type*, mask*) const; - - // 22.2.1.1.2, p7 - virtual char_type do_toupper (char_type) const; - - // 22.2.1.1.2, p9 - virtual char_type do_tolower (char_type) const; - - // 22.2.1.1.2, p11 - virtual char_type do_widen (char) const; - - virtual const char* - do_widen (const char*, const char*, char_type*) const; - - // 22.2.1.1.2, p13 - virtual char - do_narrow (char_type, char) const; - - virtual const char_type* - do_toupper (char_type*, const char_type*) const; - - virtual const char_type* - do_tolower (char_type*, const char_type*) const; - - // 22.2.1.1.2, p3 - virtual const char_type* - do_scan_is (mask, const char_type*, const char_type*) const; - - // 22.2.1.1.2, p5 - virtual const char_type* - do_scan_not (mask, const char_type*, const char_type*) const; - - virtual const char_type* - do_narrow (const char_type*, const char_type*, char, char*) const; - -public: - _EXPLICIT ctype (_RWSTD_SIZE_T = 0); - // 22.2.1.1.1, p1 bool is (mask __m, char_type __c) const { return do_is ( __m, __c); @@ -529,6 +481,49 @@ } static _RW::__rw_facet_id id; + +protected: + + virtual ~ctype (); + + // 22.2.1.1.2, p1 + virtual bool do_is (mask, char_type) const; + + virtual const char_type* + do_is (const char_type*, const char_type*, mask*) const; + + // 22.2.1.1.2, p7 + virtual char_type do_toupper (char_type) const; + + // 22.2.1.1.2, p9 + virtual char_type do_tolower (char_type) const; + + // 22.2.1.1.2, p11 + virtual char_type do_widen (char) const; + + virtual const char* + do_widen (const char*, const char*, char_type*) const; + + // 22.2.1.1.2, p13 + virtual char + do_narrow (char_type, char) const; + + virtual const char_type* + do_toupper (char_type*, const char_type*) const; + + virtual const char_type* + do_tolower (char_type*, const char_type*) const; + + // 22.2.1.1.2, p3 + virtual const char_type* + do_scan_is (mask, const char_type*, const char_type*) const; + + // 22.2.1.1.2, p5 + virtual const char_type* + do_scan_not (mask, const char_type*, const char_type*) const; + + virtual const char_type* + do_narrow (const char_type*, const char_type*, char, char*) const; private: