Author: sebor
Date: Thu Jul 31 17:45:11 2008
New Revision: 681568
URL: http://svn.apache.org/viewvc?rev=681568&view=rev
Log:
2008-07-31 Martin Sebor <[EMAIL PROTECTED]>
Merged revs 680574 and 681567 from 4.3.x.
2008-07-28 Travis Vitek <[EMAIL PROTECTED]>
* tests/src/thread.cpp [__EDG__]: Disable error for use of long long
in pthreadtypes.h system header.
2008-07-31 Martin Sebor <[EMAIL PROTECTED]>
* tests/src/thread.cpp [_RWSTD_POSIX_THREADS]: Simplified
preprocessor conditional logic introduced in rev 680574.
Modified:
stdcxx/branches/4.2.x/tests/src/thread.cpp
Modified: stdcxx/branches/4.2.x/tests/src/thread.cpp
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/src/thread.cpp?rev=681568&r1=681567&r2=681568&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/src/thread.cpp (original)
+++ stdcxx/branches/4.2.x/tests/src/thread.cpp Thu Jul 31 17:45:11 2008
@@ -83,6 +83,14 @@
#if defined (_RWSTD_POSIX_THREADS)
+
+# ifdef _RWSTD_EDG_ECCP
+ // disable error #450-D: the type "long long" is nonstandard
+ // issued for uses of the type in Linux system headers (e.g.,
+ // pthreadtypes.h)
+# pragma diag_suppress 450
+# endif // vanilla EDG eccp demo
+
# include <pthread.h>
_TEST_EXPORT int
