[EMAIL PROTECTED] wrote:
Author: faridz
Date: Mon Jun 9 10:13:13 2008
New Revision: 665784
URL: http://svn.apache.org/viewvc?rev=665784view=rev
Log:
2008-06-09 Farid Zaripov [EMAIL PROTECTED]
Where is the macro _RWSTD_MSVC is #defined? I don't see its
definition in this patch and I can't find it anywhere else
either.
* include/rw/_config-msvcrt.h: Move MSVC-specific #pragma from here...
* include/rw/_config-msvc.h: ... to here.
* include/rw/_defs.h: Use dllimport/dllexport attributes on MSVC and
ICC/Windows only.
* tests/include/rw_testdefs.h: Ditto.
* include/complex: Avoid disabling MSVC-specific warnings on
ICC/Windows.
* include/string.cc: Ditto.
* include/valarray: Ditto.
* src/file.cpp: Ditto.
* src/iostream.cpp: Ditto.
* src/num_get.cpp: Ditto.
* src/punct.cpp: Ditto.
* src/ti_filebuf.cpp: Ditto.
* src/ti_stringbuf.cpp: Ditto.
* src/ti_wfilebuf.cpp: Ditto.
* src/ti_wstringbuf.cpp: Ditto.
* src/time_put.cpp: Ditto.
Modified:
stdcxx/branches/4.2.x/include/complex
stdcxx/branches/4.2.x/include/rw/_config-msvc.h
stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h
stdcxx/branches/4.2.x/include/rw/_defs.h
stdcxx/branches/4.2.x/include/string.cc
stdcxx/branches/4.2.x/include/valarray
stdcxx/branches/4.2.x/src/file.cpp
stdcxx/branches/4.2.x/src/iostream.cpp
stdcxx/branches/4.2.x/src/num_get.cpp
stdcxx/branches/4.2.x/src/punct.cpp
stdcxx/branches/4.2.x/src/ti_filebuf.cpp
stdcxx/branches/4.2.x/src/ti_stringbuf.cpp
stdcxx/branches/4.2.x/src/ti_wfilebuf.cpp
stdcxx/branches/4.2.x/src/ti_wstringbuf.cpp
stdcxx/branches/4.2.x/src/time_put.cpp
stdcxx/branches/4.2.x/tests/include/rw_testdefs.h
Modified: stdcxx/branches/4.2.x/include/complex
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/complex?rev=665784r1=665783r2=665784view=diff
==
--- stdcxx/branches/4.2.x/include/complex (original)
+++ stdcxx/branches/4.2.x/include/complex Mon Jun 9 10:13:13 2008
@@ -38,13 +38,13 @@
#include _RWSTD_CMATH
-#ifdef _MSC_VER
+#ifdef _RWSTD_MSVC
# pragma warning (push)
// disable conversion from 'double' to 'float', possible loss of data
// until a conforming cmath header with float and long double overloads
// for the C functions is provided
# pragma warning (disable: 4244)
-#endif // _MSC_VER
+#endif // _RWSTD_MSVC
_RWSTD_NAMESPACE (std) {
@@ -854,9 +854,9 @@
} // namespace std
-#ifdef _MSC_VER
+#ifdef _RWSTD_MSVC
# pragma warning (pop)
-#endif // _MSC_VER
+#endif // _RWSTD_MSVC
#if _RWSTD_DEFINE_TEMPLATE (_COMPLEX)
Modified: stdcxx/branches/4.2.x/include/rw/_config-msvc.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_config-msvc.h?rev=665784r1=665783r2=665784view=diff
==
--- stdcxx/branches/4.2.x/include/rw/_config-msvc.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_config-msvc.h Mon Jun 9 10:13:13 2008
@@ -73,6 +73,10 @@
// disable decorated name length exceeded
#pragma warning (disable: 4503)
+// convert warning 'identifier' used on polymorphic type 'type' with /GR-;
+// unpredictable behavior may result to error
+#pragma warning (error: 4541)
+
// disable 'identifier' : no suitable definition
// provided for explicit template instantiation request
#pragma warning (disable: 4661)
Modified: stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h?rev=665784r1=665783r2=665784view=diff
==
--- stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_config-msvcrt.h Mon Jun 9 10:13:13 2008
@@ -132,7 +132,6 @@
# define _RWSTD_NO_DYNAMIC_CAST
#endif // _CPPRTTI
-#pragma warning (error: 4541)
#ifndef _NATIVE_WCHAR_T_DEFINED
// define wchar_t if it is not a keyword recognized by the compiler
// (use the /Zc:wchar_t compiler option to enable wchar_t as a keyword)
Modified: stdcxx/branches/4.2.x/include/rw/_defs.h
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/rw/_defs.h?rev=665784r1=665783r2=665784view=diff
==
--- stdcxx/branches/4.2.x/include/rw/_defs.h (original)
+++ stdcxx/branches/4.2.x/include/rw/_defs.h Mon Jun 9 10:13:13 2008
@@ -466,11 +466,11 @@
_RW::__rw_new_capacityT(from, what)
#endif // HP aCC
-// set up Win32/64 DLL export/import directives
+// set up MSVC DLL export/import directives
// _DLL - defined by the compiler when either -MD or -MDd is used
// RWDLL - defined for all Rogue Wave(R) products built as shared libs
// _RWSHARED - defined for
