This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: Fix op[23].C on Solaris
- To: gcc-patches at gcc dot gnu dot org
- Subject: PATCH: Fix op[23].C on Solaris
- From: Mark Mitchell <mark at codesourcery dot com>
- Date: Mon, 07 May 2001 11:03:12 -0700
- Organization: CodeSourcery, LLC
These two C++ tests were failing on Solaris because they used the
variable `glob', which caused the Solaris linker to complain because
it has the same name as function in the C library.
Tested on i686-pc-linux-gnu, installed on the mainline and on the
branch.
--
Mark Mitchell mark@codesourcery.com
CodeSourcery, LLC http://www.codesourcery.com
2001-05-07 Mark Mitchell <mark@codesourcery.com>
* g++.old-deja/g++.other/op2.C: Don't use `glob' as a variable.
* g++.old-deja/g++.other/op3.C: Likewise.
Index: op2.C
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/g++.old-deja/g++.other/op2.C,v
retrieving revision 1.1
diff -c -p -r1.1 op2.C
*** op2.C 2000/11/30 16:03:16 1.1
--- op2.C 2001/05/07 18:00:53
***************
*** 1,4 ****
! // Copyright (C) 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 28 Nov 2000 <nathan@codesourcery.com>
// Bug 91. We'd not preserve constness looking for a base classes assignment
--- 1,4 ----
! // Copyright (C) 2000, 2001 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 28 Nov 2000 <nathan@codesourcery.com>
// Bug 91. We'd not preserve constness looking for a base classes assignment
***************
*** 6,28 ****
#include <stdio.h>
! 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
--- 6,28 ----
#include <stdio.h>
! 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
*************** struct B : A
*** 32,63 ****
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;
}
--- 32,63 ----
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;
}
Index: op3.C
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/g++.old-deja/g++.other/op3.C,v
retrieving revision 1.1
diff -c -p -r1.1 op3.C
*** op3.C 2000/11/30 16:51:54 1.1
--- op3.C 2001/05/07 18:00:53
***************
*** 1,4 ****
! // Copyright (C) 2000 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 28 Nov 2000 <nathan@codesourcery.com>
// Related to bug 91. We'd not preserve constness accessing a member of the
--- 1,4 ----
! // Copyright (C) 2000, 2001 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 28 Nov 2000 <nathan@codesourcery.com>
// Related to bug 91. We'd not preserve constness accessing a member of the
***************
*** 6,28 ****
#include <stdio.h>
! 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
--- 6,28 ----
#include <stdio.h>
! 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
*************** struct B
*** 33,63 ****
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;
}
--- 33,63 ----
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;
}