Author: faridz
Date: Tue Sep 9 03:38:56 2008
New Revision: 693426
URL: http://svn.apache.org/viewvc?rev=693426&view=rev
Log:
2008-09-09 Farid Zaripov <[EMAIL PROTECTED]>
Merged r693424 from branches/4.2.x
* tests/regress/18.c.limits.stdcxx-988.cpp: Resolved compilation
error on MSVC and ICC/Windows.
Modified:
stdcxx/trunk/tests/regress/18.c.limits.stdcxx-988.cpp
Modified: stdcxx/trunk/tests/regress/18.c.limits.stdcxx-988.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/trunk/tests/regress/18.c.limits.stdcxx-988.cpp?rev=693426&r1=693425&r2=693426&view=diff
==============================================================================
--- stdcxx/trunk/tests/regress/18.c.limits.stdcxx-988.cpp (original)
+++ stdcxx/trunk/tests/regress/18.c.limits.stdcxx-988.cpp Tue Sep 9 03:38:56
2008
@@ -138,14 +138,14 @@
assert (SCHAR_MAX == +127);
assert (SHRT_MAX >= +32767);
-#ifndef _RWSTD_EDG_ECCP
+#if !defined (_RWSTD_EDG_ECCP) && !defined (_MSC_VER)
// avoid exercising with the EDG eccp front end (strict mode)
assert (LONG_BIT >= 32);
assert (SSIZE_MAX >= _POSIX_SSIZE_MAX);
assert (WORD_BIT >= 32);
-#endif // EDG eccp
+#endif // EDG eccp || MSVC || ICC/Windows
assert (UCHAR_MAX >= 255);
assert (UINT_MAX >= 4294967295);