diff options
| author | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
| commit | 61c0330cc243abf13fdd01f377a7f80bd3989eb1 (patch) | |
| tree | 119b08ae76294f23e2b1b7e72ff9a06afa9e8509 /gcc-4.8/gcc/cp/name-lookup.c | |
| parent | 1c712bf7621f3859c33fd3afaa61fdcaf3fdfd76 (diff) | |
| download | toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.gz toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.bz2 toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.zip | |
[4.8] Merge GCC 4.8.2
Change-Id: I0f1fcf69c5076d8534c5c45562745e1a37adb197
Diffstat (limited to 'gcc-4.8/gcc/cp/name-lookup.c')
| -rw-r--r-- | gcc-4.8/gcc/cp/name-lookup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc-4.8/gcc/cp/name-lookup.c b/gcc-4.8/gcc/cp/name-lookup.c index 2a47331ea..c121a4163 100644 --- a/gcc-4.8/gcc/cp/name-lookup.c +++ b/gcc-4.8/gcc/cp/name-lookup.c @@ -3015,8 +3015,10 @@ push_class_level_binding_1 (tree name, tree x) if (name == error_mark_node) return false; - /* Check for invalid member names. */ - gcc_assert (TYPE_BEING_DEFINED (current_class_type)); + /* Check for invalid member names. But don't worry about a default + argument-scope lambda being pushed after the class is complete. */ + gcc_assert (TYPE_BEING_DEFINED (current_class_type) + || LAMBDA_TYPE_P (TREE_TYPE (decl))); /* Check that we're pushing into the right binding level. */ gcc_assert (current_class_type == class_binding_level->this_entity); |