You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2007/10/18 22:57:48 UTC
svn commit: r586132 - in /incubator/stdcxx/trunk/include/rw: _config-msvc.h
_config-msvcrt.h
Author: sebor
Date: Thu Oct 18 13:57:47 2007
New Revision: 586132
URL: http://svn.apache.org/viewvc?rev=586132&view=rev
Log:
2007-10-18 Travis Vitek <vi...@roguewave.com>
Martin Sebor <se...@roguewave.com>
Merged rev 586131 from branches/4.2.0.
* _config-msvc.h: Reverted rev 586112 and applied the same patch
below (modulo some additional noise that had accidentally slipped
in).
* _config-msvcrt.h [_RWSTD_VER_MAJOR < 5]: Define configuration
macros to maintain binary compatibility with 4.1.x on MSVC. This
reverts the binary incompatible fix for STDCXX-509 that went in
with rev 585157.
Modified:
incubator/stdcxx/trunk/include/rw/_config-msvc.h
incubator/stdcxx/trunk/include/rw/_config-msvcrt.h
Modified: incubator/stdcxx/trunk/include/rw/_config-msvc.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config-msvc.h?rev=586132&r1=586131&r2=586132&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config-msvc.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config-msvc.h Thu Oct 18 13:57:47 2007
@@ -25,7 +25,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2007 Rogue Wave Software, Inc.
+ * Copyright 1994-2006 Rogue Wave Software.
*
**************************************************************************/
@@ -57,25 +57,6 @@
#endif // _RWSTD_NO_EXPORT
#endif // MSVC <= 6.0
-
-#if (_MSC_VER < 1400) && (_RWSTD_VER_MAJOR < 5)
-# define _RWSTD_MSVC7_STDCXX42_BINARY_COMPAT_FIX
-#endif
-
-#if _RWSTD_VER_MAJOR < 5
- // defined for binary compatibility with stdcxx 4.1.x
-# define _RWSTD_NO_BAD_CAST_ASSIGNMENT
-# define _RWSTD_NO_BAD_CAST_COPY_CTOR
-# define _RWSTD_NO_BAD_CAST_DTOR
-# define _RWSTD_NO_BAD_TYPEID_ASSIGNMENT
-# define _RWSTD_NO_BAD_TYPEID_COPY_CTOR
-# define _RWSTD_NO_BAD_TYPEID_DTOR
-# define _RWSTD_NO_EXCEPTION_ASSIGNMENT
-# define _RWSTD_NO_EXCEPTION_COPY_CTOR
-# define _RWSTD_NO_EXCEPTION_DEFAULT_CTOR
-# define _RWSTD_NO_EXCEPTION_DTOR
-# define _RWSTD_NO_EXCEPTION_WHAT
-#endif // stdcxx version < 5
// disable "Same type qualifier used more than once"
# pragma warning (disable: 4114)
Modified: incubator/stdcxx/trunk/include/rw/_config-msvcrt.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_config-msvcrt.h?rev=586132&r1=586131&r2=586132&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config-msvcrt.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config-msvcrt.h Thu Oct 18 13:57:47 2007
@@ -26,7 +26,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -219,3 +219,19 @@
typedef unsigned short wchar_t;
#endif // _NATIVE_WCHAR_T_DEFINED
+
+#if _RWSTD_VER_MAJOR < 5
+ // defined for binary compatibility with stdcxx 4.1.x
+ // (for all versions of MSVC and Intel C++)
+# define _RWSTD_NO_BAD_CAST_ASSIGNMENT
+# define _RWSTD_NO_BAD_CAST_COPY_CTOR
+# define _RWSTD_NO_BAD_CAST_DTOR
+# define _RWSTD_NO_BAD_TYPEID_ASSIGNMENT
+# define _RWSTD_NO_BAD_TYPEID_COPY_CTOR
+# define _RWSTD_NO_BAD_TYPEID_DTOR
+# define _RWSTD_NO_EXCEPTION_ASSIGNMENT
+# define _RWSTD_NO_EXCEPTION_COPY_CTOR
+# define _RWSTD_NO_EXCEPTION_DEFAULT_CTOR
+# define _RWSTD_NO_EXCEPTION_DTOR
+# define _RWSTD_NO_EXCEPTION_WHAT
+#endif // _RWSTD_VER_MAJOR < 5