From 6d063588c2f6bdc80def015d9da89d992a95153b Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Tue, 1 Feb 2005 15:17:05 +0000
Subject: [PATCH] Fixed Bug 84095  - [ICASTCompositeTypeSpecifier] has boxes in
 its specifier string representation

---
 .../core/dom/parser/c/CASTCompositeTypeSpecifier.java      | 7 +++++++
 .../core/dom/parser/c/CASTEnumerationSpecifier.java        | 7 +++++++
 .../core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java  | 7 +++++++
 .../core/dom/parser/cpp/CPPASTEnumerationSpecifier.java    | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java
index 98b68fc4b97..6726ec65ee8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java
@@ -111,4 +111,11 @@ public class CASTCompositeTypeSpecifier extends CASTBaseDeclSpecifier implements
         return scope;
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature()
+     */
+    public String getUnpreprocessedSignature() {
+       return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$
+    }
+
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java
index b202807cde9..c61b66788d7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java
@@ -80,4 +80,11 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier implements
         return name;
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature()
+     */
+    public String getUnpreprocessedSignature() {
+       return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$
+    }
+
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java
index 2153db88bfb..b6f5bc49c40 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java
@@ -25,6 +25,13 @@ public class CPPASTCompositeTypeSpecifier extends CPPASTBaseDeclSpecifier
     private IASTName n;
     private IScope scope;
 
+    /* (non-Javadoc)
+     * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature()
+     */
+    public String getUnpreprocessedSignature() {
+       return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$
+    }
+
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier#getBaseSpecifiers()
      */
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
index 1da5dda1a28..2a17e609bfe 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
@@ -81,5 +81,12 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
     public IASTName getName() {
         return name;
     }
+    
+    /* (non-Javadoc)
+    * @see org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier#getUnpreprocessedSignature()
+    */
+   public String getUnpreprocessedSignature() {
+      return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$
+   }
 
 }