Author: lnicoara
Date: Sat Sep 15 15:24:30 2012
New Revision: 1385081
URL: http://svn.apache.org/viewvc?rev=1385081&view=rev
Log:
2012-09-15 Liviu Nicoara <lnico...@apache.org>
Merged revision 1381727 from 4.2.x:
2012-09-06 Liviu Nicoara <nikko...@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
Modified:
stdcxx/trunk/ (props changed)
stdcxx/trunk/etc/config/src/LIMITS.cpp
stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp
Propchange: stdcxx/trunk/
------------------------------------------------------------------------------
Merged /stdcxx/branches/4.2.x:r1381727
Modified: stdcxx/trunk/etc/config/src/LIMITS.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/etc/config/src/LIMITS.cpp?rev=1385081&r1=1385080&r2=1385081&view=diff
==============================================================================
--- stdcxx/trunk/etc/config/src/LIMITS.cpp (original)
+++ stdcxx/trunk/etc/config/src/LIMITS.cpp Sat Sep 15 15:24:30 2012
@@ -173,7 +173,7 @@ template <class T>
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);
Modified: stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp?rev=1385081&r1=1385080&r2=1385081&view=diff
==============================================================================
--- stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp (original)
+++ stdcxx/trunk/tests/numerics/26.valarray.cassign.cpp Sat Sep 15 15:24:30 2012
@@ -805,9 +805,9 @@ run_test (int, char**)
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 "
