Author: faridz Date: Thu Nov 22 07:44:53 2007 New Revision: 597438 URL: http://svn.apache.org/viewvc?rev=597438&view=rev Log: 2007-11-21 Farid Zaripov <[EMAIL PROTECTED]>
STDCXX-671 * include/loc/_convenience.h: _V3_USE_FACET macro renamed to _RWSTD_USE_FACET. * include/loc/_messages.cc: Ditto. * include/loc/_money_get.cc: Ditto. * include/loc/_money_put.cc: Ditto. * include/loc/_num_get.cc: Ditto. * include/loc/_num_put.cc: Ditto. * include/loc/_punct.cc: Ditto. * include/loc/_time_get.cc: Ditto. * include/loc/_time_put.cc: Ditto. * include/rw/_defs.h: Ditto. * tests/localization/22.locale.moneypunct.cpp: Ditto. Modified: incubator/stdcxx/branches/4.2.x/include/loc/_convenience.h incubator/stdcxx/branches/4.2.x/include/loc/_messages.cc incubator/stdcxx/branches/4.2.x/include/loc/_money_get.cc incubator/stdcxx/branches/4.2.x/include/loc/_money_put.cc incubator/stdcxx/branches/4.2.x/include/loc/_num_get.cc incubator/stdcxx/branches/4.2.x/include/loc/_num_put.cc incubator/stdcxx/branches/4.2.x/include/loc/_punct.cc incubator/stdcxx/branches/4.2.x/include/loc/_time_get.cc incubator/stdcxx/branches/4.2.x/include/loc/_time_put.cc incubator/stdcxx/branches/4.2.x/include/rw/_defs.h incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.moneypunct.cpp Modified: incubator/stdcxx/branches/4.2.x/include/loc/_convenience.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_convenience.h?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_convenience.h (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_convenience.h Thu Nov 22 07:44:53 2007 @@ -49,90 +49,91 @@ template <class _CharT> inline bool (isspace)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::space, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::space, __c); } template <class _CharT> inline bool (isprint)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::print, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::print, __c); } template <class _CharT> inline bool (iscntrl)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is(ctype_base::cntrl, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is(ctype_base::cntrl, __c); } template <class _CharT> inline bool (isupper)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::upper, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::upper, __c); } template <class _CharT> inline bool (islower)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::lower, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::lower, __c); } template <class _CharT> inline bool (isalpha)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::alpha, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::alpha, __c); } template <class _CharT> inline bool (isdigit)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::digit, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::digit, __c); } template <class _CharT> inline bool (ispunct)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is(ctype_base::punct, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is(ctype_base::punct, __c); } template <class _CharT> inline bool (isxdigit)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::xdigit, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::xdigit, + __c); } template <class _CharT> inline bool (isalnum)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::alnum, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::alnum, __c); } template <class _CharT> inline bool (isgraph)(_CharT __c, const locale &__loc) { - return _V3_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::graph, __c); + return _RWSTD_USE_FACET (ctype<_CharT>, __loc).is (ctype_base::graph, __c); } template <class _CharT> inline _CharT (toupper)(_CharT __c, const locale &__loc) { - return (_V3_USE_FACET (ctype<_CharT>, __loc).toupper) (__c); + return (_RWSTD_USE_FACET (ctype<_CharT>, __loc).toupper) (__c); } template <class _CharT> inline _CharT (tolower)(_CharT __c, const locale &__loc) { - return (_V3_USE_FACET (ctype<_CharT>, __loc).tolower) (__c); + return (_RWSTD_USE_FACET (ctype<_CharT>, __loc).tolower) (__c); } } // namespace std Modified: incubator/stdcxx/branches/4.2.x/include/loc/_messages.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_messages.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_messages.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_messages.cc Thu Nov 22 07:44:53 2007 @@ -70,7 +70,7 @@ typedef _TYPENAME _CodeCvt::state_type state_type; const _CodeCvt& __codecvt = - _V3_USE_FACET (_CodeCvt, _RW::__rw_get_locale (__cat)); + _RWSTD_USE_FACET (_CodeCvt, _RW::__rw_get_locale (__cat)); if (sizeof (_CharT) == sizeof (char) && __codecvt.always_noconv ()) { // lwg issue 19: always_noconv() is only allowed to return @@ -120,7 +120,7 @@ typedef ctype<_CharT> _Ctype; const _Ctype& __ctp = - _V3_USE_FACET (_Ctype, _RW::__rw_get_locale (__cat)); + _RWSTD_USE_FACET (_Ctype, _RW::__rw_get_locale (__cat)); for (_RWSTD_SIZE_T __i = 0; __i != __src_len; ++__i) __dst_first [__i] = __ctp.widen (__text [__i]); Modified: incubator/stdcxx/branches/4.2.x/include/loc/_money_get.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_money_get.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_money_get.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_money_get.cc Thu Nov 22 07:44:53 2007 @@ -63,8 +63,9 @@ const _Punct0 &__pun = __intl ? _RWSTD_REINTERPRET_CAST (const _Punct0&, - _V3_USE_FACET (_Punct1,__flags.getloc ())) - : _V3_USE_FACET (_Punct0, __flags.getloc ()); + _RWSTD_USE_FACET (_Punct1, + __flags.getloc ())) + : _RWSTD_USE_FACET (_Punct0, __flags.getloc ()); // retrieve positive and negative sign, currency symbol, // the grouping string and the pattern format @@ -80,7 +81,7 @@ bool __seendp = false; // seen decimal point in input const ctype<_CharT> &__ctp = - _V3_USE_FACET (ctype<_CharT>, __flags.getloc ()); + _RWSTD_USE_FACET (ctype<_CharT>, __flags.getloc ()); char __buf [304]; char *__pcur = __buf; Modified: incubator/stdcxx/branches/4.2.x/include/loc/_money_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_money_put.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_money_put.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_money_put.cc Thu Nov 22 07:44:53 2007 @@ -72,15 +72,15 @@ if (__intl) { __pun0 = 0; - __pun1 = &_V3_USE_FACET (_Punct1, __flags.getloc ()); + __pun1 = &_RWSTD_USE_FACET (_Punct1, __flags.getloc ()); } else { - __pun0 = &_V3_USE_FACET (_Punct0, __flags.getloc ()); + __pun0 = &_RWSTD_USE_FACET (_Punct0, __flags.getloc ()); __pun1 = 0; } const ctype<_CharT> &__ctp = - _V3_USE_FACET (ctype<_CharT>,__flags.getloc ()); + _RWSTD_USE_FACET (ctype<_CharT>,__flags.getloc ()); money_base::pattern __fmat; // negative or positive format string_type __sign; // negative or positive sign @@ -285,14 +285,14 @@ if (__intl) { typedef moneypunct<_CharT, true> _Punct; - const _Punct &__pun = _V3_USE_FACET (_Punct, __flags.getloc ()); + const _Punct &__pun = _RWSTD_USE_FACET (_Punct, __flags.getloc ()); __fd = __pun.frac_digits (); __grouping = __pun.grouping (); } else { typedef moneypunct<_CharT, false> _Punct; - const _Punct &__pun = _V3_USE_FACET (_Punct, __flags.getloc ()); + const _Punct &__pun = _RWSTD_USE_FACET (_Punct, __flags.getloc ()); __fd = __pun.frac_digits (); __grouping = __pun.grouping (); @@ -313,7 +313,7 @@ // widen narrow buffer (necessary even if char_type == char) const ctype<_CharT> &__ctp = - _V3_USE_FACET (ctype<_CharT>, __flags.getloc ()); + _RWSTD_USE_FACET (ctype<_CharT>, __flags.getloc ()); __ctp.widen (__buf, __buf + __n, __wbuf); @@ -338,7 +338,7 @@ if (__intl) { typedef moneypunct<_CharT, true> _Punct; - const _Punct &__pun = _V3_USE_FACET (_Punct, __flags.getloc ()); + const _Punct &__pun = _RWSTD_USE_FACET (_Punct, __flags.getloc ()); __fd = __pun.frac_digits (); __grouping = __pun.grouping (); @@ -346,7 +346,7 @@ else { typedef moneypunct<_CharT, false> _Punct; - const _Punct &__pun = _V3_USE_FACET (_Punct, __flags.getloc ()); + const _Punct &__pun = _RWSTD_USE_FACET (_Punct, __flags.getloc ()); __fd = __pun.frac_digits (); __grouping = __pun.grouping (); @@ -363,7 +363,7 @@ char *__groups = __grouping.size () ? __buf : &__nul; const ctype<_CharT> &__ctp = - _V3_USE_FACET (ctype<_CharT>, __flags.getloc ()); + _RWSTD_USE_FACET (ctype<_CharT>, __flags.getloc ()); // narrow digits into a temporary buffer to determine grouping for (_StringIter __it = __str.begin (); __it != __str.end (); ++__it) { Modified: incubator/stdcxx/branches/4.2.x/include/loc/_num_get.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_num_get.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_num_get.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_num_get.cc Thu Nov 22 07:44:53 2007 @@ -193,7 +193,7 @@ __err = _RW::__rw_goodbit; const numpunct<char_type> &__pun = - _V3_USE_FACET (numpunct<char_type>, __flags.getloc ()); + _RWSTD_USE_FACET (numpunct<char_type>, __flags.getloc ()); // lwg issue 17 typedef basic_string<char_type> string_type; @@ -246,7 +246,7 @@ const locale &__loc = __flags.getloc (); const numpunct<char_type> &__pun = - _V3_USE_FACET (numpunct<char_type>, __loc); + _RWSTD_USE_FACET (numpunct<char_type>, __loc); // 22.2.2.1.2, p8: Stage 2 @@ -257,7 +257,7 @@ _RWSTD_UNUSED (__bufsize); - const ctype<char_type> &__ctp = _V3_USE_FACET (ctype<char_type>, __loc); + const ctype<char_type> &__ctp = _RWSTD_USE_FACET (ctype<char_type>, __loc); const _CharT __decimal_point = __pun.decimal_point (); const _CharT __thousands_sep = __pun.thousands_sep (); Modified: incubator/stdcxx/branches/4.2.x/include/loc/_num_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_num_put.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_num_put.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_num_put.cc Thu Nov 22 07:44:53 2007 @@ -76,7 +76,7 @@ const void *__pval) const { const numpunct<char_type> &__np = - _V3_USE_FACET (numpunct<char_type>, __flags.getloc ()); + _RWSTD_USE_FACET (numpunct<char_type>, __flags.getloc ()); char __buf [_RWSTD_DBL_MAX_10_EXP]; @@ -136,7 +136,7 @@ } const ctype<char_type> &__ctp = - _V3_USE_FACET (ctype<char_type>, __flags.getloc ()); + _RWSTD_USE_FACET (ctype<char_type>, __flags.getloc ()); const char *__p = __pbuf; Modified: incubator/stdcxx/branches/4.2.x/include/loc/_punct.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_punct.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_punct.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_punct.cc Thu Nov 22 07:44:53 2007 @@ -62,7 +62,7 @@ __inx = __badval; // invalidate const _STD::ctype<_CharT> *__ctp = __flags ? - &_V3_USE_FACET (_STD::ctype<_CharT>, __flags->getloc ()) : 0; + &_RWSTD_USE_FACET (_STD::ctype<_CharT>, __flags->getloc ()) : 0; _CharT __ch; Modified: incubator/stdcxx/branches/4.2.x/include/loc/_time_get.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_time_get.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_time_get.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_time_get.cc Thu Nov 22 07:44:53 2007 @@ -60,7 +60,7 @@ _RWSTD_ASSERT (__pat <= __pat_end); const ctype<char_type> &__ctp = - _V3_USE_FACET (ctype<char_type>, __fl.getloc ()); + _RWSTD_USE_FACET (ctype<char_type>, __fl.getloc ()); // extension: `tmb' may be 0 tm __tmp = __tmb ? *__tmb : tm (); @@ -141,7 +141,7 @@ _RWSTD_SIZE_T __dup; // number of allowed duplicates const ctype<char_type> &__ctp = - _V3_USE_FACET (ctype<char_type>, __fl.getloc ()); + _RWSTD_USE_FACET (ctype<char_type>, __fl.getloc ()); switch (__fmt) { Modified: incubator/stdcxx/branches/4.2.x/include/loc/_time_put.cc URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/loc/_time_put.cc?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/loc/_time_put.cc (original) +++ incubator/stdcxx/branches/4.2.x/include/loc/_time_put.cc Thu Nov 22 07:44:53 2007 @@ -109,7 +109,7 @@ __end = __pat + char_traits<char_type>::length (__pat); const ctype<char_type> &__ctp = - _V3_USE_FACET (ctype<char_type>, __flags.getloc ()); + _RWSTD_USE_FACET (ctype<char_type>, __flags.getloc ()); for (; __pat != __end; ++__pat) { Modified: incubator/stdcxx/branches/4.2.x/include/rw/_defs.h URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/include/rw/_defs.h?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/include/rw/_defs.h (original) +++ incubator/stdcxx/branches/4.2.x/include/rw/_defs.h Thu Nov 22 07:44:53 2007 @@ -961,15 +961,15 @@ // 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) _STD::use_facet< type >(arg) +# define _RWSTD_USE_FACET(type, arg) _STD::use_facet< type >(arg) # else -# define _V3_USE_FACET(type, arg) use_facet< type >(arg) +# define _RWSTD_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) _STD::use_facet(arg, (type*)(0)) +# define _RWSTD_USE_FACET(type, arg) _STD::use_facet(arg, (type*)(0)) # else -# define _V3_USE_FACET(type, arg) use_facet(arg, (type*)(0)) +# define _RWSTD_USE_FACET(type, arg) use_facet(arg, (type*)(0)) # endif #endif // _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE Modified: incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.moneypunct.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.moneypunct.cpp?rev=597438&r1=597437&r2=597438&view=diff ============================================================================== --- incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.moneypunct.cpp (original) +++ incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.moneypunct.cpp Thu Nov 22 07:44:53 2007 @@ -192,10 +192,10 @@ if (1) { if (_STD_HAS_FACET (MoneyPunctByname, loc_)) - _V3_USE_FACET (MoneyPunctByname, loc_); + _RWSTD_USE_FACET (MoneyPunctByname, loc_); if (_STD_HAS_FACET (MoneyPunctIntlByname, loc_)) - _V3_USE_FACET (MoneyPunctIntlByname, loc_); + _RWSTD_USE_FACET (MoneyPunctIntlByname, loc_); } // note that values in 7.4 of C89, and 7.11, p2 of C99, respectively, @@ -443,8 +443,8 @@ void Test<charT>:: check_decimal_point (charT result) { - const charT c = intl_ ? _V3_USE_FACET (IntlPunct, loc_).decimal_point () - : _V3_USE_FACET (Punct, loc_).decimal_point (); + const charT c = intl_ ? _RWSTD_USE_FACET (IntlPunct, loc_).decimal_point () + : _RWSTD_USE_FACET (Punct, loc_).decimal_point (); rw_assert (std::char_traits<charT>::eq (c, result), 0, __LINE__, "moneypunct<%s, %b>::decimal_point() == %#lc, got %#lc " @@ -459,8 +459,8 @@ void Test<charT>:: check_thousands_sep (charT result) { - const charT c = intl_ ? _V3_USE_FACET (IntlPunct, loc_).thousands_sep () - : _V3_USE_FACET (Punct, loc_).thousands_sep (); + const charT c = intl_ ? _RWSTD_USE_FACET (IntlPunct, loc_).thousands_sep () + : _RWSTD_USE_FACET (Punct, loc_).thousands_sep (); rw_assert (std::char_traits<charT>::eq (c, result), 0, __LINE__, "moneypunct<%s, %b>::thousands_sep() == %#lc, got %#lc " @@ -475,8 +475,8 @@ void Test<charT>:: check_frac_digits (int result) { - const int i = intl_ ? _V3_USE_FACET (IntlPunct, loc_).frac_digits () - : _V3_USE_FACET (Punct, loc_).frac_digits (); + const int i = intl_ ? _RWSTD_USE_FACET (IntlPunct, loc_).frac_digits () + : _RWSTD_USE_FACET (Punct, loc_).frac_digits (); rw_assert (i == result, 0, __LINE__, "moneypunct<%s, %b>::frac_digits() == %d, got %d " @@ -491,8 +491,9 @@ void Test<charT>:: check_grouping (const std::string &result) { - const std::string s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).grouping () - : _V3_USE_FACET (Punct, loc_).grouping (); + const std::string s = intl_ ? + _RWSTD_USE_FACET (IntlPunct, loc_).grouping () + : _RWSTD_USE_FACET (Punct, loc_).grouping (); if ( s != result && s.size () != result.size () && s.size () && result.size ()) { @@ -536,7 +537,7 @@ // as the result of numpunct<charT>::do_grouping(). const std::string grp = - _V3_USE_FACET (std::numpunct<charT>, loc_).grouping (); + _RWSTD_USE_FACET (std::numpunct<charT>, loc_).grouping (); rw_assert (s == grp, 0, __LINE__, "moneypunct<%s, %b>::grouping() == numpunct<>::grouping() == " @@ -557,8 +558,8 @@ void Test<charT>:: check_curr_symbol (const String &result) { - const String s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).curr_symbol () - : _V3_USE_FACET (Punct, loc_).curr_symbol (); + const String s = intl_ ? _RWSTD_USE_FACET (IntlPunct, loc_).curr_symbol () + : _RWSTD_USE_FACET (Punct, loc_).curr_symbol (); rw_assert (s == result, 0, __LINE__, "moneypunct<%s, %b>::curr_symbol() == %{*Ac}, got %{*Ac} " @@ -575,8 +576,9 @@ void Test<charT>:: check_positive_sign (const String &result) { - const String s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).positive_sign () - : _V3_USE_FACET (Punct, loc_).positive_sign (); + const String s = intl_ ? + _RWSTD_USE_FACET (IntlPunct, loc_).positive_sign () + : _RWSTD_USE_FACET (Punct, loc_).positive_sign (); rw_assert (s == result, 0, __LINE__, "moneypunct<%s, %b>::positive_sign() == %{*Ac}, got %{*Ac} " @@ -593,8 +595,9 @@ void Test<charT>:: check_negative_sign (const String &result) { - const String s = intl_ ? _V3_USE_FACET (IntlPunct, loc_).negative_sign () - : _V3_USE_FACET (Punct, loc_).negative_sign (); + const String s = intl_ ? + _RWSTD_USE_FACET (IntlPunct, loc_).negative_sign () + : _RWSTD_USE_FACET (Punct, loc_).negative_sign (); rw_assert (s == result, 0, __LINE__, "moneypunct<%s, %b>::negative_sign() == %{*Ac}, got %{*Ac} " @@ -747,10 +750,10 @@ check_format (bool pos, std::money_base::pattern result, const UChar cpat [3]) { const std::money_base::pattern pat = - intl_ ? pos ? _V3_USE_FACET (IntlPunct, loc_).pos_format () - : _V3_USE_FACET (IntlPunct, loc_).neg_format () - : pos ? _V3_USE_FACET (Punct, loc_).pos_format () - : _V3_USE_FACET (Punct, loc_).neg_format (); + intl_ ? pos ? _RWSTD_USE_FACET (IntlPunct, loc_).pos_format () + : _RWSTD_USE_FACET (IntlPunct, loc_).neg_format () + : pos ? _RWSTD_USE_FACET (Punct, loc_).pos_format () + : _RWSTD_USE_FACET (Punct, loc_).neg_format (); // number of times each symbol appears in pattern int counts [5] = { 0 };