2012-09-15 Liviu Nicoara <lnicoara@apache.org>
Merged revision 1381727 from 4.2.x, via trunk:
2012-09-06 Liviu Nicoara <nikkoara@hates.ms>
Trivial build fixes:
* etc/config/src/LIMITS.cpp: volatile-qualified max to avoid
compiler optimization
* src/memattr.cpp: removed inadvertent include of config header
* tests/numerics/26.valarray.cassign.cpp: bumped up the library
version in conditional for which we don't test user defined types
git-svn-id: https://svn.apache.org/repos/asf/stdcxx/branches/4.3.x@1385086 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/etc/config/src/LIMITS.cpp b/etc/config/src/LIMITS.cpp
index e3e6dfa..e574dff 100644
--- a/etc/config/src/LIMITS.cpp
+++ b/etc/config/src/LIMITS.cpp
@@ -173,7 +173,7 @@
T compute_limits (T *pval, const char *pfx, const char *sfx, const char *type)
{
T min = T (-one);
- T max = T (one);
+ T volatile max = T (one);
int is_signed = T (min - one) < T (zero);
diff --git a/tests/numerics/26.valarray.cassign.cpp b/tests/numerics/26.valarray.cassign.cpp
index f217875..5152f85 100644
--- a/tests/numerics/26.valarray.cassign.cpp
+++ b/tests/numerics/26.valarray.cassign.cpp
@@ -805,9 +805,9 @@
TEST (int);
TEST (double);
-#if 0x04020100 >= _RWSTD_VER
+#if 0x05000000 > _RWSTD_VER
- // test fails to compile with stdcxx 4.2.1 and prior due to
+ // test fails to compile with stdcxx 4.x and prior due to
// STDCXX-512: http://issues.apache.org/jira/browse/STDCXX-512
rw_warn (0, 0, __LINE__,
"test of UserClass disabled in stdcxx 4.2.0 and prior "
