Bug 506468: [codegen] #define to refer to protocolmessage parameters
should be shorter
Removed the prefix.
Change-Id: I77990b5f7e8a726b06589538276cc23eb438f32e
Signed-off-by: Ernesto Posse <eposse@gmail.com>
diff --git a/models/samples/ComputerSystem/ComputerSystem.uml b/models/samples/ComputerSystem/ComputerSystem.uml
index faf25e19..b988b8d 100644
--- a/models/samples/ComputerSystem/ComputerSystem.uml
+++ b/models/samples/ComputerSystem/ComputerSystem.uml
@@ -1336,7 +1336,7 @@
std::cout << "[" << this->getName() << "] Printing Start ==========" << std::endl;
printingData = true;
}
- std::cout << (char *) umlrtparam_data;
+ std::cout << (char *) data;
usbPort.status(100).send();
</body>
</effect>
diff --git a/models/samples/ComputerSystem/expected_src/CMakeLists.txt b/models/samples/ComputerSystem/expected_src/CMakeLists.txt
index 973ecb0..449ed17 100644
--- a/models/samples/ComputerSystem/expected_src/CMakeLists.txt
+++ b/models/samples/ComputerSystem/expected_src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Generated 2016-09-29 13:04:32
+# Generated 2016-11-14 16:21:28
cmake_minimum_required(VERSION 2.8.7)
set(TARGET TopMain)
diff --git a/models/samples/ComputerSystem/expected_src/Computer.cc b/models/samples/ComputerSystem/expected_src/Computer.cc
index 96a0674..1e886e9 100644
--- a/models/samples/ComputerSystem/expected_src/Computer.cc
+++ b/models/samples/ComputerSystem/expected_src/Computer.cc
@@ -198,7 +198,7 @@
void Capsule_Computer::entryaction_____InitUSBBus__WaitForStorage( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Computer::Computer::InitUSBBus::WaitForStorage entry */
time_t currentTime;
@@ -228,7 +228,7 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_Computer::entryaction_____InitUSBBus__boundary( const UMLRTMessage * msg )
@@ -276,12 +276,12 @@
void Capsule_Computer::exitaction_____InitUSBBus__WaitForPrinter( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Computer::Computer::InitUSBBus::WaitForPrinter exit */
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_Computer::exitaction_____InitUSBBus__WaitForStorage( const UMLRTMessage * msg )
@@ -322,7 +322,7 @@
void Capsule_Computer::transitionaction_____InitUSBBus__onPrintResourceID( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Computer::Computer::InitUSBBus transition InitUSBBus::WaitForPrinter,InitUSBBus::WaitForStorage,resourceID:resMgr */
time_t currentTime;
@@ -348,12 +348,12 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_Computer::transitionaction_____InitUSBBus__onStorageResourceID( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Computer::Computer::InitUSBBus transition InitUSBBus::WaitForStorage,InitUSBBus::EX_initUSB,resourceID:resMgr */
time_t currentTime;
@@ -379,7 +379,7 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_Computer::transitionaction_____InitUSBBus__onStorageTimeout( const UMLRTMessage * msg )
diff --git a/models/samples/ComputerSystem/expected_src/ExtMassStorage.cc b/models/samples/ComputerSystem/expected_src/ExtMassStorage.cc
index a7e4679..581656c 100644
--- a/models/samples/ComputerSystem/expected_src/ExtMassStorage.cc
+++ b/models/samples/ComputerSystem/expected_src/ExtMassStorage.cc
@@ -192,7 +192,7 @@
void Capsule_ExtMassStorage::transitionaction_____onData( const UMLRTMessage * msg )
{
- #define umlrtparam_data ( *(const void * *)msg->getParam( 0 ) )
+ #define data ( *(const void * *)msg->getParam( 0 ) )
#define rtdata ( (void *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Hardware::ExternalDevices::ExtMassStorage transition Connected,Connected,data:usbPort */
/**
@@ -222,7 +222,7 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_data
+ #undef data
}
void Capsule_ExtMassStorage::transitionaction_____onEOD( const UMLRTMessage * msg )
diff --git a/models/samples/ComputerSystem/expected_src/LocalPrinter.cc b/models/samples/ComputerSystem/expected_src/LocalPrinter.cc
index 349c127..132e9f3 100644
--- a/models/samples/ComputerSystem/expected_src/LocalPrinter.cc
+++ b/models/samples/ComputerSystem/expected_src/LocalPrinter.cc
@@ -109,12 +109,12 @@
void Capsule_LocalPrinter::exitaction_____Connected( const UMLRTMessage * msg )
{
- #define umlrtparam_data ( *(const void * *)msg->getParam( 0 ) )
+ #define data ( *(const void * *)msg->getParam( 0 ) )
#define rtdata ( (void *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Hardware::ExternalDevices::LocalPrinter::Connected exit */
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_data
+ #undef data
}
void Capsule_LocalPrinter::exitaction_____Disconnected( const UMLRTMessage * msg )
@@ -184,7 +184,7 @@
void Capsule_LocalPrinter::transitionaction_____onData( const UMLRTMessage * msg )
{
- #define umlrtparam_data ( *(const void * *)msg->getParam( 0 ) )
+ #define data ( *(const void * *)msg->getParam( 0 ) )
#define rtdata ( (void *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Hardware::ExternalDevices::LocalPrinter transition Connected,Connected,data:usbPort */
/**
@@ -199,11 +199,11 @@
std::cout << "[" << this->getName() << "] Printing Start ==========" << std::endl;
printingData = true;
}
- std::cout << (char *) umlrtparam_data;
+ std::cout << (char *) data;
usbPort.status(100).send();
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_data
+ #undef data
}
void Capsule_LocalPrinter::transitionaction_____onEOD( const UMLRTMessage * msg )
diff --git a/models/samples/ComputerSystem/expected_src/WordProcessorApp.cc b/models/samples/ComputerSystem/expected_src/WordProcessorApp.cc
index f9d2c2e..fef77cb 100644
--- a/models/samples/ComputerSystem/expected_src/WordProcessorApp.cc
+++ b/models/samples/ComputerSystem/expected_src/WordProcessorApp.cc
@@ -240,12 +240,12 @@
void Capsule_WordProcessorApp::exitaction_____Printing__Printing( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing::Printing exit */
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
void Capsule_WordProcessorApp::exitaction_____Printing__boundary( const UMLRTMessage * msg )
@@ -256,22 +256,22 @@
void Capsule_WordProcessorApp::exitaction_____Printing__waitForPrinter( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing::waitForPrinter exit */
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_WordProcessorApp::exitaction_____Saving__Saving( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving::Saving exit */
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
void Capsule_WordProcessorApp::exitaction_____Saving__WaitForStorage( const UMLRTMessage * msg )
@@ -290,14 +290,14 @@
void Capsule_WordProcessorApp::exitaction_____WaitingForCommand( const UMLRTMessage * msg )
{
- #define umlrtparam_fileName ( *(const char * *)msg->getParam( 0 ) )
- #define umlrtparam_data ( *(const void * *)msg->getParam( 1 ) )
+ #define fileName ( *(const char * *)msg->getParam( 0 ) )
+ #define data ( *(const void * *)msg->getParam( 1 ) )
#define rtdata ( (char *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::WaitingForCommand exit */
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_data
- #undef umlrtparam_fileName
+ #undef data
+ #undef fileName
}
void Capsule_WordProcessorApp::transitionaction_____Initial( const UMLRTMessage * msg )
@@ -384,7 +384,7 @@
void Capsule_WordProcessorApp::transitionaction_____Printing__onPrintResource( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing transition Printing::waitForPrinter,Printing::importOK,resourceID:resourcePort */
time_t currentTime;
@@ -403,18 +403,18 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_WordProcessorApp::transitionaction_____Printing__onPrintStatus( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing transition Printing::Printing,Printing::Choice1,status:usbPort */
progress = (int) *rtdata;
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
void Capsule_WordProcessorApp::transitionaction_____Printing__onResNotAvail( const UMLRTMessage * msg )
@@ -433,7 +433,7 @@
void Capsule_WordProcessorApp::transitionaction_____Printing__printCompleted( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing transition Printing::Choice1,Printing::ExitPoint2,status:usbPort */
time_t currentTime;
@@ -450,7 +450,7 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
void Capsule_WordProcessorApp::transitionaction_____Printing__printPrintProgress( const UMLRTMessage * msg )
@@ -549,18 +549,18 @@
void Capsule_WordProcessorApp::transitionaction_____Saving__onSaveStatus( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving transition Saving::Saving,Saving::Choice1,status:usbPort */
progress = (int) *rtdata;
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
void Capsule_WordProcessorApp::transitionaction_____Saving__onStorageResource( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving transition Saving::WaitForStorage,Saving::importOK,resourceID:resourcePort */
time_t currentTime;
@@ -578,7 +578,7 @@
}
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
void Capsule_WordProcessorApp::transitionaction_____Saving__printSaveProgress( const UMLRTMessage * msg )
@@ -631,8 +631,8 @@
void Capsule_WordProcessorApp::transitionaction_____onCreateDoc( const UMLRTMessage * msg )
{
- #define umlrtparam_fileName ( *(const char * *)msg->getParam( 0 ) )
- #define umlrtparam_data ( *(const void * *)msg->getParam( 1 ) )
+ #define fileName ( *(const char * *)msg->getParam( 0 ) )
+ #define data ( *(const void * *)msg->getParam( 1 ) )
#define rtdata ( (char *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp transition WaitingForCommand,WaitingForCommand,createDocument:UserControlePort */
time_t currentTime;
@@ -643,8 +643,8 @@
std::cout << "[" << this->getName() << "] document created with provided string." << std::endl;
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_data
- #undef umlrtparam_fileName
+ #undef data
+ #undef fileName
}
void Capsule_WordProcessorApp::transitionaction_____onPrintDocument( const UMLRTMessage * msg )
@@ -715,134 +715,134 @@
bool Capsule_WordProcessorApp::action_____Printing__TransitionAction8__statusNOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing guard Printing::printOK,Printing::ExitPoint1 */
return( ! status );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Printing__TransitionAction9__statusOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing guard Printing::printOK,Printing::Printing */
return( status );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Printing__importNOK__importNOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing guard Printing::importOK,Printing::ExitPoint1 */
return( ! importOK );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Printing__importOK__null( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing guard Printing::importOK,Printing::printOK */
return( importOK );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Printing__printCompleted__progress_GTE_100( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing guard Printing::Choice1,Printing::ExitPoint2,status:usbPort */
return( progress >= 100);
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
bool Capsule_WordProcessorApp::action_____Printing__printPrintProgress__Progress_LT_100( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Printing guard Printing::Choice1,Printing::Printing */
return( progress < 100);
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
bool Capsule_WordProcessorApp::action_____Saving__importNOK__importNOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving guard Saving::importOK,Saving::ExitPoint1 */
return( ! importOK );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Saving__importOK__importOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving guard Saving::importOK,Saving::saveOK */
return( importOK );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Saving__isNOK__statusNOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving guard Saving::saveOK,Saving::ExitPoint1 */
return ( ! status );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Saving__isOK__isOK( const UMLRTMessage * msg )
{
- #define umlrtparam_resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
+ #define resourceID ( *(const UMLRTCapsuleId * )msg->getParam( 0 ) )
#define rtdata ( (const UMLRTCapsuleId * )msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving guard Saving::saveOK,Saving::Saving */
return( status );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_resourceID
+ #undef resourceID
}
bool Capsule_WordProcessorApp::action_____Saving__printSaveProgress__progress_LT_100( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving guard Saving::Choice1,Saving::Saving */
return( progress < 100 );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
bool Capsule_WordProcessorApp::action_____Saving__saveCompleted__progress_GTE_100( const UMLRTMessage * msg )
{
- #define umlrtparam_percent ( *(int *)msg->getParam( 0 ) )
+ #define percent ( *(int *)msg->getParam( 0 ) )
#define rtdata ( (int *)msg->getParam( 0 ) )
/* UMLRTGEN-USERREGION-BEGIN platform:/resource/ComputerSystem/ComputerSystem.uml ComputerSystem::Software::WordProcessorApp::Saving guard Saving::Choice1,Saving::ExitPoint2 */
return( progress >= 100 );
/* UMLRTGEN-USERREGION-END */
#undef rtdata
- #undef umlrtparam_percent
+ #undef percent
}
void Capsule_WordProcessorApp::actionchain_____Initial( const UMLRTMessage * msg )
diff --git a/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/SerializationManager.java b/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/SerializationManager.java
index 20493b9..d43f4f6 100644
--- a/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/SerializationManager.java
+++ b/plugins/umlrt/codegen/org.eclipse.papyrusrt.codegen.cpp/src/org/eclipse/papyrusrt/codegen/cpp/SerializationManager.java
@@ -172,7 +172,7 @@
func,
msg,
TypesUtil.createCppType(cpp, param, param.getType()),
- "umlrtparam_" + paramName,
+ paramName,
index));
}
}