From 9874cfefe5f6d56234b28cadd7cb2d178b8b8363 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 12 Jun 2007 14:42:27 +0000 Subject: [PATCH] Fix for 192164, PDOMNotImplementedError in template instantiation. --- .../core/pdom/dom/cpp/PDOMCPPClassTemplate.java | 2 +- .../pdom/dom/cpp/PDOMCPPTypedefSpecialization.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplate.java index bf151a03911..92a5b261d98 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplate.java @@ -401,7 +401,7 @@ class PDOMCPPClassTemplate extends PDOMCPPClassType if(p instanceof IType && op instanceof IType) { same &= (((IType)p).isSameType((IType)op)); } else { - fail(); + return false; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java index 1c4200790fb..0829e3c4d56 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java @@ -7,6 +7,7 @@ * * Contributors: * QNX - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; @@ -17,6 +18,7 @@ import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization; import org.eclipse.cdt.internal.core.Util; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; +import org.eclipse.cdt.internal.core.index.CPPTypedefClone; import org.eclipse.cdt.internal.core.index.IIndexType; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; @@ -100,12 +102,6 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization * @see java.lang.Object#clone() */ public Object clone() { - IType t = null; - try { - t = (IType) super.clone(); - } catch ( CloneNotSupportedException e ) { - //not going to happen - } - return t; + return new CPPTypedefClone(this); } }