diff options
| author | Caroline Tice <cmtice@google.com> | 2016-02-29 22:49:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-29 22:49:18 +0000 |
| commit | 3a800d7d75ceba88429096186a2150a2d938334a (patch) | |
| tree | 9d9c36a627f01c31b077cd8253acc681d5cc4bbf /gcc-4.9/gcc/cp/decl2.c | |
| parent | b9de1157289455b0ca26daff519d4a0ddcd1fa13 (diff) | |
| parent | 817a788f9eb01eff367191401d48f2aaa8d4f428 (diff) | |
| download | toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.tar.gz toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.tar.bz2 toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.zip | |
Merge "Unify ChromeOS and Android versions of GCC."
Diffstat (limited to 'gcc-4.9/gcc/cp/decl2.c')
| -rw-r--r-- | gcc-4.9/gcc/cp/decl2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/cp/decl2.c b/gcc-4.9/gcc/cp/decl2.c index 074108eea..ff0d30446 100644 --- a/gcc-4.9/gcc/cp/decl2.c +++ b/gcc-4.9/gcc/cp/decl2.c @@ -4178,10 +4178,10 @@ no_linkage_error (tree decl) "to declare function %q#D with linkage", t, decl); } -/* Clear the list of deferred functions. */ +/* Reset the parsing state for the next module. */ void -cp_clear_deferred_fns (void) +cp_reset_parsing_state (void) { vec_free (deferred_fns); deferred_fns = NULL; @@ -4192,6 +4192,7 @@ cp_clear_deferred_fns (void) clear_pending_templates (); reset_anon_name (); reset_temp_count (); + clear_lambda_scope (); } /* Collect declarations from all namespaces relevant to SOURCE_FILE. */ |