[openrtm-commit:02913] r3070 - in trunk/OpenRTM-aist/examples: SimpleIO SimpleService

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-11-08 13:16:27 +0900 (Wed, 08 Nov 2017)
New Revision: 3070

Modified:
   trunk/OpenRTM-aist/examples/SimpleIO/ConsoleIn.cpp
   trunk/OpenRTM-aist/examples/SimpleService/MyServiceConsumer.cpp
Log:
[compat,->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist/examples/SimpleIO/ConsoleIn.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/ConsoleIn.cpp	2017-11-08 02:19:20 UTC (rev 3069)
+++ trunk/OpenRTM-aist/examples/SimpleIO/ConsoleIn.cpp	2017-11-08 04:16:27 UTC (rev 3070)
@@ -99,7 +99,7 @@
 RTC::ReturnCode_t ConsoleIn::onExecute(RTC::UniqueId ec_id)
 {
   std::cout << "Please input number: ";
-#if defined(RTM_OS_VXWORKS) && not defined(__RTP__)
+#if defined(RTM_OS_VXWORKS)
   static int count = 0;
   m_out.data = count;
   count++;

Modified: trunk/OpenRTM-aist/examples/SimpleService/MyServiceConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/MyServiceConsumer.cpp	2017-11-08 02:19:20 UTC (rev 3069)
+++ trunk/OpenRTM-aist/examples/SimpleService/MyServiceConsumer.cpp	2017-11-08 04:16:27 UTC (rev 3070)
@@ -119,7 +119,7 @@
       std::string args;
       std::string::size_type pos;
       std::vector<std::string> argv;
-#if defined(RTM_OS_VXWORKS) && not defined(__RTP__)
+#if defined(RTM_OS_VXWORKS)
       args = "echo test";
 #else
       std::getline(std::cin, args);