Author: faridz
Date: Mon Nov 12 05:51:26 2007
New Revision: 594135
URL: http://svn.apache.org/viewvc?rev=594135&view=rev
Log:
2007-11-12 Farid Zaripov <[EMAIL PROTECTED]>
Merged r594132 from branches/4.2.x with a fix for STDCXX-662
* 17.names.cpp [_WIN32 && 1400 <= _MSC_VER]: Added #include <intrin.h>
because it will be included by the library.
Modified:
incubator/stdcxx/trunk/tests/intro/17.names.cpp
Modified: incubator/stdcxx/trunk/tests/intro/17.names.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/intro/17.names.cpp?rev=594135&r1=594134&r2=594135&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/intro/17.names.cpp (original)
+++ incubator/stdcxx/trunk/tests/intro/17.names.cpp Mon Nov 12 05:51:26 2007
@@ -96,8 +96,11 @@
# else
# include <dce/pthread.h>
# endif
-#elif defined (_WIN32) || defined (_WIN32)
+#elif defined (_WIN32)
# include <windows.h>
+# if defined (_MSC_VER) && 1400 <= _MSC_VER
+# include <intrin.h>
+# endif // 1400 <= _MSC_VER
#endif
