[openrtm-commit:00884] r345 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/Content resource/100/CXX/DataPortIDL resource/100/CXX/Doc/fullLong resource/100/CXX/PrefixSuffix/confprefix resource/100/CXX/PrefixSuffix/confsuffix resource/100/CXX/PrefixSuffix/dtprefix resource/100/CXX/PrefixSuffix/dtsuffix resource/100/CXX/PrefixSuffix/prefix resource/100/CXX/PrefixSuffix/siprefix resource/100/CXX/PrefixSuffix/sisuffix resource/100/CXX/PrefixSuffix/suffix resource/100/CXX/PrefixSuffix/svprefix resource/100/CXX/PrefixSuffix/svsuffix resource/100/CXX/Variable/DataPort resource/100/CXX/Variable/ServicePort1 resource/100/CXX/Variable/ServicePort2 resource/100/CXX/basic/attribute resource/100/CXX/basic/inport1 resource/100/CXX/basic/inport2 resource/100/CXX/basic/operation resource/100/CXX/basic/outport1 resource/100/CXX/basic/outport2 resource/100/CXX/basic/service1 resource/100/CXX/basic/service2 resource/100/CXX/build/cmake1 resource/100/CXX/build/cmake1/include/foo resource/100/CXX/build/vc1 resource/100/CXX/idlpath/IDLPath1 resource/100/CXX/idlpath/IDLPath2 resource/100/CXX/idlpath/IDLPath3 src/jp/go/aist/rtm/rtcbuilder/template/cpp
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 8月 16日 (木) 13:53:58 JST
Author:
Date: 2012-08-16 13:53:57 +0900 (Thu, 16 Aug 2012)
New Revision: 345
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
Log:
Modified DataPort definition using user-defined type
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Content/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -52,12 +52,12 @@
~foo();
// <rtc-template block="public_attribute">
- publicdParam;
+ publicdParam
// </rtc-template>
// <rtc-template block="public_operation">
- publicOpe();
+ publicOpe()
// </rtc-template>
@@ -216,12 +216,12 @@
protected:
// <rtc-template block="protected_attribute">
- protectedParam;
+ protectedParam
// </rtc-template>
// <rtc-template block="protected_operation">
- protectedOpe();
+ protectedOpe()
// </rtc-template>
@@ -258,13 +258,13 @@
private:
// <rtc-template block="private_attribute">
- privateParam;
- privateParam2;
+ privateParam
+ privateParam2
// </rtc-template>
// <rtc-template block="private_operation">
- privateOpe();
+ privateOpe()
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/DataPortIDL/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,24 +230,24 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- Frame1 m_InP1;
+ MyType::Frame1 m_InP1;
/*!
*/
- InPort<Frame1> m_InP1In;
- TimedLong m_InP2;
+ InPort<MyType::Frame1> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
+ OutPort<RTC::TimedInt> m_OutP1Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Doc/fullLong/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -386,7 +386,7 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InName1;
+ RTC::TimedShort m_InName1;
/*!
* InPort1の概要123456789012345678901234567890123456789012345678
* 9012345678901234567890
@@ -404,8 +404,8 @@
* 890123456789012345678901234567890123456789
* 01234567890
*/
- InPort<TimedShort> m_InName1In;
- TimedLong m_InNm2;
+ InPort<RTC::TimedShort> m_InName1In;
+ RTC::TimedLong m_InNm2;
/*!
* InPort2の概要123456789012345678901234567890123456789012345678
* 9012345678901234567890
@@ -423,14 +423,14 @@
* 890123456789012345678901234567890123456789
* 01234567890
*/
- InPort<TimedLong> m_InNm2In;
+ InPort<RTC::TimedLong> m_InNm2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutName1;
+ RTC::TimedLong m_OutName1;
/*!
* OutPort1の概要12345678901234567890123456789012345678901234567
* 89012345678901234567890
@@ -448,8 +448,8 @@
* 789012345678901234567890123456789012345678
* 901234567890
*/
- OutPort<TimedLong> m_OutName1Out;
- TimedFloat m_OutNme2;
+ OutPort<RTC::TimedLong> m_OutName1Out;
+ RTC::TimedFloat m_OutNme2;
/*!
* OutPort2の概要12345678901234567890123456789012345678901234567
* 89012345678901234567890
@@ -467,7 +467,7 @@
* 789012345678901234567890123456789012345678
* 901234567890
*/
- OutPort<TimedFloat> m_OutNme2Out;
+ OutPort<RTC::TimedFloat> m_OutNme2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confprefix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/confsuffix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtprefix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1_s;
+ RTC::TimedShort p_dtInP1_s;
/*!
*/
- InPort<TimedShort> p_dtInP1In_s;
- TimedLong p_dtInP2_s;
+ InPort<RTC::TimedShort> p_dtInP1In_s;
+ RTC::TimedLong p_dtInP2_s;
/*!
*/
- InPort<TimedLong> p_dtInP2In_s;
+ InPort<RTC::TimedLong> p_dtInP2In_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1_s;
+ RTC::TimedOctet p_dtOutP1_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Out_s;
- TimedFloat p_dtOutP2_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Out_s;
+ RTC::TimedFloat p_dtOutP2_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Out_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Out_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/dtsuffix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/prefix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_InP1;
+ RTC::TimedShort p_InP1;
/*!
*/
- InPort<TimedShort> p_InP1In;
- TimedLong p_InP2;
+ InPort<RTC::TimedShort> p_InP1In;
+ RTC::TimedLong p_InP2;
/*!
*/
- InPort<TimedLong> p_InP2In;
+ InPort<RTC::TimedLong> p_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_OutP1;
+ RTC::TimedOctet p_OutP1;
/*!
*/
- OutPort<TimedOctet> p_OutP1Out;
- TimedFloat p_OutP2;
+ OutPort<RTC::TimedOctet> p_OutP1Out;
+ RTC::TimedFloat p_OutP2;
/*!
*/
- OutPort<TimedFloat> p_OutP2Out;
+ OutPort<RTC::TimedFloat> p_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/siprefix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/sisuffix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/suffix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_InP1_s;
+ RTC::TimedShort p_InP1_s;
/*!
*/
- InPort<TimedShort> p_InP1In_s;
- TimedLong p_InP2_s;
+ InPort<RTC::TimedShort> p_InP1In_s;
+ RTC::TimedLong p_InP2_s;
/*!
*/
- InPort<TimedLong> p_InP2In_s;
+ InPort<RTC::TimedLong> p_InP2In_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_OutP1_s;
+ RTC::TimedOctet p_OutP1_s;
/*!
*/
- OutPort<TimedOctet> p_OutP1Out_s;
- TimedFloat p_OutP2_s;
+ OutPort<RTC::TimedOctet> p_OutP1Out_s;
+ RTC::TimedFloat p_OutP2_s;
/*!
*/
- OutPort<TimedFloat> p_OutP2Out_s;
+ OutPort<RTC::TimedFloat> p_OutP2Out_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svprefix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/PrefixSuffix/svsuffix/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -236,28 +236,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort p_dtInP1ds_s;
+ RTC::TimedShort p_dtInP1ds_s;
/*!
*/
- InPort<TimedShort> p_dtInP1Inds_s;
- TimedLong p_dtInP2ds_s;
+ InPort<RTC::TimedShort> p_dtInP1Inds_s;
+ RTC::TimedLong p_dtInP2ds_s;
/*!
*/
- InPort<TimedLong> p_dtInP2Inds_s;
+ InPort<RTC::TimedLong> p_dtInP2Inds_s;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedOctet p_dtOutP1ds_s;
+ RTC::TimedOctet p_dtOutP1ds_s;
/*!
*/
- OutPort<TimedOctet> p_dtOutP1Outds_s;
- TimedFloat p_dtOutP2ds_s;
+ OutPort<RTC::TimedOctet> p_dtOutP1Outds_s;
+ RTC::TimedFloat p_dtOutP2ds_s;
/*!
*/
- OutPort<TimedFloat> p_dtOutP2Outds_s;
+ OutPort<RTC::TimedFloat> p_dtOutP2Outds_s;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/DataPort/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -228,28 +228,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_VarInP1;
+ RTC::TimedShort m_VarInP1;
/*!
*/
- InPort<TimedShort> m_VarInP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_VarInP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutP1;
+ RTC::TimedLong m_OutP1;
/*!
*/
- OutPort<TimedLong> m_OutP1Out;
- TimedFloat m_VarOutP2;
+ OutPort<RTC::TimedLong> m_OutP1Out;
+ RTC::TimedFloat m_VarOutP2;
/*!
*/
- OutPort<TimedFloat> m_VarOutP2Out;
+ OutPort<RTC::TimedFloat> m_VarOutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort1/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutP1;
+ RTC::TimedLong m_OutP1;
/*!
*/
- OutPort<TimedLong> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedLong> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/Variable/ServicePort2/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutP1;
+ RTC::TimedLong m_OutP1;
/*!
*/
- OutPort<TimedLong> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedLong> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/attribute/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -52,8 +52,8 @@
~foo();
// <rtc-template block="public_attribute">
- boolean pubbol1;
- double attribute_5;
+ boolean pubbol1
+ double attribute_5
// </rtc-template>
@@ -216,8 +216,8 @@
protected:
// <rtc-template block="protected_attribute">
- String protectval;
- static float attribute_4;
+ String protectval
+ static float attribute_4
// </rtc-template>
@@ -258,8 +258,8 @@
private:
// <rtc-template block="private_attribute">
- int private1;
- static int attribute_4;
+ int private1
+ static int attribute_4
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport1/test.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -228,10 +228,10 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
+ InPort<RTC::TimedShort> m_InP1In;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/inport2/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -228,14 +228,14 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/operation/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -52,14 +52,14 @@
~foo();
// <rtc-template block="public_attribute">
- boolean pubbol1;
- double attribute_5;
+ boolean pubbol1
+ double attribute_5
// </rtc-template>
// <rtc-template block="public_operation">
- int operation_2(int param_1 = 10);
- String operation_1(String param_1, int param_2);
+ int operation_2(int param_1 = 10)
+ String operation_1(String param_1, int param_2)
// </rtc-template>
@@ -218,8 +218,8 @@
protected:
// <rtc-template block="protected_attribute">
- String protectval;
- static float attribute_4;
+ String protectval
+ static float attribute_4
// </rtc-template>
@@ -260,8 +260,8 @@
private:
// <rtc-template block="private_attribute">
- int private1;
- static int attribute_4;
+ int private1
+ static int attribute_4
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport1/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -228,24 +228,24 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
+ OutPort<RTC::TimedInt> m_OutP1Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/outport2/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -228,28 +228,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedInt> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service1/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -229,28 +229,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedInt> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/basic/service2/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedInt> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -223,30 +223,35 @@
// </rtc-template>
+ // Configuration variable declaration
+ // <rtc-template block="config_declare">
+
+ // </rtc-template>
+
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedInt> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/cmake1/include/foo/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedInt> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedInt m_OutP1;
+ RTC::TimedInt m_OutP1;
/*!
*/
- OutPort<TimedInt> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedInt> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath1/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutP1;
+ RTC::TimedLong m_OutP1;
/*!
*/
- OutPort<TimedLong> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedLong> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath2/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutP1;
+ RTC::TimedLong m_OutP1;
/*!
*/
- OutPort<TimedLong> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedLong> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/idlpath/IDLPath3/foo.h 2012-08-16 04:53:57 UTC (rev 345)
@@ -230,28 +230,28 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
- TimedShort m_InP1;
+ RTC::TimedShort m_InP1;
/*!
*/
- InPort<TimedShort> m_InP1In;
- TimedLong m_InP2;
+ InPort<RTC::TimedShort> m_InP1In;
+ RTC::TimedLong m_InP2;
/*!
*/
- InPort<TimedLong> m_InP2In;
+ InPort<RTC::TimedLong> m_InP2In;
// </rtc-template>
// DataOutPort declaration
// <rtc-template block="outport_declare">
- TimedLong m_OutP1;
+ RTC::TimedLong m_OutP1;
/*!
*/
- OutPort<TimedLong> m_OutP1Out;
- TimedFloat m_OutP2;
+ OutPort<RTC::TimedLong> m_OutP1Out;
+ RTC::TimedFloat m_OutP2;
/*!
*/
- OutPort<TimedFloat> m_OutP2Out;
+ OutPort<RTC::TimedFloat> m_OutP2Out;
// </rtc-template>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl 2012-08-13 07:15:25 UTC (rev 344)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl 2012-08-16 04:53:57 UTC (rev 345)
@@ -354,7 +354,7 @@
// DataInPort declaration
// <rtc-template block="inport_declare">
#foreach($port in ${rtcParam.inports})
-#if(${port.type}!="") ${cXXConv.getDataTypeName(${port.type})} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+#if(${port.type}!="") ${port.type} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
/*!
#if(${port.docDescription.length()}>0) * ${tmpltHelper.convertDescDoc(${port.docDescription})}
#end
@@ -371,7 +371,7 @@
#if(${port.docOperation.length()}>0) * - Operation Cycle: ${tmpltHelper.convertCycleDoc(${port.docOperation})}
#end
*/
- InPort<${cXXConv.getDataTypeName(${port.type})}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}In${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+ InPort<${port.type}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}In${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
#end
#end
@@ -381,7 +381,7 @@
// DataOutPort declaration
// <rtc-template block="outport_declare">
#foreach($port in ${rtcParam.outports})
-#if(${port.type}!="") ${cXXConv.getDataTypeName(${port.type})} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+#if(${port.type}!="") ${port.type} ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
/*!
#if(${port.docDescription.length()}>0) * ${tmpltHelper.convertDescDoc(${port.docDescription})}
#end
@@ -398,7 +398,7 @@
#if(${port.docOperation.length()}>0) * - Operation Cycle: ${tmpltHelper.convertCycleDoc(${port.docOperation})}
#end
*/
- OutPort<${cXXConv.getDataTypeName(${port.type})}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}Out${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
+ OutPort<${port.type}> ${rtcParam.commonPrefix}${rtcParam.dataPortPrefix}${port.tmplVarName}Out${rtcParam.dataPortSuffix}${rtcParam.commonSuffix};
#end
#end
More information about the openrtm-commit
mailing list