### Eclipse Workspace Patch 1.0
#P org.eclipse.cdt.core
Index: parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java,v
retrieving revision 1.70
diff -u -r1.70 BaseScanner.java
--- parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java	15 Nov 2006 16:15:07 -0000	1.70
+++ parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java	25 Jan 2007 19:00:12 -0000
@@ -2036,7 +2036,7 @@
         }
 
         // We've run out of contexts, our work is done here
-        return contentAssistMode ? eocToken : null;
+        return contentAssistMode ? new SimpleToken(IToken.tCOMPLETION, Integer.MAX_VALUE, null, Integer.MAX_VALUE) : null;
     }
     
     protected CharTable ident = new CharTable(1024);
Index: parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java,v
retrieving revision 1.113
diff -u -r1.113 GNUCPPSourceParser.java
--- parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java	3 Jan 2007 12:01:54 -0000	1.113
+++ parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java	25 Jan 2007 19:00:12 -0000
@@ -4471,6 +4471,7 @@
                 break;
             case IToken.tCOLONCOLON:
             case IToken.tIDENTIFIER:
+            case IToken.tCOMPLETION:
                 // to get templates right we need to use the class as the scope
                 ITokenDuple d = name();
                 name = createName(d);
@@ -4506,6 +4507,7 @@
 
                 continue baseSpecifierLoop;
             case IToken.tLBRACE:
+            case IToken.tEOC:
                 if (name == null)
                     name = createName();
                 baseSpec = createBaseSpecifier();