stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r627641 - in /stdcxx/trunk/include/rw: _config-msvc.h _defs.h
Date Thu, 14 Feb 2008 03:01:46 GMT
Author: faridz
Date: Wed Feb 13 19:01:43 2008
New Revision: 627641

URL: http://svn.apache.org/viewvc?rev=627641&view=rev
Log:
2008-02-14  Farid Zaripov  <farid_zaripov@epam.com>

	* include/rw/_defs.h: Move MSVC specific #pragma's from here...
	* include/rw/_config-msvc.h: ... to here. Disable warning C4661.

Modified:
    stdcxx/trunk/include/rw/_config-msvc.h
    stdcxx/trunk/include/rw/_defs.h

Modified: stdcxx/trunk/include/rw/_config-msvc.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_config-msvc.h?rev=627641&r1=627640&r2=627641&view=diff
==============================================================================
--- stdcxx/trunk/include/rw/_config-msvc.h (original)
+++ stdcxx/trunk/include/rw/_config-msvc.h Wed Feb 13 19:01:43 2008
@@ -48,21 +48,37 @@
 #  endif   // _RWSTD_NO_STRING_NPOS_TYPE
 #endif   // MSVC <= 7.0
 
-   // disable "Same type qualifier used more than once"
-#  pragma warning (disable: 4114)
+// disable "Same type qualifier used more than once"
+#pragma warning (disable: 4114)
 
-   // disable "return type for operator->' is not a UDT"
-#  pragma warning (disable: 4284)
+// disable "return type for operator->' is not a UDT"
+#pragma warning (disable: 4284)
 
-   // disable "nonstandard extension used :"
-   // "'extern' before template explicit instantiation"
-#  pragma warning (disable: 4231)
+// disable "nonstandard extension used :"
+// "'extern' before template explicit instantiation"
+#pragma warning (disable: 4231)
 
-   // disable "decorated name length exceeded"
-#  pragma warning (disable: 4503)
+// RWDLL - defined for all Rogue Wave(R) products built as shared libs
+// _RWSHARED - defined for libstd built/used as a shared lib
+#if defined (RWDLL) || defined (_RWSHARED)
 
-   // disable "identifier was truncated to 255 characters"
-#  pragma warning (disable: 4786)
+   // disable "class needs to have dll-interface to be used by cliens"
+#  pragma warning (disable: 4251)
 
-   // disable "'function': was declared deprecated"
-#  pragma warning (disable: 4996)
+   // disable "non dll-interface class used as base for dll-interface class"
+#  pragma warning (disable: 4275)
+
+#endif   // RWDLL || _RWSHARED
+
+// disable "decorated name length exceeded"
+#pragma warning (disable: 4503)
+
+// disable "'identifier' : no suitable definition"
+// "provided for explicit template instantiation request"
+#pragma warning (disable: 4661)
+
+// disable "identifier was truncated to 255 characters"
+#pragma warning (disable: 4786)
+
+// disable "'function': was declared deprecated"
+#pragma warning (disable: 4996)

Modified: stdcxx/trunk/include/rw/_defs.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/rw/_defs.h?rev=627641&r1=627640&r2=627641&view=diff
==============================================================================
--- stdcxx/trunk/include/rw/_defs.h (original)
+++ stdcxx/trunk/include/rw/_defs.h Wed Feb 13 19:01:43 2008
@@ -481,13 +481,6 @@
 
 #    define _RWSTD_CLASS_EXPORT    _RWSTD_EXPORT
 #    define _RWSTD_MEMBER_EXPORT   /* empty */
-
-   // disable warnings:
-   // C4251: class needs to have dll-interface to be used by cliens
-   // C4275: non dll-interface class used as base for dll-interface class
-#  pragma warning (disable: 4251)
-#  pragma warning (disable: 4275)
-
 #else
    // disable Windows hacks
 #  define _RWSTD_EXPORT          /* empty */
@@ -1332,12 +1325,8 @@
 #elif     defined (_MSC_VER)                          \
       && !defined (_RWSTD_NO_EXPLICIT_INSTANTIATION)  \
       && !defined (_RWSTD_NO_INSTANTIATE)
-   // disable warning C4231: nonstandard extension used :
-   //         'extern' before template explicit instantiation
-#  pragma warning (disable: 4231)
 
 #  define _RWSTD_INSTANTIATE(ign1, type)   (!_RWSTD_NO ## type)
-
 #  define _RWSTD_INSTANTIATE_1(arg)        extern template arg
 #  define _RWSTD_INSTANTIATE_2(a1, a2)     extern template a1, a2
 #  define _RWSTD_INSTANTIATE_3(a1, a2, a3) extern template a1, a2, a3



Mime
View raw message