Author: faridz Date: Wed Nov 21 11:14:55 2007 New Revision: 597184 URL: http://svn.apache.org/viewvc?rev=597184&view=rev Log: 2007-11-21 Farid Zaripov <[EMAIL PROTECTED]>
Merged r597181 from branches/4.2.x with a fix for STDCXX-594. * include/rw/_defs.h (_V3_LOCALE): Replaced the obsolete macro with _STD. * include/loc/_locale.h: Ditto. * include/loc/_codecvt.cc: Ditto. * include/loc/_codecvt.h: Ditto. * include/loc/_collate.cc: Ditto. * include/loc/_collate.h: Ditto. * include/loc/_convenience.h: Ditto. * include/loc/_ctype.cc: Ditto. * include/loc/_ctype.h: Ditto. * include/loc/_messages.cc: Ditto. * include/loc/_messages.h: Ditto. * include/loc/_money_get.cc: Ditto. * include/loc/_money_put.cc: Ditto. * include/loc/_moneypunct.cc: Ditto. * include/loc/_moneypunct.h: Ditto. * include/loc/_num_get.cc: Ditto. * include/loc/_num_put.cc: Ditto. * include/loc/_numpunct.cc: Ditto. * include/loc/_numpunct.h: Ditto. * include/loc/_time_get.cc: Ditto. * include/loc/_time_put.cc: Ditto. * src/use_facet.h: Ditto. Modified: incubator/stdcxx/trunk/include/loc/_codecvt.cc incubator/stdcxx/trunk/include/loc/_codecvt.h incubator/stdcxx/trunk/include/loc/_collate.cc incubator/stdcxx/trunk/include/loc/_collate.h incubator/stdcxx/trunk/include/loc/_convenience.h incubator/stdcxx/trunk/include/loc/_ctype.cc incubator/stdcxx/trunk/include/loc/_ctype.h incubator/stdcxx/trunk/include/loc/_locale.h incubator/stdcxx/trunk/include/loc/_messages.cc incubator/stdcxx/trunk/include/loc/_messages.h incubator/stdcxx/trunk/include/loc/_money_get.cc incubator/stdcxx/trunk/include/loc/_money_put.cc incubator/stdcxx/trunk/include/loc/_moneypunct.cc incubator/stdcxx/trunk/include/loc/_moneypunct.h incubator/stdcxx/trunk/include/loc/_num_get.cc incubator/stdcxx/trunk/include/loc/_num_put.cc incubator/stdcxx/trunk/include/loc/_numpunct.cc incubator/stdcxx/trunk/include/loc/_numpunct.h incubator/stdcxx/trunk/include/loc/_time_get.cc incubator/stdcxx/trunk/include/loc/_time_put.cc incubator/stdcxx/trunk/include/rw/_defs.h incubator/stdcxx/trunk/src/use_facet.h Modified: incubator/stdcxx/trunk/include/loc/_codecvt.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_codecvt.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_codecvt.cc (original) +++ incubator/stdcxx/trunk/include/loc/_codecvt.cc Wed Nov 21 11:14:55 2007 @@ -27,7 +27,7 @@ **************************************************************************/ -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #ifndef _RWSTD_NO_EXT_CODECVT_PRIMARY @@ -38,4 +38,4 @@ #endif // _RWSTD_NO_EXT_CODECVT_PRIMARY -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_codecvt.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_codecvt.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_codecvt.h (original) +++ incubator/stdcxx/trunk/include/loc/_codecvt.h Wed Nov 21 11:14:55 2007 @@ -44,7 +44,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { // 22.2.1.5 - Template class codecvt @@ -446,7 +446,7 @@ #endif // _RWSTD_NO_WCHAR_T -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE (_CODECVT) Modified: incubator/stdcxx/trunk/include/loc/_collate.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_collate.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_collate.cc (original) +++ incubator/stdcxx/trunk/include/loc/_collate.cc Wed Nov 21 11:14:55 2007 @@ -27,7 +27,7 @@ **************************************************************************/ -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #ifndef _RWSTD_NO_EXT_COLLATE_PRIMARY @@ -37,4 +37,4 @@ #endif // _RWSTD_NO_EXT_COLLATE_PRIMARY -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_collate.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_collate.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_collate.h (original) +++ incubator/stdcxx/trunk/include/loc/_collate.h Wed Nov 21 11:14:55 2007 @@ -43,7 +43,7 @@ #include <rw/_defs.h> -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { _EXPORT @@ -254,7 +254,7 @@ #endif // _RWSTD_NO_WCHAR_T -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE (_COLLATE) Modified: incubator/stdcxx/trunk/include/loc/_convenience.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_convenience.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_convenience.h (original) +++ incubator/stdcxx/trunk/include/loc/_convenience.h Wed Nov 21 11:14:55 2007 @@ -39,7 +39,7 @@ #include <rw/_defs.h> -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { // convenience interfaces: is*(char) @@ -135,7 +135,7 @@ return (_V3_USE_FACET (ctype<_CharT>, __loc).tolower) (__c); } -} // namespace _V3_LOCALE +} // namespace std #endif // _RWSTD_LOC_CONVENIENCE_H_INCLUDED Modified: incubator/stdcxx/trunk/include/loc/_ctype.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_ctype.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_ctype.cc (original) +++ incubator/stdcxx/trunk/include/loc/_ctype.cc Wed Nov 21 11:14:55 2007 @@ -27,7 +27,7 @@ **************************************************************************/ -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #ifndef _RWSTD_NO_EXT_CTYPE_PRIMARY @@ -145,4 +145,4 @@ #endif // _RWSTD_NO_EXT_CTYPE_PRIMARY -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_ctype.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_ctype.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_ctype.h (original) +++ incubator/stdcxx/trunk/include/loc/_ctype.h Wed Nov 21 11:14:55 2007 @@ -62,7 +62,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { struct _RWSTD_CLASS_EXPORT locale; @@ -644,7 +644,7 @@ #endif // _RWSTD_NO_WCHAR_T -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE (CTYPE) Modified: incubator/stdcxx/trunk/include/loc/_locale.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_locale.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_locale.h (original) +++ incubator/stdcxx/trunk/include/loc/_locale.h Wed Nov 21 11:14:55 2007 @@ -56,11 +56,11 @@ class _RWSTD_EXPORT __rw_locale; inline const __rw_facet* -__rw_get_std_facet (const _V3_LOCALE::locale&, __rw_facet::_C_facet_type, +__rw_get_std_facet (const _STD::locale&, __rw_facet::_C_facet_type, __rw_facet::_C_ctor_t*); inline const __rw_facet* -__rw_get_facet_by_id (const _V3_LOCALE::locale&, +__rw_get_facet_by_id (const _STD::locale&, const __rw_facet_id&, const __rw_facet*); @@ -68,12 +68,12 @@ // const-qualifier from the type of Facet template <class _Facet> inline const __rw_facet* -__rw_get_facet (const _V3_LOCALE::locale&, const _Facet*); +__rw_get_facet (const _STD::locale&, const _Facet*); } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { // 22.1.2, p1 @@ -244,7 +244,7 @@ operator() (const basic_string<_CharT, _Traits, _Allocator> &__x, const basic_string<_CharT, _Traits, _Allocator> &__y) const { // qualify collate to distinguish it from locale::collate - return use_facet<_V3_LOCALE::collate<_CharT> >(*this) + return use_facet<_STD::collate<_CharT> >(*this) .compare (__x.data (), __x.data () + __x.length (), __y.data (), __y.data () + __y.length ()) < 0; } @@ -309,23 +309,23 @@ // function arguments below are qualified to work around // a SunPro 5.5 and prior bug (PR #28626) friend const facet* - _RW::__rw_get_std_facet (const _V3_LOCALE::locale&, + _RW::__rw_get_std_facet (const _STD::locale&, _RW::__rw_facet::_C_facet_type, _RW::__rw_facet::_C_ctor_t*); friend const _RW::__rw_facet* - _RW::__rw_get_facet_by_id (const _V3_LOCALE::locale&, + _RW::__rw_get_facet_by_id (const _STD::locale&, const _RW::__rw_facet_id&, const _RW::__rw_facet*); }; -} // namespace _V3_LOCALE +} // namespace std _RWSTD_NAMESPACE (__rw) { inline const __rw_facet* -__rw_get_facet_by_id (const _V3_LOCALE::locale &__loc, +__rw_get_facet_by_id (const _STD::locale &__loc, const __rw_facet_id &__id, const __rw_facet*) { @@ -336,7 +336,7 @@ template <class _Facet> inline const __rw_facet* -__rw_get_facet (const _V3_LOCALE::locale &__loc, const _Facet *__dummy) +__rw_get_facet (const _STD::locale &__loc, const _Facet *__dummy) { // resolves either to one of the overloads of __rw_get_facet_by_id // defined for the set of standard facets or the overload for the base @@ -349,7 +349,7 @@ inline const __rw_facet* -__rw_get_std_facet (const _V3_LOCALE::locale &__loc, +__rw_get_std_facet (const _STD::locale &__loc, __rw_facet::_C_facet_type __type, __rw_facet::_C_ctor_t *__ctor) { @@ -391,7 +391,7 @@ #define _RWSTD_OVERLOAD_GET_FACET(F) \ _RWSTD_EXPORT const __rw_facet* \ - __rw_get_facet_by_id (const _V3_LOCALE::locale&, \ + __rw_get_facet_by_id (const _STD::locale&, \ const __rw_facet_id&, const F*) #define _Facet(name, T, U) _STD::name<T, U > @@ -503,7 +503,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #ifndef _RWSTD_NO_MEMBER_TEMPLATES @@ -555,7 +555,7 @@ const basic_string<_CharT, _Traits, _Allocator> &__y) const { // qualify collate to distinguish it from locale::collate - return use_facet<_V3_LOCALE::collate<_CharT> >(*this) + return use_facet<_STD::collate<_CharT> >(*this) .compare (__x.data (), __x.data () + __x.length (), __y.data (), __y.data () + __y.length ()) < 0; } @@ -564,37 +564,7 @@ #endif // _RWSTD_NO_MEMBER_TEMPLATES -} // namespace _V3_LOCALE - - -# ifndef _V3_LOCALE - -_RWSTD_NAMESPACE (std) { - -class _RWSTD_EXPORT locale; - } // namespace std - -_RWSTD_NAMESPACE (_V3_LOCALE) { - - -// template provided to allow code that mixes _V3_LOCALE::locale -// and std::iostreams to compile (i.e., when locale.2 is enabled -// and in namespace std and locale.3 is in namespace _V3_LOCALE - -template <class _Facet> -inline const _Facet& use_facet (const _STD::locale &__loc) -{ - // FIXME: this is quite unsafe since the facet may be destroyed - // as soon as the unnamed lacale temporary is destroyed - return use_facet<_Facet>(_V3_LOCALE::locale (__loc.name ().c_str ())); -} - - -} // namespace _V3_LOCALE - - -# endif // _V3_LOCALE #endif // _RWSTD_LOC_LOCALE_INCLUDED Modified: incubator/stdcxx/trunk/include/loc/_messages.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_messages.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_messages.cc (original) +++ incubator/stdcxx/trunk/include/loc/_messages.cc Wed Nov 21 11:14:55 2007 @@ -29,7 +29,7 @@ #include <loc/_ctype.h> -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT> @@ -64,7 +64,7 @@ const char* const __text = _RW::__rw_get_message (__cat, __set, __msgid); if (__text) { - typedef _V3_LOCALE::codecvt<_CharT, char, _RWSTD_MBSTATE_T> + typedef _STD::codecvt<_CharT, char, _RWSTD_MBSTATE_T> _CodeCvt; typedef _TYPENAME _CodeCvt::state_type state_type; @@ -138,4 +138,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_messages.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_messages.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_messages.h (original) +++ incubator/stdcxx/trunk/include/loc/_messages.h Wed Nov 21 11:14:55 2007 @@ -49,18 +49,18 @@ _RWSTD_NAMESPACE (__rw) { -int __rw_cat_open (const _STD::string&, const _V3_LOCALE::locale&); +int __rw_cat_open (const _STD::string&, const _STD::locale&); const char* __rw_get_message (int, int, int); -const _V3_LOCALE::locale& __rw_get_locale (int); +const _STD::locale& __rw_get_locale (int); void __rw_cat_close (int); } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { struct _RWSTD_EXPORT messages_base @@ -138,7 +138,7 @@ } }; -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE_FIRST (_MESSAGES) @@ -146,7 +146,7 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (MESSAGES) -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_MESSAGES, _CHAR) @@ -160,7 +160,7 @@ #endif // _RWSTD_INSTANTIATE (_MESSAGES, _WCHAR_T) -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE_LAST (_MESSAGES) Modified: incubator/stdcxx/trunk/include/loc/_money_get.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_money_get.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_money_get.cc (original) +++ incubator/stdcxx/trunk/include/loc/_money_get.cc Wed Nov 21 11:14:55 2007 @@ -45,7 +45,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, class _InputIter> @@ -374,4 +374,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_money_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_money_put.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_money_put.cc (original) +++ incubator/stdcxx/trunk/include/loc/_money_put.cc Wed Nov 21 11:14:55 2007 @@ -44,7 +44,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, class _OutputIter> @@ -401,4 +401,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_moneypunct.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_moneypunct.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_moneypunct.cc (original) +++ incubator/stdcxx/trunk/include/loc/_moneypunct.cc Wed Nov 21 11:14:55 2007 @@ -27,7 +27,7 @@ **************************************************************************/ -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, bool _Intl> _RW::__rw_facet_id moneypunct<_CharT, _Intl>::id; @@ -40,4 +40,4 @@ #endif // _RWSTD_NO_STATIC_CONST_MEMBER_INIT -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_moneypunct.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_moneypunct.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_moneypunct.h (original) +++ incubator/stdcxx/trunk/include/loc/_moneypunct.h Wed Nov 21 11:14:55 2007 @@ -44,7 +44,7 @@ #include <rw/_defs.h> -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { // 22.2.6.3 @@ -214,7 +214,7 @@ }; -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEYPUNCT) @@ -222,7 +222,7 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_MONEYPUNCT) -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_MONEYPUNCT, _CHAR) @@ -238,7 +238,7 @@ #endif // _RWSTD_INSTANTIATE (_MONEYPUNCT, _WCHAR_T) -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE_LAST (_MONEYPUNCT) Modified: incubator/stdcxx/trunk/include/loc/_num_get.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_num_get.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_num_get.cc (original) +++ incubator/stdcxx/trunk/include/loc/_num_get.cc Wed Nov 21 11:14:55 2007 @@ -53,7 +53,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, class _InputIter> @@ -564,4 +564,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_num_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_num_put.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_num_put.cc (original) +++ incubator/stdcxx/trunk/include/loc/_num_put.cc Wed Nov 21 11:14:55 2007 @@ -55,7 +55,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, class _OutputIter> @@ -206,4 +206,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_numpunct.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_numpunct.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_numpunct.cc (original) +++ incubator/stdcxx/trunk/include/loc/_numpunct.cc Wed Nov 21 11:14:55 2007 @@ -27,7 +27,7 @@ **************************************************************************/ -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { // #ifndef _RWSTD_NO_EXT_NUMPUNCT_PRIMARY @@ -45,4 +45,4 @@ // #endif // _RWSTD_NO_EXT_NUMPUNCT_PRIMARY -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_numpunct.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_numpunct.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_numpunct.h (original) +++ incubator/stdcxx/trunk/include/loc/_numpunct.h Wed Nov 21 11:14:55 2007 @@ -44,7 +44,7 @@ #include <rw/_defs.h> -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { // FIXME: provide just required specializations when #defined @@ -240,7 +240,7 @@ } }; -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE_FIRST (_NUMPUNCT) @@ -248,7 +248,7 @@ #endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_NUMPUNCT) -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { #if _RWSTD_INSTANTIATE (_NUMPUNCT, _CHAR) @@ -262,7 +262,7 @@ #endif // _RWSTD_INSTANTIATE (_NUMPUNCT, _WCHAR_T) -} // namespace _V3_LOCALE +} // namespace std #if _RWSTD_DEFINE_TEMPLATE_LAST (_NUMPUNCT) Modified: incubator/stdcxx/trunk/include/loc/_time_get.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_time_get.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_time_get.cc (original) +++ incubator/stdcxx/trunk/include/loc/_time_get.cc Wed Nov 21 11:14:55 2007 @@ -43,7 +43,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, class _InputIter> @@ -356,4 +356,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/loc/_time_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_time_put.cc?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/loc/_time_put.cc (original) +++ incubator/stdcxx/trunk/include/loc/_time_put.cc Wed Nov 21 11:14:55 2007 @@ -53,7 +53,7 @@ } // namespace __rw -_RWSTD_NAMESPACE (_V3_LOCALE) { +_RWSTD_NAMESPACE (std) { template <class _CharT, class _OutputIter> @@ -173,4 +173,4 @@ } -} // namespace _V3_LOCALE +} // namespace std Modified: incubator/stdcxx/trunk/include/rw/_defs.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_defs.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/include/rw/_defs.h (original) +++ incubator/stdcxx/trunk/include/rw/_defs.h Wed Nov 21 11:14:55 2007 @@ -37,15 +37,6 @@ #endif //_RWSTD_RW_CONFIG_H_INCLUDED -#ifndef _RWSTD_NO_V3_LOCALE -# ifndef _RWSTD_NO_NAMESPACE -# define _V3_LOCALE std -# else -# define _V3_LOCALE /* empty */ -# endif // _RWSTD_NO_NAMESPACE -#endif // _RWSTD_NO_V3_LOCALE - - // provide definitions for C++ versions of standard C headers // if a header is not available its name is #defined to the name of // this file (it's harmless and avoids polluting code with @@ -970,13 +961,13 @@ // support for building the new locale (v.3) #ifndef _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE # ifndef _RWSTD_NO_HONOR_STD -# define _V3_USE_FACET(type, arg) _V3_LOCALE::use_facet< type >(arg) +# define _V3_USE_FACET(type, arg) _STD::use_facet< type >(arg) # else # define _V3_USE_FACET(type, arg) use_facet< type >(arg) # endif #else // if defined (_RWSTD_NO_TEMPLATE_ON_RETURN_TYPE) # ifndef _RWSTD_NO_HONOR_STD -# define _V3_USE_FACET(type, arg) _V3_LOCALE::use_facet(arg, (type*)(0)) +# define _V3_USE_FACET(type, arg) _STD::use_facet(arg, (type*)(0)) # else # define _V3_USE_FACET(type, arg) use_facet(arg, (type*)(0)) # endif Modified: incubator/stdcxx/trunk/src/use_facet.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/use_facet.h?rev=597184&r1=597183&r2=597184&view=diff ============================================================================== --- incubator/stdcxx/trunk/src/use_facet.h (original) +++ incubator/stdcxx/trunk/src/use_facet.h Wed Nov 21 11:14:55 2007 @@ -131,7 +131,7 @@ _RWSTD_EXPORT \ const __rw_facet* \ __rw_get_facet_by_id \ - (const _V3_LOCALE::locale &__loc, \ + (const _STD::locale &__loc, \ const __rw_facet_id&, \ const __rw_ ## fid ## _facet*) { \ return __rw_get_std_facet (__loc, __rw_facet::_C_ ## fid, \