* cplus-dem.c (do_type): Handle pointer to member types whose

	enclosing classes have namespace scope.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29901 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 14 insertions, 1 deletions

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index ef6c5111dc4..6a6bc1afa9a 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -3072,7 +3072,12 @@ do_type (work, mangled, result)
 	    (*mangled)++;
 
 	    string_append (&decl, ")");
-	    string_prepend (&decl, SCOPE_STRING (work));
+
+	    /* We don't need to prepend `::' for a qualified name;
+	       demangle_qualified will do that for us.  */
+	    if (**mangled != 'Q')
+	      string_prepend (&decl, SCOPE_STRING (work));
+
 	    if (isdigit ((unsigned char)**mangled))
 	      {
 		n = consume_count (mangled);
@@ -3105,6 +3110,14 @@ do_type (work, mangled, result)
 		else
 		  break;
 	      }
+	    else if (**mangled == 'Q')
+	      {
+		success = demangle_qualified (work, mangled, &decl,
+					      /*isfuncnam=*/0, 
+					      /*append=*/0);
+		if (!success)
+		  break;
+	      }
 	    else
 	      {
 		success = 0;