Author: faridz
Date: Thu Oct 9 03:42:48 2008
New Revision: 703124
URL: http://svn.apache.org/viewvc?rev=703124&view=rev
Log:
2008-10-09 Farid Zaripov <[EMAIL PROTECTED]>
* src/locale_body.h: Replace __CYGWIN32__ to __CYGWIN__ for consistency.
* util/ctype.cpp: Ditto.
* util/localedef.cpp: Ditto.
Modified:
stdcxx/branches/4.2.x/src/locale_body.h
stdcxx/branches/4.2.x/util/ctype.cpp
stdcxx/branches/4.2.x/util/localedef.cpp
Modified: stdcxx/branches/4.2.x/src/locale_body.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/src/locale_body.h?rev=703124&r1=703123&r2=703124&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/src/locale_body.h (original)
+++ stdcxx/branches/4.2.x/src/locale_body.h Thu Oct 9 03:42:48 2008
@@ -91,8 +91,6 @@
// (i.e., one with the same id) in the locale object
_RWSTD_SIZE_T _C_byname_facet_bits;
- __rw_mutex _C_mutex;
-
friend struct _STD::locale;
public:
@@ -165,14 +163,6 @@
return _RWSTD_ATOMIC_PREDECREMENT (__facet._C_ref, false);
}
- _RWSTD_SIZE_T _C_add_ref () {
- return _RWSTD_ATOMIC_PREINCREMENT (_C_ref, _C_mutex);
- }
-
- _RWSTD_SIZE_T _C_remove_ref () {
- return _RWSTD_ATOMIC_PREDECREMENT (_C_ref, _C_mutex);
- }
-
// access private facet name
static const char* _C_get_cat_name (const __rw_facet &__facet) {
return __facet._C_name;
Modified: stdcxx/branches/4.2.x/util/ctype.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/ctype.cpp?rev=703124&r1=703123&r2=703124&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/ctype.cpp (original)
+++ stdcxx/branches/4.2.x/util/ctype.cpp Thu Oct 9 03:42:48 2008
@@ -690,7 +690,7 @@
if (next.token != Scanner::tok_string)
issue_diag (E_SYNTAX, true, &next,
"expected string following \"copy\" directive\n");
-#if !defined (_WIN32) && !defined (__CYGWIN32__)
+#if !defined (_WIN32) && !defined (__CYGWIN__)
ctype_symlink_ = true;
@@ -712,7 +712,7 @@
continue;
}
-#endif // !_WIN32 && !__CYGWIN32__
+#endif // !_WIN32 && !__CYGWIN__
// bump up the nesting level
nesting_level++;
@@ -891,7 +891,7 @@
}
-#if !defined (_WIN32) && !defined (__CYGWIN32__)
+#if !defined (_WIN32) && !defined (__CYGWIN__)
if (ctype_symlink_) {
@@ -909,6 +909,6 @@
return;
}
-#endif // !_WIN32 && !__CYGWIN32__
+#endif // !_WIN32 && !__CYGWIN__
}
Modified: stdcxx/branches/4.2.x/util/localedef.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/util/localedef.cpp?rev=703124&r1=703123&r2=703124&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/util/localedef.cpp (original)
+++ stdcxx/branches/4.2.x/util/localedef.cpp Thu Oct 9 03:42:48 2008
@@ -267,7 +267,7 @@
if (C_locales.empty ())
return;
-#if !defined (_WIN32) && !defined (__CYGWIN32__)
+#if !defined (_WIN32) && !defined (__CYGWIN__)
if (link_aliases == false)
return;
@@ -283,7 +283,7 @@
// pointing to our locale database
create_symlink (outdir, std_locale, *it);
}
-#endif // !_WIN32 && !__CYGWIN32__
+#endif // !_WIN32 && !__CYGWIN__
}
