Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraradermache2013-06-25 11:00:27 -0400
committeraradermache2013-06-25 11:00:27 -0400
commit642b4963328fa2f0fdb3dd3b3359cbcadd05f8a7 (patch)
treefb4cd0b894ee198a60b6b984b8aec641962c73b0 /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen
parentc72a9a12d2dda0437443540dc4849c7037c266b0 (diff)
downloadorg.eclipse.papyrus-642b4963328fa2f0fdb3dd3b3359cbcadd05f8a7.tar.gz
org.eclipse.papyrus-642b4963328fa2f0fdb3dd3b3359cbcadd05f8a7.tar.xz
org.eclipse.papyrus-642b4963328fa2f0fdb3dd3b3359cbcadd05f8a7.zip
- Cleanup - removed "System.err.println" and moved images into "figs" sub-folders
- Some preparation for "C" language support
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdfbin21816 -> 0 bytes
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java6
3 files changed, 4 insertions, 4 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdf b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdf
deleted file mode 100644
index 64fee47b4f1..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/Architecture3+paper.win.pdf
+++ /dev/null
Binary files differ
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
index 5c7d14b36ab..7227283ec0f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
@@ -17,7 +17,7 @@
[template public CppAttributeDeclaration(attribute : Property)]
[CppElementDoc()/]
-[staticValue()/][modConst()/][attribute.type.qualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];
+[staticValue()/][modConst()/][attribute.type.qualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][if (hasStereotype(C_Cpp::Const))][defaultValue()/][/if];
[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
index 0120620a565..fdcbda4e65c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
@@ -109,16 +109,16 @@ public class Modifier {
if(propertyOperationOrParameter instanceof Parameter) {
ParameterDirectionKind directionKind = ((Parameter)propertyOperationOrParameter).getDirection();
if(directionKind == ParameterDirectionKind.IN_LITERAL) {
- ptr += " _IN_"; //$NON-NLS-1$
+ ptr += " /*in*/"; //$NON-NLS-1$
}
else if(directionKind == ParameterDirectionKind.OUT_LITERAL) {
- ptr += " _OUT_"; //$NON-NLS-1$
+ ptr += " /*out*/"; //$NON-NLS-1$
if(!ptrOrRef) {
ptr += CppCodeGenUtils.getOutInoutOp();
}
}
else if(directionKind == ParameterDirectionKind.INOUT_LITERAL) {
- ptr += " _INOUT_"; //$NON-NLS-1$
+ ptr += " /*inout*/"; //$NON-NLS-1$
if(!ptrOrRef) {
ptr += CppCodeGenUtils.getOutInoutOp();
}

Back to the top