From: Jason Merrill Date: Sun, 12 Jul 1998 16:39:31 +0000 (-0400) Subject: fix X-Git-Tag: prereleases/egcs-1.1-prerelease~293 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894ded60fa7734ee7b3f029b98c0ab6d7d95a7b4;p=thirdparty%2Fgcc.git fix From-SVN: r21090 --- diff --git a/gcc/testsuite/g++.old-deja/g++.other/singleton.C b/gcc/testsuite/g++.old-deja/g++.other/singleton.C index fda64fb9a465..f2025fc1753f 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/singleton.C +++ b/gcc/testsuite/g++.old-deja/g++.other/singleton.C @@ -1,8 +1,7 @@ // execution test - re-initialization of statics XFAIL *-*-* // This tests two things: // 1. there is an annoying warning. -// singleton.C:26: warning: `class singleton' only defines private constructors -and has no friends +// singleton.C:26: warning: `class singleton' only defines private constructors and has no friends // egcs fails to see that there is a public static accessor function. // 2. the program crashes, because apparently the static variable s in // singleton::instance() is considered constructed although the ctor @@ -33,7 +32,7 @@ int main() { while (1) { try { - return singleton::instance().ok()-2; + return singleton::instance().check()-2; } catch (...) { } } }