[openrtm-commit:02317] r2889 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/common rtm

[openrtm ＠ openrtm.org]

Author: sec_fukai
Date: 2017-01-23 10:55:54 +0900 (Mon, 23 Jan 2017)
New Revision: 2889

Modified:
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
Log:
[compat,->DEV_IQ_2016]Modify coding style. refs #3882

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -71,7 +71,7 @@
    */
   int Timer::svc(void)
   {
-    TimeValue t_curr, t_pre, tm;;
+    TimeValue t_curr, t_pre, tm;
     while (m_running)
       {
         invoke();

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -262,8 +262,8 @@
 
     retstr << "IOR information" << std::endl;
     retstr << "  Type ID: \"" << (const char*) ior.type_id
-           << "\"" << std::endl;;
-    retstr << "  Profiles:" << std::endl;;
+           << "\"" << std::endl;
+    retstr << "  Profiles:" << std::endl;
     for (unsigned long count=0; count < ior.profiles.length(); ++count)
       {
         retstr << "    " << count + 1 << ". ";

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -127,7 +127,7 @@
     // getting InPort's ref from Object reference
     if (subscribeFromRef(properties)) { return true; }
 
-    return false;;
+    return false;
   }
 
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -1361,7 +1361,7 @@
     RTC_INFO(("Manager starting."));
     RTC_INFO(("Starting local logging."));
 
-    return true;;
+    return true;
   }
 
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -721,7 +721,7 @@
 
     CORBA_SeqUtil::push_back(m_slaves, RTM::Manager::_duplicate(mgr));
     RTC_TRACE(("add_slave_manager() done, %d slaves", m_slaves.length()));
-    return RTC::RTC_OK;;
+    return RTC::RTC_OK;
   }
 
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -145,7 +145,7 @@
           {
             const char* name(nv[i].name);
             prop[name] = value;
-          };
+          }
       }
   }
 
@@ -167,7 +167,7 @@
       if (nv.value >>= value)
         {
           m_prop.setProperty(CORBA::string_dup(nv.name), value);
-        };
+        }
     }
     coil::Properties m_prop;
   };

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ObjectManager.h	2017-01-23 01:55:54 UTC (rev 2889)
@@ -169,7 +169,7 @@
         m_objects._obj.erase(it);
         return obj;
       }
-    return NULL;;
+    return NULL;
   }
 
   /*!

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp	2017-01-23 01:02:49 UTC (rev 2888)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp	2017-01-23 01:55:54 UTC (rev 2889)
@@ -371,7 +371,7 @@
         catch (CORBA::SystemException &e)
           {
 #ifndef ORB_IS_RTORB
-            RTC_WARN(("Exception caught: minor code(%d).", e.minor()));;
+            RTC_WARN(("Exception caught: minor code(%d).", e.minor()));
 #else  // ORB_IS_RTORB
             RTC_WARN(("Exception caught"));
 #endif  // ORB_IS_RTORB
@@ -379,7 +379,7 @@
           }
         catch (...)
           {
-            RTC_WARN(("Unknown exception caught."));;
+            RTC_WARN(("Unknown exception caught."));
             continue;
           }
       }