[openrtm-commit:01380] r516 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-03-19 13:04:49 +0900 (Wed, 19 Mar 2014)
New Revision: 516

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl
Log:
[compat,->RELENG_1_1] Headers order has been changed for clang. refs #3045

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	2014-01-30 06:03:31 UTC (rev 515)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cpp/CXX_RTC.h.vsl	2014-03-19 04:04:49 UTC (rev 516)
@@ -10,11 +10,6 @@
 ${sharp}ifndef ${rtcParam.name.toUpperCase()}_H
 ${sharp}define ${rtcParam.name.toUpperCase()}_H
 
-${sharp}include <rtm/Manager.h>
-${sharp}include <rtm/${rtcParam.componentKind}Base.h>
-${sharp}include <rtm/CorbaPort.h>
-${sharp}include <rtm/DataInPort.h>
-${sharp}include <rtm/DataOutPort.h>
 ${sharp}include <rtm/idl/BasicDataTypeSkel.h>
 ${sharp}include <rtm/idl/ExtendedDataTypesSkel.h>
 ${sharp}include <rtm/idl/InterfaceDataTypesSkel.h>
@@ -35,11 +30,21 @@
 
 // </rtc-template>
 
-using namespace RTC;
+// Service Consumer stub headers
+// <rtc-template block="port_stub_h">
 #foreach($type in ${cXXConv.getPortModules(${rtcParam})})
 ${cXXConv.getDataportUsingNamespace(${type})}
 #end
+// </rtc-template>
 
+using namespace RTC;
+
+${sharp}include <rtm/Manager.h>
+${sharp}include <rtm/${rtcParam.componentKind}Base.h>
+${sharp}include <rtm/CorbaPort.h>
+${sharp}include <rtm/DataInPort.h>
+${sharp}include <rtm/DataOutPort.h>
+
 /*!
  * @class ${rtcParam.name}
  * @brief ${rtcParam.description}