aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Carlton <carlton@bactrian.org>2003-06-13 00:55:43 +0000
committerDavid Carlton <carlton@bactrian.org>2003-06-13 00:55:43 +0000
commit0fc9922abc6ac20739319e0ec1ca03eafa0ebb94 (patch)
tree60e8b01ac03eced23233300e2c7926cb7a09ae53
parentf470a70ae30593ba8615df9ce60110abf04c6341 (diff)
downloadgdb-0fc9922abc6ac20739319e0ec1ca03eafa0ebb94.zip
gdb-0fc9922abc6ac20739319e0ec1ca03eafa0ebb94.tar.gz
gdb-0fc9922abc6ac20739319e0ec1ca03eafa0ebb94.tar.bz2
2003-06-12 David Carlton <carlton@kealia.com>
* cp-namespace.c (cp_set_block_scope): Comment out processing_has_namespace_info branch.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/cp-namespace.c10
2 files changed, 15 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 613b6d2..4df86e1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-12 David Carlton <carlton@kealia.com>
+
+ * cp-namespace.c (cp_set_block_scope): Comment out
+ processing_has_namespace_info branch.
+
2003-06-12 Jim Blandy <jimb@redhat.com>
Recognize and skip 64-bit PowerPC Linux linkage functions.
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index a4c7b8d..db0839f 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -38,6 +38,9 @@ unsigned char processing_has_namespace_info;
contain the name of the current namespace. The string is
temporary; copy it if you need it. */
+/* FIXME: carlton/2003-06-12: This isn't entirely reliable: currently,
+ we get mislead by DW_AT_specification. */
+
const char *processing_current_namespace;
/* List of using directives that are active in the current file. */
@@ -187,6 +190,12 @@ cp_set_block_scope (const struct symbol *symbol,
if (SYMBOL_CPLUS_DEMANGLED_NAME (symbol) != NULL)
{
+#if 0
+ /* FIXME: carlton/2003-06-12: As mentioned above,
+ 'processing_has_namespace_info' currently isn't entirely
+ reliable, so let's always use demangled names to get this
+ information for now. */
+
if (processing_has_namespace_info)
{
block_set_scope
@@ -196,6 +205,7 @@ cp_set_block_scope (const struct symbol *symbol,
obstack);
}
else
+#endif
{
/* Try to figure out the appropriate namespace from the
demangled name. */