aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>1998-07-12 12:39:31 -0400
committerJason Merrill <jason@gcc.gnu.org>1998-07-12 12:39:31 -0400
commit894ded60fa7734ee7b3f029b98c0ab6d7d95a7b4 (patch)
treedf770db4411172245662844247ce6fd9afa83d05 /gcc
parentea9635c73973763d0bf639967d5ca512a7e1b121 (diff)
downloadgcc-894ded60fa7734ee7b3f029b98c0ab6d7d95a7b4.zip
gcc-894ded60fa7734ee7b3f029b98c0ab6d7d95a7b4.tar.gz
gcc-894ded60fa7734ee7b3f029b98c0ab6d7d95a7b4.tar.bz2
fix
From-SVN: r21090
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/singleton.C5
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.other/singleton.C b/gcc/testsuite/g++.old-deja/g++.other/singleton.C
index fda64fb..f2025fc 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 (...) { }
}
}