Author: sebor
Date: Fri Jul 6 16:32:28 2007
New Revision: 554089
URL: http://svn.apache.org/viewvc?view=rev&rev=554089
Log:
2007-07-06 Martin Sebor <[EMAIL PROTECTED]>
* ctype_bits.cpp (_RWSTD_NO_V3_LOCALE): Removed unnecessary guards
and replaces references to _V3_LOCALE with _STD and std, whichever
is appropriate.
* time_get.cpp: Same.
* iso2022.cpp: Same.
* wctype.cpp: Same.
* iso2022.h: Same.
* locale_bits.cpp: Same.
* locale_eq.cpp: Same.
* codecvt.cpp: Same.
* locale_name.cpp: Same.
* locale_classic.cpp: Same.
* locale_core.cpp: Same.
* wcodecvt.cpp: Same.
* locale_global.cpp: Same.
* locale_body.h: Same.
* locale_combine.cpp: Same.
Modified:
incubator/stdcxx/trunk/src/codecvt.cpp
incubator/stdcxx/trunk/src/ctype_bits.cpp
incubator/stdcxx/trunk/src/iso2022.cpp
incubator/stdcxx/trunk/src/iso2022.h
incubator/stdcxx/trunk/src/locale_bits.cpp
incubator/stdcxx/trunk/src/locale_body.h
incubator/stdcxx/trunk/src/locale_classic.cpp
incubator/stdcxx/trunk/src/locale_combine.cpp
incubator/stdcxx/trunk/src/locale_core.cpp
incubator/stdcxx/trunk/src/locale_eq.cpp
incubator/stdcxx/trunk/src/locale_global.cpp
incubator/stdcxx/trunk/src/locale_name.cpp
incubator/stdcxx/trunk/src/time_get.cpp
incubator/stdcxx/trunk/src/wcodecvt.cpp
incubator/stdcxx/trunk/src/wctype.cpp
Modified: incubator/stdcxx/trunk/src/codecvt.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/codecvt.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/codecvt.cpp (original)
+++ incubator/stdcxx/trunk/src/codecvt.cpp Fri Jul 6 16:32:28 2007
@@ -30,8 +30,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
// working around a Compaq C++ bug (see PR #26778)
#if __DECCXX_VER >= 60300000 && __DECCXX_VER < 60400000
@@ -93,7 +91,7 @@
} // namespace __rw
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
_RW::__rw_facet_id codecvt<char, char, _RWSTD_MBSTATE_T>::id;
@@ -259,11 +257,10 @@
}
-} // namespace _V3_LOCALE
+} // namespace std
#define TARGS_C <char, char, _RWSTD_MBSTATE_T>
_RWSTD_DEFINE_FACET_FACTORY (static, codecvt, TARGS_C, codecvt);
_RWSTD_SPECIALIZE_USE_FACET (codecvt);
-#endif // _RWSTD_NO_V3_LOCALE
Modified: incubator/stdcxx/trunk/src/ctype_bits.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/ctype_bits.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/ctype_bits.cpp (original)
+++ incubator/stdcxx/trunk/src/ctype_bits.cpp Fri Jul 6 16:32:28 2007
@@ -30,12 +30,10 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <loc/_ctype.h>
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
_RWSTD_DEFINE_STATIC_CONST (const ctype_base::mask ctype_base::space);
@@ -52,7 +50,5 @@
_RWSTD_DEFINE_STATIC_CONST (const _RWSTD_SIZE_T ctype<char>::table_size);
-} // namespace _V3_LOCALE
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/iso2022.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/iso2022.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/iso2022.cpp (original)
+++ incubator/stdcxx/trunk/src/iso2022.cpp Fri Jul 6 16:32:28 2007
@@ -30,8 +30,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <string.h> // for strxxx()
#include <iosfwd> // for mbstate_t
@@ -123,9 +121,9 @@
#endif
-#define CODECVT_ERROR _V3_LOCALE::codecvt_base::error
-#define CODECVT_OK _V3_LOCALE::codecvt_base::ok
-#define CODECVT_PARTIAL _V3_LOCALE::codecvt_base::partial
+#define CODECVT_ERROR _STD::codecvt_base::error
+#define CODECVT_OK _STD::codecvt_base::ok
+#define CODECVT_PARTIAL _STD::codecvt_base::partial
_RWSTD_NAMESPACE (__rw) {
@@ -661,7 +659,7 @@
// given by the last parameter and is currently one of the following:
// - ISO_2022-JP
// - ISO_2022-JP2
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
__rw_iso2022jp_designate (__rw_iso2022_state_t& state,
char*& to,
char* to_end,
@@ -779,7 +777,7 @@
// Upon entry:
// - from - points to the first byte after the ESCAPE_CHAR indicator;
// - enc - encoding type.
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
__rw_iso2022_escape (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -861,10 +859,10 @@
// ISO-2022-JP conversion from ANSI_X3.4-1968
// Convert one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_ascii_to_iso2022 (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -879,7 +877,7 @@
_RWSTD_ASSERT (from_end-from >= int(width));
_RWSTD_UNUSED (from_end);
- _V3_LOCALE::codecvt_base::result ret;
+ _STD::codecvt_base::result ret;
// check the designation sequence
if (state.g_map [0] != reg) {
@@ -916,10 +914,10 @@
// ISO-2022-JP conversion from KSC5601-1987
// Convert one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_ksc5601_to_iso2022 (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -934,7 +932,7 @@
_RWSTD_ASSERT(from_end-from >= int(width));
_RWSTD_UNUSED(from_end);
- _V3_LOCALE::codecvt_base::result ret;
+ _STD::codecvt_base::result ret;
// check the designation sequence
if (state.g_map [0] != reg) {
@@ -971,10 +969,10 @@
// ISO-2022-JP conversion from GB2312-1980
// Convert one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_gb2312_to_iso2022 (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -989,7 +987,7 @@
_RWSTD_ASSERT(from_end-from >= int(width));
_RWSTD_UNUSED(from_end);
- _V3_LOCALE::codecvt_base::result ret;
+ _STD::codecvt_base::result ret;
// check the designation sequence
if (state.g_map [0] != reg) {
@@ -1026,10 +1024,10 @@
// ISO-2022-JP conversion from ISO-8859-7
// Convert one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_iso88597_to_iso2022 (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -1044,7 +1042,7 @@
_RWSTD_ASSERT(from_end-from >= int(width2));
_RWSTD_UNUSED(from_end);
- _V3_LOCALE::codecvt_base::result ret;
+ _STD::codecvt_base::result ret;
// always call designate for this one; designation will at least insert a
// single shift function in the destination buffer
@@ -1073,10 +1071,10 @@
// ISO-2022-JP conversion from ISO-8859-1
// Convert one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_iso88591_to_iso2022 (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -1091,7 +1089,7 @@
_RWSTD_ASSERT(from_end-from >= int(width2));
_RWSTD_UNUSED(from_end);
- _V3_LOCALE::codecvt_base::result ret;
+ _STD::codecvt_base::result ret;
// always call designate for this one; designation will at least insert a
// single shift function in the destination buffer
@@ -1120,10 +1118,10 @@
// ISO-2022-JP conversion from packed EUC-JP
// Convert one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_eucjp_to_iso2022 (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -1134,7 +1132,7 @@
int width = 0;
unsigned char reg = 0;
- _V3_LOCALE::codecvt_base::result ret;
+ _STD::codecvt_base::result ret;
// convert and store the encoding
unsigned char c = *_RWSTD_REINTERPRET_CAST(const unsigned char*, from);
@@ -1204,18 +1202,18 @@
// ISO-2022-JP conversion to GB2312-1980
// Converts one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022_to_gb2312 (const char*& from,
const char* from_end,
char*& to,
int /* reg */,
int /* enc */)
{
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
if (from_end - from < GB2312_CHAR_LEN)
return res;
@@ -1231,18 +1229,18 @@
// ISO-2022-JP conversion to KSC2312
// Converts one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022_to_ksc5601 (const char*& from,
const char* from_end,
char*& to,
int /* reg */,
int /* enc */)
{
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
if (from_end - from < KSC5601_CHAR_LEN)
return res;
@@ -1258,18 +1256,18 @@
// ISO-2022-JP conversion to ISO-8859-1
// Converts one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022_to_iso88591 (const char*& from,
const char* from_end,
char*& to,
int /* reg */,
int /* enc */)
{
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
if (from_end - from < ISO_8859_1_CHAR_LEN)
return res;
@@ -1284,18 +1282,18 @@
// ISO-2022-JP conversion to ISO-8859-7
// Converts one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022_to_iso88597 (const char*& from,
const char* from_end,
char*& to,
int /* reg */,
int /* enc */)
{
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
if (from_end - from < ISO_8859_7_CHAR_LEN)
return res;
@@ -1310,10 +1308,10 @@
// ISO-2022-JP conversion to packed EUC-JP
// Converts one character.
// Returns:
-// _V3_LOCALE::codecvt_base::ok in case the conversion succeeded
-// _V3_LOCALE::codecvt_base::partial for partial conversions
-// _V3_LOCALE::codecvt_base::error erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+// std::codecvt_base::ok in case the conversion succeeded
+// std::codecvt_base::partial for partial conversions
+// std::codecvt_base::error erroneous sequence
+static _STD::codecvt_base::result
__rw_iso2022_to_eucjp (const char*& from,
const char* from_end,
char*& to,
@@ -1327,7 +1325,7 @@
if (from_end - from < width)
return CODECVT_OK;
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
// from either the ANSI_X3.4-1968 or JIS X 0201 Roman or JIS X 0201 Kana
switch (reg) {
@@ -1382,7 +1380,7 @@
// Converts one character from the external representation to the
// intermediary encoding that is later used in retrieving the internal
// representation of that character
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
__rw_iso2022_to_interm (__rw_iso2022_state_t& state,
const char*& from,
const char* from_end,
@@ -1390,7 +1388,7 @@
unsigned char& reg,
int enc)
{
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
bool first = true;
for (; *from == ESCAPE_CHAR; first = false) {
@@ -1458,7 +1456,7 @@
}
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
__rw_ucs4_to_eucjp (const wchar_t*& from,
const wchar_t* from_end,
char*& to,
@@ -1594,7 +1592,7 @@
// does the conversion of one character to internal representation
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
__rw_iso2022_to_ucs4 (_RWSTD_MBSTATE_T& state,
__rw_iso2022_state_t* iso_state,
const char*& from,
@@ -1603,7 +1601,7 @@
wchar_t* /* to_end */,
int enc)
{
- _V3_LOCALE::codecvt_base::result res;
+ _STD::codecvt_base::result res;
// the registration code of the character set
unsigned char reg = iso_state->g_map [0];
@@ -1695,7 +1693,7 @@
/****************************************************************************/
// Conversion from ISO-2022-JP to UCS-4
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp_do_in (_RWSTD_MBSTATE_T& state,
const char*& from,
const char* from_end,
@@ -1716,7 +1714,7 @@
while (from_end - from && to_end - to) {
// operation result
- _V3_LOCALE::codecvt_base::result res;
+ _STD::codecvt_base::result res;
res = __rw_iso2022_to_ucs4 (state, iso_state, from_next,
from_end, to_next, to_end, iso2022_jp);
@@ -1740,7 +1738,7 @@
// Conversion from UCS-4 to ISO-2022-JP
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp_do_out (_RWSTD_MBSTATE_T& state,
const wchar_t*& from,
const wchar_t* from_end,
@@ -1771,7 +1769,7 @@
// Loop until the source buffer is consumed, an error occurs, or
// the destination buffer reaches capacity
while (from_end - from && to_end - to) {
- _V3_LOCALE::codecvt_base::result res;
+ _STD::codecvt_base::result res;
// convert the UCS-4 value to EUC-JP
const wchar_t* ps = from;
@@ -1817,11 +1815,11 @@
}
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp_do_unshift (_RWSTD_MBSTATE_T& state,
char*& to, char* to_end)
{
- _V3_LOCALE::codecvt_base::result res =
+ _STD::codecvt_base::result res =
CODECVT_ERROR;
// the iso2022 state
@@ -1861,7 +1859,7 @@
return CODECVT_ERROR;
int ret = 0;
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
while (max && from_end - from) {
while (*from == ESCAPE_CHAR)
@@ -1911,7 +1909,7 @@
/****************************************************************************/
// Conversion from ISO-2022-JP to UCS-4
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp2_do_in (_RWSTD_MBSTATE_T& state,
const char*& from,
const char* from_end,
@@ -1933,7 +1931,7 @@
wchar_t* to_next = to;
// operation result
- _V3_LOCALE::codecvt_base::result res;
+ _STD::codecvt_base::result res;
res = __rw_iso2022_to_ucs4 (state, iso_state, from_next,
from_end, to_next, to_end, iso2022_jp2);
@@ -1957,7 +1955,7 @@
// Conversion from UCS-4 to ISO-2022-JP-2
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp2_do_out (_RWSTD_MBSTATE_T& state,
const wchar_t*& from,
const wchar_t* from_end,
@@ -1977,7 +1975,7 @@
// Loop until the source buffer is consumed, an error occurs, or
// the destination buffer reaches capacity
while (from_end - from && to_end - to) {
- _V3_LOCALE::codecvt_base::result res;
+ _STD::codecvt_base::result res;
// convert the UCS-4 value to intermediary encoding
const wchar_t* ps = from;
@@ -2058,7 +2056,7 @@
}
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp2_do_unshift (_RWSTD_MBSTATE_T& state,
char*& to, char* to_end)
{
@@ -2081,7 +2079,7 @@
return CODECVT_ERROR;
int ret = 0;
- _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+ _STD::codecvt_base::result res = CODECVT_OK;
while (max && from_end - from) {
@@ -2153,5 +2151,3 @@
}
} // namespace __rw
-
-#endif // _RWSTD_NO_V3_LOCALE
Modified: incubator/stdcxx/trunk/src/iso2022.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/iso2022.h?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/iso2022.h (original)
+++ incubator/stdcxx/trunk/src/iso2022.h Fri Jul 6 16:32:28 2007
@@ -54,17 +54,17 @@
// Conversions for ISO-2022-JP
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp_do_in (_RWSTD_MBSTATE_T&,
const char*&, const char*,
wchar_t*&, wchar_t*);
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp_do_out (_RWSTD_MBSTATE_T&,
const wchar_t*&, const wchar_t*,
char*&, char*);
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp_do_unshift (_RWSTD_MBSTATE_T&, char*&, char*);
int __rw_iso2022jp_do_encoding ();
@@ -78,17 +78,17 @@
// Conversions for ISO-2022-JP-2
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp2_do_in (_RWSTD_MBSTATE_T&,
const char*&, const char*,
wchar_t*&, wchar_t*);
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp2_do_out (_RWSTD_MBSTATE_T&,
const wchar_t*&, const wchar_t*,
char*&, char*);
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
__rw_iso2022jp2_do_unshift (_RWSTD_MBSTATE_T&, char*&, char*);
int __rw_iso2022jp2_do_encoding ();
Modified: incubator/stdcxx/trunk/src/locale_bits.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_bits.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_bits.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_bits.cpp Fri Jul 6 16:32:28 2007
@@ -30,12 +30,10 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <loc/_locale.h>
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
_RWSTD_DEFINE_STATIC_CONST (const locale::category locale::none);
@@ -48,7 +46,4 @@
_RWSTD_DEFINE_STATIC_CONST (const locale::category locale::all);
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/locale_body.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_body.h?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_body.h (original)
+++ incubator/stdcxx/trunk/src/locale_body.h Fri Jul 6 16:32:28 2007
@@ -42,11 +42,11 @@
#include <rw/_defs.h>
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
struct _RWSTD_CLASS_EXPORT locale;
-} // namespace _V3_LOCALE
+} // namespace std
_RWSTD_NAMESPACE (__rw) {
@@ -93,7 +93,7 @@
__rw_mutex _C_mutex;
- friend struct _V3_LOCALE::locale;
+ friend struct _STD::locale;
public:
Modified: incubator/stdcxx/trunk/src/locale_classic.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_classic.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_classic.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_classic.cpp Fri Jul 6 16:32:28 2007
@@ -31,14 +31,12 @@
#include <new>
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <loc/_locale.h>
#include "locale_body.h"
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
/* static */ const locale& locale::classic ()
@@ -60,7 +58,4 @@
}
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/locale_combine.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_combine.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_combine.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_combine.cpp Fri Jul 6 16:32:28 2007
@@ -31,8 +31,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <locale.h>
#include <stdio.h>
#include <string.h> // for memxxx() and strxxx() functions
@@ -626,7 +624,7 @@
} // namespace __rw
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
// outlined to hide implementation details
@@ -724,7 +722,4 @@
}
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/locale_core.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_core.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_core.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_core.cpp Fri Jul 6 16:32:28 2007
@@ -30,8 +30,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#ifdef __SUNPRO_CC
// working around SunPro bug 568
# include <time.h>
@@ -47,7 +45,7 @@
#include <sys/stat.h> // for stat()
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
// outlined to hide implementation details
@@ -200,7 +198,4 @@
}
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/locale_eq.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_eq.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_eq.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_eq.cpp Fri Jul 6 16:32:28 2007
@@ -30,8 +30,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <string.h>
#include <loc/_locale.h>
@@ -39,7 +37,7 @@
#include "locale_body.h"
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
bool locale::operator== (const locale &rhs) const
@@ -126,7 +124,4 @@
}
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/locale_global.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_global.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_global.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_global.cpp Fri Jul 6 16:32:28 2007
@@ -30,8 +30,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <locale.h>
#include <string.h>
@@ -42,7 +40,7 @@
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
/* static */ locale locale::global (const locale &rhs)
{
@@ -72,7 +70,4 @@
}
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
+} // namespace std
Modified: incubator/stdcxx/trunk/src/locale_name.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/locale_name.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/locale_name.cpp (original)
+++ incubator/stdcxx/trunk/src/locale_name.cpp Fri Jul 6 16:32:28 2007
@@ -30,8 +30,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
#include <new>
#include <string.h>
@@ -41,7 +39,7 @@
#include "locale_body.h"
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
string locale::name () const
{
@@ -97,8 +95,4 @@
}
-} // namespace _V3_LOCALE
-
-
-#endif // _RWSTD_NO_V3_LOCALE
-
+} // namespace std
Modified: incubator/stdcxx/trunk/src/time_get.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/time_get.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/time_get.cpp (original)
+++ incubator/stdcxx/trunk/src/time_get.cpp Fri Jul 6 16:32:28 2007
@@ -32,12 +32,6 @@
#include <rw/_defs.h>
-#ifndef _RWSTD_NO_V3_LOCALE
-
-
_RWSTD_NAMESPACE (__rw) {
} // namespace __rw
-
-
-#endif // _RWSTD_NO_V3_LOCALE
Modified: incubator/stdcxx/trunk/src/wcodecvt.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/wcodecvt.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/wcodecvt.cpp (original)
+++ incubator/stdcxx/trunk/src/wcodecvt.cpp Fri Jul 6 16:32:28 2007
@@ -1068,7 +1068,7 @@
} // namespace __rw
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
_RW::__rw_facet_id codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::id;
@@ -1760,7 +1760,7 @@
#endif // _RWSTD_NO_WCHAR_T
-} // namespace _V3_LOCALE
+} // namespace std
#ifndef _RWSTD_NO_WCHAR_T
Modified: incubator/stdcxx/trunk/src/wctype.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/wctype.cpp?view=diff&rev=554089&r1=554088&r2=554089
==============================================================================
--- incubator/stdcxx/trunk/src/wctype.cpp (original)
+++ incubator/stdcxx/trunk/src/wctype.cpp Fri Jul 6 16:32:28 2007
@@ -371,7 +371,7 @@
} // namespace __rw
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
_RW::__rw_facet_id ctype<wchar_t>::id;
@@ -1051,7 +1051,7 @@
}
-} // namespace _V3_LOCALE
+} // namespace std
_RWSTD_DEFINE_FACET_FACTORY (static, ctype, <wchar_t>, wctype);
