diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-10-12 20:08:54 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-10-12 16:08:54 -0400 |
| commit | 1873d7691dca88915ff70753e2e40367711950e1 (patch) | |
| tree | 99eb45b9281ab160e9e0aa967263f78194264df3 /gcc | |
| parent | 6f87c7d816816fdd66e28e4fa72c52f05bba82b9 (diff) | |
| download | gcc-1873d7691dca88915ff70753e2e40367711950e1.zip gcc-1873d7691dca88915ff70753e2e40367711950e1.tar.gz gcc-1873d7691dca88915ff70753e2e40367711950e1.tar.bz2 | |
* tinfo.cc (operator==): Always compare names.
From-SVN: r23034
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/tinfo.cc | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ed33ae2..9ce944f 100644 --- 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 2096a51..6de8055 100644 --- 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, |