* tinfo.cc (operator==): Always compare names.

From-SVN: r23034

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ed33ae2d4d291cf659ce04e42605fcf353c54d5c..9ce944fdaa80619866bd161a260e513495b52ab9 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-12  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * tinfo.cc (operator==): Always compare names.
+
 1998-10-12  Herman ten Brugge <Haj.Ten.Brugge@net.HCC.nl>
 
        * decl.c (start_function): Fix cut-and-paste error.

diff --git a/gcc/cp/tinfo.cc b/gcc/cp/tinfo.cc
index 2096a512a23d20fa591ef70f71675bef943a9cdb..6de805524e07c16d71c0e7a9aa95cb4c66c42f43 100644 (file)
--- a/gcc/cp/tinfo.cc
+++ b/gcc/cp/tinfo.cc
@@ -39,22 +39,12 @@ std::type_info::
 ~type_info ()
 { }
 
-#ifndef __COMMON_UNRELIABLE
+// We can't rely on common symbols being shared between shared objects.
 bool type_info::
 operator== (const type_info& arg) const
 {
-  return &arg == this;
+  return (&arg == this) || (fast_compare (name (), arg.name ()) == 0);
 }
-#else
-// We can't rely on common symbols being shared between translation units
-// under Windows.  Sigh.
-
-bool type_info::
-operator== (const type_info& arg) const
-{
-  return fast_compare (name (), arg.name ()) == 0;
-}
-#endif
 
 extern "C" void
 __rtti_class (void *addr, const char *name,