diff options
| author | Bernd Schmidt <bernd.schmidt@analog.com> | 2006-02-06 16:36:35 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernd.schmidt@analog.com> | 2006-02-06 16:36:35 +0000 |
| commit | b3d13cd7ae392041004db6b9bf5098372048c00e (patch) | |
| tree | 2adf45987dc9f88c26eeb95b0071647ebb5c87ec /gcc/cp/ChangeLog-1994 | |
| parent | 337db89251de80f8ff7a00b2d71bc333c630b6e4 (diff) | |
Merge reload-branch up to revision 101000reload-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/reload-branch@110651 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/ChangeLog-1994')
| -rw-r--r-- | gcc/cp/ChangeLog-1994 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog-1994 b/gcc/cp/ChangeLog-1994 index 1ec125fa86d..24d635df7d3 100644 --- a/gcc/cp/ChangeLog-1994 +++ b/gcc/cp/ChangeLog-1994 @@ -805,7 +805,7 @@ Sat Oct 1 15:18:49 1994 Jason Merrill <jason@phydeaux.cygnus.com> push_c_function_context. (pop_cp_function_context): Similarly. (finish_function): Reverse order of poplevel and pop_nested_class so - that current_class_decl is restored properly. + that current_class_decl is restored properly. (start_function): Likewise. (finish_function): Add parameter 'nested'. Don't call permanent_allocation if (nested). |