diff options
Diffstat (limited to 'libcc1')
| -rw-r--r-- | libcc1/ChangeLog | 5 | ||||
| -rw-r--r-- | libcc1/libcp1plugin.cc | 14 |
2 files changed, 7 insertions, 12 deletions
diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog index 1969873a1fd..f22ea27c9c3 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,8 @@ +2017-05-25 Nathan Sidwell <nathan@acm.org> + + * libcp1plugin.cc (plugin_make_namespace_inline): Check and set + DECL_NAMESPACE_INLINE_P. + 2017-05-23 Nathan Sidwell <nathan@acm.org> * libcp1plugin.cc (plugin_add_using_decl): Call diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 7db74c737a0..43781adce54 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -930,20 +930,10 @@ plugin_make_namespace_inline (cc1_plugin::connection *) tree parent_ns = CP_DECL_CONTEXT (inline_ns); - if (purpose_member (DECL_NAMESPACE_ASSOCIATIONS (inline_ns), - parent_ns)) + if (DECL_NAMESPACE_INLINE_P (inline_ns)) return 0; - pop_namespace (); - - gcc_assert (current_namespace == parent_ns); - - DECL_NAMESPACE_ASSOCIATIONS (inline_ns) - = tree_cons (parent_ns, 0, - DECL_NAMESPACE_ASSOCIATIONS (inline_ns)); - do_using_directive (inline_ns); - - push_namespace (DECL_NAME (inline_ns)); + DECL_NAMESPACE_INLINE_P (inline_ns) = true; return 1; } |