From fcccfe38075ff25a6335d487c837228a85a1f9ff Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Fri, 25 Apr 2014 17:03:58 -0700 Subject: [PATCH] Corrected few comments. --- .../internal/index/tests/IndexCPPBindingResolutionTest.java | 6 +++--- .../cdt/internal/core/dom/parser/cpp/CPPClassScope.java | 2 +- .../core/dom/parser/cpp/CPPInheritedConstructor.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java index 4c6631da5da..6b3d2c3cabf 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPBindingResolutionTest.java @@ -1773,7 +1773,7 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti // int test() { // foo(1); // } - public void testInheritingConstructor() throws Exception { + public void testInheritedConstructor() throws Exception { checkBindings(); } @@ -1791,7 +1791,7 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti // int test() { // foo(1); // } - public void testInheritingConstructorWithTemplate_1() throws Exception { + public void testInheritedConstructorFromTemplateInstance() throws Exception { checkBindings(); } @@ -1809,7 +1809,7 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti // int test() { // foo(1); // } - public void testInheritingConstructorWithTemplate_2() throws Exception { + public void testInheritedConstructorFromUnknownClass() throws Exception { checkBindings(); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java index 420f64606c3..432cfadf841 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java @@ -198,7 +198,7 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope { ICPPConstructor[] ctors = ClassTypeHelper.getConstructors((ICPPClassType) baseClass, point); for (ICPPConstructor ctor : ctors) { ICPPParameter[] prototypeParams = ctor.getParameters(); - // 19.9-1 For each non-template constructor of X that has at least one parameter + // 12.9-1 For each non-template constructor of X that has at least one parameter // with a default argument, the set of constructors that results from omitting // any ellipsis parameter specification and successively omitting parameters // with a default argument from the end of the parameter-type-list. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInheritedConstructor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInheritedConstructor.java index 76a188ed663..0eff5f79f34 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInheritedConstructor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInheritedConstructor.java @@ -21,8 +21,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPParameter; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; /** - * Binding for implicit constructors (default and copy constructor). - * 12.9 + * Binding for a constructor inherited from a base class (12.9). */ public class CPPInheritedConstructor extends CPPImplicitMethod implements ICPPConstructor { private final ICPPConstructor prototype;