Author: faridz
Date: Tue Oct 30 10:44:19 2007
New Revision: 590183
URL: http://svn.apache.org/viewvc?rev=590183&view=rev
Log:
2007-10-30 Farid Zaripov <[EMAIL PROTECTED]>
Merged r581946 from trunk with a fix for STDCXX-575
* 22.locale.cons.mt.cpp [_MSC_VER] (test_ctors): If
cat == std::locale::messages, compare combined locale
with first because of the MSVC doesn't support
LC_MESSAGES constant.
Modified:
incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.cons.mt.cpp
Modified:
incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.cons.mt.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.cons.mt.cpp?rev=590183&r1=590182&r2=590183&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.cons.mt.cpp
(original)
+++ incubator/stdcxx/branches/4.2.x/tests/localization/22.locale.cons.mt.cpp
Tue Oct 30 10:44:19 2007
@@ -119,8 +119,13 @@
const std::locale combined (first, next_name, cat);
// verify that the locales were created correctly
- if (std::locale::none == cat || first == next)
+ if ( std::locale::none == cat
+#ifdef _MSC_VER
+ || std::locale::messages == cat
+#endif
+ || first == next) {
RW_ASSERT (combined == first);
+ }
else if (std::locale::all == cat)
RW_ASSERT (combined == next);
else
@@ -129,8 +134,13 @@
// repeat the step above but with a locale object
const std::locale combined_2 (first, next, cat);
- if (std::locale::none == cat || first == next)
+ if ( std::locale::none == cat
+#ifdef _MSC_VER
+ || std::locale::messages == cat
+#endif
+ || first == next) {
RW_ASSERT (combined_2 == first);
+ }
else if (std::locale::all == cat)
RW_ASSERT (combined_2 == next);
else
