Revert last patch

From-SVN: r34486
This commit is contained in:
Mark Mitchell 2000-06-11 03:38:05 +00:00
parent 7775bd6bd5
commit 88fa51976c
3 changed files with 11 additions and 4 deletions

View File

@ -1,4 +1,4 @@
// Copyright (C) 1999, 2000 Free Software Foundation, Inc. // Copyright (C) 1999 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 21 Nov 1999 <nathan@acm.org> // Contributed by Nathan Sidwell 21 Nov 1999 <nathan@acm.org>
// make sure __FUNCTION__ and __PRETTY_FUNCTION__ work in member functions // make sure __FUNCTION__ and __PRETTY_FUNCTION__ work in member functions
@ -67,7 +67,7 @@ X::operator int ()
printf ("__FUNCTION__ %s\n", function); printf ("__FUNCTION__ %s\n", function);
printf ("__PRETTY_FUNCTION__ %s\n", pretty); printf ("__PRETTY_FUNCTION__ %s\n", pretty);
if (strcmp (function, "operator i")) if (strcmp (function, "__opi"))
bad = true; bad = true;
if (strcmp (pretty, "X::operator int ()")) if (strcmp (pretty, "X::operator int ()"))
bad = true; bad = true;

View File

@ -4,4 +4,4 @@
// Simplified for testsuite by Alexandre Oliva // Simplified for testsuite by Alexandre Oliva
struct foo { operator long double(); }; struct foo { operator long double(); };
int bar(int __opr); // gets bogus error int bar(int __opr); // gets bogus error - XFAIL *-*-*

View File

@ -1,6 +1,13 @@
// Build don't link: // Build don't link:
// Special g++ Options: -fno-squangle
// Origin: Mark Mitchell <mark@codesourcery.com> // Origin: Mark Mitchell <mark@codesourcery.com>
#if (!defined (__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100)
#define NAME(OLD, NEW) OLD
#else
#define NAME(OLD, NEW) NEW
#endif /* (!defined (__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100) */
static unsigned int strlen (const char*) {} // ERROR - previous declaration static unsigned int strlen (const char*) {} // ERROR - previous declaration
int _Z6strlenPKc = 0; // ERROR - duplicate declaration int NAME (strlen__FPCc, _Z6strlenPKc) = 0; // ERROR - duplicate declaration