### Eclipse Workspace Patch 1.0 #P org.eclipse.cdt.core Index: parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java =================================================================== RCS file: /n/cdt/deedee_40/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java,v retrieving revision 1.1 diff -u -r1.1 CPPASTQualifiedName.java --- parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java 14 May 2007 15:08:40 -0000 1.1 +++ parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java 10 Jan 2008 21:18:15 -0000 @@ -23,6 +23,7 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IEnumerator; +import org.eclipse.cdt.core.dom.ast.IEnumeration; import org.eclipse.cdt.core.dom.ast.IField; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTOperatorName; @@ -355,7 +356,7 @@ } else if (bindings[i] instanceof ICPPClassType) { ICPPClassType type = (ICPPClassType) bindings[i]; if (type.isSameType(classType)) continue; - } else if (!(bindings[i] instanceof IEnumerator) || isDeclaration) { + } else if (!(bindings[i] instanceof IEnumerator || bindings[i] instanceof IEnumeration) || isDeclaration) { continue; } #P org.eclipse.cdt.ui.tests Index: ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java =================================================================== RCS file: /n/cdt/deedee_40/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java,v retrieving revision 1.5 diff -u -r1.5 CompletionTests.java --- ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java 27 Nov 2007 11:05:26 -0000 1.5 +++ ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java 10 Jan 2008 21:18:15 -0000 @@ -889,4 +889,14 @@ final String[] expected= new String[0]; assertCompletionResults(fCursorOffset, expected, AbstractContentAssistTest.COMPARE_REP_STRINGS); } + + // void test() { + // C1::/*cursor*/ + public void testEnumInClass_bug199598() throws Exception { + // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=199598 + final String[] expected= { + "E2", "e21", "e22" + }; + assertCompletionResults(fCursorOffset, expected, AbstractContentAssistTest.COMPARE_ID_STRINGS); + } }