diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2009-03-30 17:31:46 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2009-03-30 17:31:46 +0000 |
| commit | 821a687bb3bfa18eabfc9e717c5c9f480fd9647e (patch) | |
| tree | a6e57b0336a8e766192d6b7b6f59bd62093e8234 /gcc/cp/cp-gimplify.c | |
| parent | e0b05a75af586156d675d122abddbe0d527b0c16 (diff) | |
svn merge -r144476:145289 svn+ssh://gcc.gnu.org/svn/gcc/trunkc-4_5-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/c-4_5-branch@145306 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cp-gimplify.c')
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 838a9d6fa42..bb12988d1fa 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -585,16 +585,13 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) if (block) { tree using_directive; - gcc_assert (TREE_OPERAND (*expr_p,0) - && NAMESPACE_DECL_CHECK (TREE_OPERAND (*expr_p, 0))); + gcc_assert (TREE_OPERAND (*expr_p, 0)); using_directive = make_node (IMPORTED_DECL); TREE_TYPE (using_directive) = void_type_node; IMPORTED_DECL_ASSOCIATED_DECL (using_directive) = TREE_OPERAND (*expr_p, 0); - DECL_NAME (using_directive) - = DECL_NAME (TREE_OPERAND (*expr_p, 0)); TREE_CHAIN (using_directive) = BLOCK_VARS (block); BLOCK_VARS (block) = using_directive; } |