Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuai Li2015-10-22 16:20:19 +0000
committerGerrit Code Review @ Eclipse.org2015-10-23 07:50:40 +0000
commit58b3a51cb2ee3795401772e9364c298cfceb0058 (patch)
treedb95150ff61cd361d6390d1ef99f7cfc9982e439
parent49bddfa3b6ee9106c9f796f43d9b435323a9379f (diff)
downloadorg.eclipse.papyrus-58b3a51cb2ee3795401772e9364c298cfceb0058.tar.gz
org.eclipse.papyrus-58b3a51cb2ee3795401772e9364c298cfceb0058.tar.xz
org.eclipse.papyrus-58b3a51cb2ee3795401772e9364c298cfceb0058.zip
Bug 478818 - [C++ codegen] Inner classifier generation
- Fix regression: package header generator no longer generates classes and datatypes owned by the package Signed-off-by: Shuai Li <shuai.li@cea.fr>
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
index f86b4b8f490..65b23596901 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/xtend/CppClassTypeAndEnum.xtend
@@ -58,7 +58,7 @@ class CppClassTypeAndEnum {
return CppEnumerations.CppEnumerationDefinition(element as Enumeration)
} else if (element instanceof PrimitiveType) {
return CppPrimitiveTypes.CppPrimitiveTypeDefinition(element as PrimitiveType)
- } else if (element instanceof DataType || element.eClass.equals(UMLFactory.eINSTANCE.getUMLPackage().getClass_())) {
+ } else if ((element instanceof DataType || element.eClass.equals(UMLFactory.eINSTANCE.getUMLPackage().getClass_())) && !(element.owner instanceof Package)) {
if (GenUtils.isTemplateBoundElement(element as Classifier)) {
return CppInnerClassifiers.CppInnerBindDefinition(element as Classifier)
} else {

Back to the top