diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/bitfld-4.c | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb028f6..569d19a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2002-08-10 Nathan Sidwell <nathan@codesourcery.com> + + * tree.c (maybe_dummy_object): Replace // with /* */ + 2002-08-09 Mark Mitchell <mark@codesourcery.com> * call.c (standard_conversion): Use build_ptrmem_type. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index ef87076..ac1d3d1 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1856,8 +1856,9 @@ maybe_dummy_object (type, binfop) *binfop = binfo; if (current_class_ref && context == current_class_type - // Kludge: Make sure that current_class_type is actually correct. - // It might not be if we're in the middle of tsubst_default_argument. + /* Kludge: Make sure that current_class_type is actually + correct. It might not be if we're in the middle of + tsubst_default_argument. */ && same_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (current_class_ref)), current_class_type)) decl = current_class_ref; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c1bd99b..267062e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2002-08-10 Nathan Sidwell <nathan@codesourcery.com> + + * gcc.dg/bitfld-4.c: Add blank options. + 2002-08-09 Mark Mitchell <mark@codesourcery.com> * g++.dg/template/crash1.C: New test. @@ -12,7 +16,7 @@ 2002-08-08 Nathan Sidwell <nathan@codesourcery.com> - * g++.dg/abi/bitfield4.c: New test. + * g++.dg/abi/bitfield4.C: New test. * gcc.dg/bitfld-4.c: New test. 2002-08-08 Nathan Sidwell <nathan@codesourcery.com> diff --git a/gcc/testsuite/gcc.dg/bitfld-4.c b/gcc/testsuite/gcc.dg/bitfld-4.c index 1470993..9df7f2f 100644 --- a/gcc/testsuite/gcc.dg/bitfld-4.c +++ b/gcc/testsuite/gcc.dg/bitfld-4.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-options "" } */ /* Check bitfields and non-bitfields are aligned & sized similarly. |