svn commit: r554071 - /incubator/stdcxx/trunk/include/loc/_facet.h

[se...@apache.org]

Author: sebor
Date: Fri Jul  6 15:06:57 2007
New Revision: 554071

URL: http://svn.apache.org/viewvc?view=rev&rev=554071
Log:
2007-07-06  Martin Sebor  <se...@roguewave.com>

	* _facet.h (_V3_LOCALE): Replaced a vestige from stdcxx 2 with _STD.
	(_C_factory_f): Removed unused typedef.

Modified:
    incubator/stdcxx/trunk/include/loc/_facet.h

Modified: incubator/stdcxx/trunk/include/loc/_facet.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_facet.h?view=diff&rev=554071&r1=554070&r2=554071
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_facet.h (original)
+++ incubator/stdcxx/trunk/include/loc/_facet.h Fri Jul  6 15:06:57 2007
@@ -38,20 +38,10 @@
 
 
 _RWSTD_NAMESPACE (std) { 
-}   // namespace std
-
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
-
-#ifndef _MSC_VER
-// make _V3_LOCALE think it's std (if it isn't) to avoid
-// having to qualify all references to standard names with _STD::
-_USING (namespace std);
-
-#endif
 
 struct _RWSTD_CLASS_EXPORT locale;
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 
 _RWSTD_NAMESPACE (__rw) { 
@@ -204,8 +194,6 @@
 
 protected:
 
-    typedef __rw_facet* (*_C_factory_f)(void*);
-
     // set facet locale name (will allocate if bufsize is too small)
     void _C_set_name (const char*, char*, _RWSTD_SIZE_T);
 
@@ -231,7 +219,7 @@
     static __rw_facet*
     _C_manage (__rw_facet*, _C_facet_type, const char*, _C_ctor_t*);
 
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
     friend class __rw_locale;
     friend struct __rw_facet_id;
     friend struct __rw_access;
@@ -274,7 +262,7 @@
     _MUTABLE _RWSTD_SIZE_T _C_id;           // unique id > 0
 
     friend class __rw_locale;
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
     friend struct __rw_access;
 };