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 2005/12/02 23:17:41 UTC
svn commit: r351844 -
/incubator/stdcxx/trunk/etc/config/src/GLOBAL_BAD_TYPEID.cpp
Author: sebor
Date: Fri Dec 2 14:17:35 2005
New Revision: 351844
URL: http://svn.apache.org/viewcvs?rev=351844&view=rev
Log:
2005-12-02 Martin Sebor <se...@roguewave.com>
* GLOBAL_BAD_TYPEID.cpp: Eliminated a conflicting definition of
the class in the global scope (<typeinfo> might define it there
and introduce it into namespace via a using declaration, as, for
instance, MSVC 7 does).
Modified:
incubator/stdcxx/trunk/etc/config/src/GLOBAL_BAD_TYPEID.cpp
Modified: incubator/stdcxx/trunk/etc/config/src/GLOBAL_BAD_TYPEID.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/src/GLOBAL_BAD_TYPEID.cpp?rev=351844&r1=351843&r2=351844&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/src/GLOBAL_BAD_TYPEID.cpp (original)
+++ incubator/stdcxx/trunk/etc/config/src/GLOBAL_BAD_TYPEID.cpp Fri Dec 2 14:17:35 2005
@@ -6,13 +6,6 @@
#ifndef _RWSTD_NO_TYPEINFO
# include <typeinfo>
-
-# ifndef _RWSTD_NO_HONOR_STD
-
-class bad_typeid { };
-
-# endif // _RWSTD_NO_HONOR_STD
-
#else // if defined (_RWSTD_NO_TYPEINFO)
# ifndef _RWSTD_NO_TYPEINFO_H
# include <typeinfo.h>
@@ -27,8 +20,9 @@
#endif // _RWSTD_NO_TYPEINFO
-#ifndef _RWSTD_NO_HONOR_STD
-# ifdef _RWSTD_NO_STD_TERMINATE
+#if 2 == __GNUG__
+# ifndef _RWSTD_NO_HONOR_STD
+# ifdef _RWSTD_NO_STD_TERMINATE
namespace std {
@@ -44,8 +38,9 @@
} // namespace std
-# endif // _RWSTD_NO_STD_TERMINATE
-#endif // _RWSTD_NO_HONOR_STD
+# endif // _RWSTD_NO_STD_TERMINATE
+# endif // _RWSTD_NO_HONOR_STD
+#endif // gcc 2.x
struct S { virtual ~S () { } };