diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0a8d76da..f557fe2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2003-05-05 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + * decl.c: Fix typos. + +2003-05-05 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + PR c++/4494 * decl.c (start_function): Use same_type_p to check return type of main. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 34f82bd..225f415 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1392,7 +1392,7 @@ poplevel (int keep, int reverse, int functionbody) there only for backward compatibility. */ DECL_DEAD_FOR_LOCAL (link) = 1; - /* Keep track of what should of have happenned when we + /* Keep track of what should of have happened when we popped the binding. */ if (outer_binding && BINDING_VALUE (outer_binding)) DECL_SHADOWED_FOR_VAR (link) @@ -2950,7 +2950,7 @@ duplicate_decls (tree newdecl, tree olddecl) SET_DECL_RTL (olddecl, DECL_RTL (newdecl)); } /* Even if the types match, prefer the new declarations type - for anitipated built-ins, for exception lists, etc... */ + for anticipated built-ins, for exception lists, etc... */ else if (DECL_ANTICIPATED (olddecl)) TREE_TYPE (olddecl) = TREE_TYPE (newdecl); @@ -3242,7 +3242,7 @@ duplicate_decls (tree newdecl, tree olddecl) && TYPE_LANG_SPECIFIC (newtype) && TYPE_LANG_SPECIFIC (oldtype)) CLASSTYPE_FRIEND_CLASSES (newtype) = CLASSTYPE_FRIEND_CLASSES (oldtype); -\ + DECL_ORIGINAL_TYPE (newdecl) = DECL_ORIGINAL_TYPE (olddecl); } |