From ee2cee2db30da10ba42fca8587d4924a6e03656d Mon Sep 17 00:00:00 2001 From: mmitchel Date: Mon, 7 May 2001 18:02:05 +0000 Subject: [PATCH] * g++.old-deja/g++.other/op2.C: Don't use `glob' as a variable. * g++.old-deja/g++.other/op3.C: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_0-branch@41900 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/g++.old-deja/g++.other/op2.C | 126 ++++++++++++++--------------- gcc/testsuite/g++.old-deja/g++.other/op3.C | 126 ++++++++++++++--------------- 3 files changed, 131 insertions(+), 126 deletions(-) rewrite gcc/testsuite/g++.old-deja/g++.other/op2.C (71%) rewrite gcc/testsuite/g++.old-deja/g++.other/op3.C (70%) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f4adc1d479b..c43b86dcf16 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-05-07 Mark Mitchell + + * g++.old-deja/g++.other/op2.C: Don't use `glob' as a variable. + * g++.old-deja/g++.other/op3.C: Likewise. + 2001-05-04 David Edelsohn * gcc.c-torture/execute/20001227-1.c: Remove duplicate of diff --git a/gcc/testsuite/g++.old-deja/g++.other/op2.C b/gcc/testsuite/g++.old-deja/g++.other/op2.C dissimilarity index 71% index 70af6ac34a0..4e5528f9583 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/op2.C +++ b/gcc/testsuite/g++.old-deja/g++.other/op2.C @@ -1,63 +1,63 @@ -// Copyright (C) 2000 Free Software Foundation, Inc. -// Contributed by Nathan Sidwell 28 Nov 2000 - -// Bug 91. We'd not preserve constness looking for a base classes assignment -// operator. - -#include - -int glob = 0; - -struct A -{ - A() {} - - A( A& arg) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 1;} - - A( const A& arg) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 2;} - - A& operator=( A& ) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 3; return *this; } - - A& operator=( const A& ) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 4; return *this; } -}; - -struct B : A -{ - B () {} -}; - -void foo( A& ) -{ - printf ("%s\n", __PRETTY_FUNCTION__); glob = 5; -} - -void foo( const A& ) -{ - printf ("%s\n", __PRETTY_FUNCTION__); glob = 6; -} - - -int main() -{ - const A a0; - glob = 0; printf ("A(cA) : "); A a1(a0); if (glob != 2) return 1; - glob = 0; printf ("A(A ) : "); A a2(a1); if (glob != 1) return 2; - - const B b0; - glob = 0; printf ("B(cB) : "); B b1(b0); if (glob != 2) return 3; - glob = 0; printf ("B(B ) : "); B b2(b1); if (glob != 2) return 4; - - glob = 0; printf ("A= cA : "); a1 = a0; if (glob != 4) return 5; - glob = 0; printf ("A= A : "); a1 = a2; if (glob != 3) return 6; - glob = 0; printf ("B= cB : "); b1 = b0; if (glob != 4) return 7; - glob = 0; printf ("B= B : "); b1 = b2; if (glob != 4) return 8; - - glob = 0; printf ("foo(cB): "); foo(b0); if (glob != 6) return 9; - glob = 0; printf ("foo(B ): "); foo(b2); if (glob != 5) return 10; - - return 0; -} +// Copyright (C) 2000, 2001 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 28 Nov 2000 + +// Bug 91. We'd not preserve constness looking for a base classes assignment +// operator. + +#include + +int value = 0; + +struct A +{ + A() {} + + A( A& arg) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 1;} + + A( const A& arg) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 2;} + + A& operator=( A& ) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 3; return *this; } + + A& operator=( const A& ) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 4; return *this; } +}; + +struct B : A +{ + B () {} +}; + +void foo( A& ) +{ + printf ("%s\n", __PRETTY_FUNCTION__); value = 5; +} + +void foo( const A& ) +{ + printf ("%s\n", __PRETTY_FUNCTION__); value = 6; +} + + +int main() +{ + const A a0; + value = 0; printf ("A(cA) : "); A a1(a0); if (value != 2) return 1; + value = 0; printf ("A(A ) : "); A a2(a1); if (value != 1) return 2; + + const B b0; + value = 0; printf ("B(cB) : "); B b1(b0); if (value != 2) return 3; + value = 0; printf ("B(B ) : "); B b2(b1); if (value != 2) return 4; + + value = 0; printf ("A= cA : "); a1 = a0; if (value != 4) return 5; + value = 0; printf ("A= A : "); a1 = a2; if (value != 3) return 6; + value = 0; printf ("B= cB : "); b1 = b0; if (value != 4) return 7; + value = 0; printf ("B= B : "); b1 = b2; if (value != 4) return 8; + + value = 0; printf ("foo(cB): "); foo(b0); if (value != 6) return 9; + value = 0; printf ("foo(B ): "); foo(b2); if (value != 5) return 10; + + return 0; +} diff --git a/gcc/testsuite/g++.old-deja/g++.other/op3.C b/gcc/testsuite/g++.old-deja/g++.other/op3.C dissimilarity index 70% index 957b4d32fd3..08833c49104 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/op3.C +++ b/gcc/testsuite/g++.old-deja/g++.other/op3.C @@ -1,63 +1,63 @@ -// Copyright (C) 2000 Free Software Foundation, Inc. -// Contributed by Nathan Sidwell 28 Nov 2000 - -// Related to bug 91. We'd not preserve constness accessing a member of the -// source type in copy ctor and assignment op. - -#include - -int glob = 0; - -struct A -{ - A() {} - - A( A& arg) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 1;} - - A( const A& arg) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 2;} - - A& operator=( A& ) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 3; return *this; } - - A& operator=( const A& ) - { printf ("%s\n", __PRETTY_FUNCTION__); glob = 4; return *this; } -}; - -struct B -{ - A a; - B () {} -}; - -void foo( A& ) -{ - printf ("%s\n", __PRETTY_FUNCTION__); glob = 5; -} - -void foo( const A& ) -{ - printf ("%s\n", __PRETTY_FUNCTION__); glob = 6; -} - -int main() -{ - const A a0; - glob = 0; printf ("A(cA) : "); A a1(a0); if (glob != 2) return 1; - glob = 0; printf ("A(A ) : "); A a2(a1); if (glob != 1) return 2; - - const B b0; - glob = 0; printf ("B(cB) : "); B b1(b0); if (glob != 2) return 3; - glob = 0; printf ("B(B ) : "); B b2(b1); if (glob != 2) return 4; - - glob = 0; printf ("A= cA : "); a1 = a0; if (glob != 4) return 5; - glob = 0; printf ("A= A : "); a1 = a2; if (glob != 3) return 6; - glob = 0; printf ("B= cB : "); b1 = b0; if (glob != 4) return 7; - glob = 0; printf ("B= B : "); b1 = b2; if (glob != 4) return 8; - - glob = 0; printf ("foo(cB): "); foo(b0.a); if (glob != 6) return 9; - glob = 0; printf ("foo(B ): "); foo(b2.a); if (glob != 5) return 10; - - return 0; -} +// Copyright (C) 2000, 2001 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 28 Nov 2000 + +// Related to bug 91. We'd not preserve constness accessing a member of the +// source type in copy ctor and assignment op. + +#include + +int value = 0; + +struct A +{ + A() {} + + A( A& arg) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 1;} + + A( const A& arg) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 2;} + + A& operator=( A& ) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 3; return *this; } + + A& operator=( const A& ) + { printf ("%s\n", __PRETTY_FUNCTION__); value = 4; return *this; } +}; + +struct B +{ + A a; + B () {} +}; + +void foo( A& ) +{ + printf ("%s\n", __PRETTY_FUNCTION__); value = 5; +} + +void foo( const A& ) +{ + printf ("%s\n", __PRETTY_FUNCTION__); value = 6; +} + +int main() +{ + const A a0; + value = 0; printf ("A(cA) : "); A a1(a0); if (value != 2) return 1; + value = 0; printf ("A(A ) : "); A a2(a1); if (value != 1) return 2; + + const B b0; + value = 0; printf ("B(cB) : "); B b1(b0); if (value != 2) return 3; + value = 0; printf ("B(B ) : "); B b2(b1); if (value != 2) return 4; + + value = 0; printf ("A= cA : "); a1 = a0; if (value != 4) return 5; + value = 0; printf ("A= A : "); a1 = a2; if (value != 3) return 6; + value = 0; printf ("B= cB : "); b1 = b0; if (value != 4) return 7; + value = 0; printf ("B= B : "); b1 = b2; if (value != 4) return 8; + + value = 0; printf ("foo(cB): "); foo(b0.a); if (value != 6) return 9; + value = 0; printf ("foo(B ): "); foo(b2.a); if (value != 5) return 10; + + return 0; +} -- 2.11.4.GIT