stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r557340 - /incubator/stdcxx/trunk/include/loc/_ctype.h
Date Wed, 18 Jul 2007 17:52:16 GMT
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  <sebor@roguewave.com>

	* _ctype.h (ctype<wchar_t>): 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:
 



Mime
View raw message