[EMAIL PROTECTED] wrote:
Author: faridz
Date: Fri May 25 07:41:40 2007
New Revision: 541672
URL: http://svn.apache.org/viewvc?view=rev&rev=541672
Log:
2007-05-25 Farid Zaripov <[EMAIL PROTECTED]>
* _config-msvc.h: MSVC specific #pragma's decorated with #ifndef
_INTEL_COMPILER;
added #pragma's to disable ICC warnings.
I wonder if it wouldn't be cleaner to move all the Intel C++
specific code out of _config-msvc.h and into _config-icc.h
and make sure we #include the former only for MSVC and the
latter only for Intel C++. One of the goals of separating
all the compiler-specific hacks and overrides was to make
it clear what's where and avoid accidentally breaking one
compiler while fixing a problem in another. The way we
handle MSVC and Intel C++ on Windows seems to go against
the goal (even though the compilers are meant to be fully
compatible).
Thoughts?
Martin
Modified:
incubator/stdcxx/trunk/include/rw/_config-msvc.h
Modified: incubator/stdcxx/trunk/include/rw/_config-msvc.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config-msvc.h?view=diff&rev=541672&r1=541671&r2=541672
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config-msvc.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config-msvc.h Fri May 25 07:41:40 2007
@@ -199,17 +199,28 @@
# define _RWSTD_NO_FWD_DECLARATIONS
#endif // _WIN64
+#ifndef __INTEL_COMPILER
// disable "Same type qualifier used more than once"
-#pragma warning (disable: 4114)
+# pragma warning (disable: 4114)
// disable "return type for operator->' is not a UDT"
-#pragma warning (disable: 4284)
+# pragma warning (disable: 4284)
// disable "decorated name length exceeded"
-#pragma warning (disable: 4503)
+# pragma warning (disable: 4503)
// disable "identifier was truncated to 255 characters"
-#pragma warning (disable: 4786)
+# pragma warning (disable: 4786)
+
+#else // __INTEL_COMPILER
+
+ // disable "function was declared "deprecated"
+# pragma warning (disable: 1478)
+
+ // disable "dllexport/dllimport conflict with ... ; dllexport assumed"
+# pragma warning (disable: 1740)
+
+#endif // __INTEL_COMPILER
#if defined (WIN32) && !defined(_WIN32)
# define _WIN32
