2003-06-12 David Carlton <carlton@kealia.com>

	* cp-namespace.c (cp_set_block_scope): Comment out
	processing_has_namespace_info branch.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 613b6d2..4df86e1 100644 (file)
--- 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.
 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 (file)
--- 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.  */
 
    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.  */
 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 (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
       if (processing_has_namespace_info)
        {
          block_set_scope


@@ -196,6 +205,7 @@ cp_set_block_scope (const struct symbol *symbol,
             obstack);
        }
       else
             obstack);
        }
       else

+#endif

        {
          /* Try to figure out the appropriate namespace from the
             demangled name.  */
        {
          /* Try to figure out the appropriate namespace from the
             demangled name.  */