mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2009-05-17 19:48:37 +00:00
parent 8335ff2c79
commit 669bcc0243
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
View file

@ -2120,7 +2120,8 @@ public class CPPTemplates {
/** /**
* Attempts to (partially) resolve an unknown binding with the given arguments. * Attempts to (partially) resolve an unknown binding with the given arguments.
*/ */
private static IBinding resolveUnknown(ICPPUnknownBinding unknown, ICPPTemplateParameterMap tpMap, ICPPClassSpecialization within) throws DOMException { private static IBinding resolveUnknown(ICPPUnknownBinding unknown, ICPPTemplateParameterMap tpMap,
ICPPClassSpecialization within) throws DOMException {
if (unknown instanceof ICPPDeferredClassInstance) { if (unknown instanceof ICPPDeferredClassInstance) {
return resolveDeferredClassInstance((ICPPDeferredClassInstance) unknown, tpMap, within); return resolveDeferredClassInstance((ICPPDeferredClassInstance) unknown, tpMap, within);
} }
@ -2155,7 +2156,8 @@ public class CPPTemplates {
if (s != null) { if (s != null) {
result= CPPSemantics.resolveUnknownName(s, unknown); result= CPPSemantics.resolveUnknownName(s, unknown);
if (unknown instanceof ICPPUnknownClassInstance && result instanceof ICPPTemplateDefinition) { if (unknown instanceof ICPPUnknownClassInstance && result instanceof ICPPTemplateDefinition) {
ICPPTemplateArgument[] newArgs = CPPTemplates.instantiateArguments(((ICPPUnknownClassInstance) unknown).getArguments(), tpMap, within); ICPPTemplateArgument[] newArgs = CPPTemplates.instantiateArguments(
((ICPPUnknownClassInstance) unknown).getArguments(), tpMap, within);
if (result instanceof ICPPClassTemplate) { if (result instanceof ICPPClassTemplate) {
result = instantiate((ICPPClassTemplate) result, newArgs); result = instantiate((ICPPClassTemplate) result, newArgs);
} }
@ -2167,7 +2169,8 @@ public class CPPTemplates {
return result; return result;
} }
private static IBinding resolveDeferredClassInstance(ICPPDeferredClassInstance dci, ICPPTemplateParameterMap tpMap, ICPPClassSpecialization within) { private static IBinding resolveDeferredClassInstance(ICPPDeferredClassInstance dci,
ICPPTemplateParameterMap tpMap, ICPPClassSpecialization within) {
ICPPTemplateArgument[] arguments = dci.getTemplateArguments(); ICPPTemplateArgument[] arguments = dci.getTemplateArguments();
ICPPTemplateArgument[] newArgs = CPPTemplates.instantiateArguments(arguments, tpMap, within); ICPPTemplateArgument[] newArgs = CPPTemplates.instantiateArguments(arguments, tpMap, within);

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java
View file

@ -37,7 +37,8 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP
// Cached values. // Cached values.
ICPPTemplateArgument[] arguments; ICPPTemplateArgument[] arguments;
public PDOMCPPUnknownClassInstance(PDOMLinkage linkage, PDOMNode parent, ICPPUnknownClassInstance classInstance) throws CoreException { public PDOMCPPUnknownClassInstance(PDOMLinkage linkage, PDOMNode parent, ICPPUnknownClassInstance classInstance)
throws CoreException {
super(linkage, parent, classInstance); super(linkage, parent, classInstance);
int rec= PDOMCPPArgumentList.putArguments(this, classInstance.getArguments()); int rec= PDOMCPPArgumentList.putArguments(this, classInstance.getArguments());
@ -105,7 +106,7 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP
final IBinding lhsContainer= getOwner(); final IBinding lhsContainer= getOwner();
final IBinding rhsContainer= rhs.getOwner(); final IBinding rhsContainer= rhs.getOwner();
if (lhsContainer instanceof IType && rhsContainer instanceof IType) { if (lhsContainer instanceof IType && rhsContainer instanceof IType) {
return (((IType)lhsContainer).isSameType((IType) rhsContainer)); return (((IType) lhsContainer).isSameType((IType) rhsContainer));
} }
} catch (DOMException e) { } catch (DOMException e) {
} }