[openrtm-commit:02267] r2872 - branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: sec_fukai
Date: 2017-01-18 19:58:08 +0900 (Wed, 18 Jan 2017)
New Revision: 2872

Modified:
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3816

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp	2017-01-18 10:19:27 UTC (rev 2871)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp	2017-01-18 10:58:08 UTC (rev 2872)
@@ -373,7 +373,7 @@
   void
   ConfigAdmin::setOnRemoveConfigurationSet(OnRemoveConfigurationSetCallback* cb)
   {
-    std::cerr << 
+    std::cerr <<
             "setOnRemoveConfigurationSet function is obsolete." <<std::endl;
     std::cerr << "Use addConfigurationSetNameListener instead." << std::endl;
     m_listeners.configsetname_[ON_REMOVE_CONFIG_SET].addListener(cb, false);

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp	2017-01-18 10:19:27 UTC (rev 2871)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp	2017-01-18 10:58:08 UTC (rev 2872)
@@ -479,7 +479,8 @@
     // Extracting publisher's period time
     double hz;
     if (!coil::stringTo(hz, prop["publisher.push_rate"].c_str()) &&
-        !coil::stringTo(hz, prop["push_rate"].c_str()))  // for 0.4 compatibility
+        // for 0.4 compatibility
+        !coil::stringTo(hz, prop["push_rate"].c_str()))
       {
         RTC_ERROR(("publisher.push_rate/push_rate were not found."));
         return false;