From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16559 invoked by alias); 9 Oct 2013 17:18:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 16509 invoked by uid 89); 9 Oct 2013 17:18:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Oct 2013 17:18:07 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r99HI5Yx017106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Oct 2013 13:18:06 -0400 Received: from redhat.brq.redhat.com (unused-4-133.brq.redhat.com [10.34.4.133]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r99HHgcK010424; Wed, 9 Oct 2013 13:18:04 -0400 From: Ondrej Oprala To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 14/18] poison "using" Date: Wed, 09 Oct 2013 17:18:00 -0000 Message-Id: <1381339053-14519-15-git-send-email-ooprala@redhat.com> In-Reply-To: <1381339053-14519-1-git-send-email-ooprala@redhat.com> References: <1381339053-14519-1-git-send-email-ooprala@redhat.com> X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00304.txt.bz2 From: Tom Tromey * block.c (using_direct) : Renamed from using. * block.h (using_direct) : Likewise. --- gdb/ChangeLog | 5 +++++ gdb/block.c | 14 +++++++------- gdb/block.h | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 43e9cc5..fab9b6a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -17,6 +17,11 @@ 2013-10-09 Tom Tromey + * block.c (using_direct) : Renamed from using. + * block.h (using_direct) : Likewise. + +2013-10-09 Tom Tromey + * ada-lang.c (type_name) : Renamed from typename. * break-catch-throw.c (type_name) : Likewise. * cp-valprint.c (type_name) : Likewise. diff --git a/gdb/block.c b/gdb/block.c index 643e144..7d1700e 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -34,7 +34,7 @@ struct block_namespace_info { const char *scope; - struct using_direct *using; + struct using_direct *using_direct; }; static void block_initialize_namespace (struct block *block, @@ -300,21 +300,21 @@ block_using (const struct block *block) if (block == NULL || BLOCK_NAMESPACE (block) == NULL) return NULL; else - return BLOCK_NAMESPACE (block)->using; + return BLOCK_NAMESPACE (block)->using_direct; } -/* Set BLOCK's using member to USING; if needed, allocate memory via - OBSTACK. (It won't make a copy of USING, however, so that already +/* Set BLOCK's using member to USING_DIRECT; if needed, allocate memory via + OBSTACK. (It won't make a copy of USING_DIRECT, however, so that already has to be allocated correctly.) */ void block_set_using (struct block *block, - struct using_direct *using, + struct using_direct *using_direct, struct obstack *obstack) { block_initialize_namespace (block, obstack); - BLOCK_NAMESPACE (block)->using = using; + BLOCK_NAMESPACE (block)->using_direct = using_direct; } /* If BLOCK_NAMESPACE (block) is NULL, allocate it via OBSTACK and @@ -328,7 +328,7 @@ block_initialize_namespace (struct block *block, struct obstack *obstack) BLOCK_NAMESPACE (block) = obstack_alloc (obstack, sizeof (struct block_namespace_info)); BLOCK_NAMESPACE (block)->scope = NULL; - BLOCK_NAMESPACE (block)->using = NULL; + BLOCK_NAMESPACE (block)->using_direct = NULL; } } diff --git a/gdb/block.h b/gdb/block.h index 6563b42..d321f2c 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -170,7 +170,7 @@ extern void block_set_scope (struct block *block, const char *scope, extern struct using_direct *block_using (const struct block *block); extern void block_set_using (struct block *block, - struct using_direct *using, + struct using_direct *using_dir, struct obstack *obstack); extern const struct block *block_static_block (const struct block *block); -- 1.8.3.1