[PATCH 14/18] poison "using"

Ondrej Oprala
2013-10-09T17:18:08Z

From: Tom Tromey <tromey@redhat.com>

* 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 <tromey@redhat.com>

+ * block.c (using_direct) : Renamed from using.
+ * block.h (using_direct) : Likewise.
+
+2013-10-09 Tom Tromey <tromey@redhat.com>
+
* 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