[openrtm-commit:02215] r2832 - branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: sec_fukai
Date: 2017-01-13 15:46:00 +0900 (Fri, 13 Jan 2017)
New Revision: 2832

Modified:
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
   branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
Log:
[incompat,->DEV_IQ_2016] Convert from throws e; to throws;. refs #3793

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp	2017-01-13 06:30:33 UTC (rev 2831)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp	2017-01-13 06:46:00 UTC (rev 2832)
@@ -115,14 +115,14 @@
       }
     catch (NotFound& e)
       {
-        force ? bindRecursive(m_rootContext, name, obj) : throw e;
+        force ? bindRecursive(m_rootContext, name, obj) : throw;
       }
     catch (CannotProceed& e)
       {
 #ifndef ORB_IS_RTORB
-        force ? bindRecursive(e.cxt, e.rest_of_name, obj) : throw e;
+        force ? bindRecursive(e.cxt, e.rest_of_name, obj) : throw;
 #else // ORB_IS_RTORB
-        force ? bindRecursive(e.cxt(), e.rest_of_name(), obj) : throw e;
+        force ? bindRecursive(e.cxt(), e.rest_of_name(), obj) : throw;
 #endif // ORB_IS_RTORB
       }
   }
@@ -193,14 +193,14 @@
       }
     catch (NotFound& e)
       {
-        force ? rebindRecursive(m_rootContext, name, obj) : throw e;
+        force ? rebindRecursive(m_rootContext, name, obj) : throw;
       }
     catch (CannotProceed& e)
       {
 #ifndef ORB_IS_RTORB
-        force ? rebindRecursive(e.cxt, e.rest_of_name, obj) : throw e;
+        force ? rebindRecursive(e.cxt, e.rest_of_name, obj) : throw;
 #else // ORB_IS_RTORB
-        force ? rebindRecursive(e.cxt(), e.rest_of_name(), obj) : throw e;
+        force ? rebindRecursive(e.cxt(), e.rest_of_name(), obj) : throw;
 #endif // ORB_IS_RTORB
       }
   }
@@ -440,15 +440,15 @@
       }
     catch (NotFound& e)
       {
-        force ? bindRecursive(m_rootContext, name, newContext()) : throw e;
+        force ? bindRecursive(m_rootContext, name, newContext()) : throw;
       }
     catch (CannotProceed& e)
       {
 #ifndef ORB_IS_RTORB
-        force ? bindRecursive(e.cxt, e.rest_of_name, newContext()) : throw e;
+        force ? bindRecursive(e.cxt, e.rest_of_name, newContext()) : throw;
 #else // ORB_IS_RTORB
         force ? 
-          bindRecursive(e.cxt(), e.rest_of_name(), newContext()) : throw e;
+          bindRecursive(e.cxt(), e.rest_of_name(), newContext()) : throw;
 #endif // ORB_IS_RTORB
       }
     return CosNaming::NamingContext::_nil();

Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2017-01-13 06:30:33 UTC (rev 2831)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp	2017-01-13 06:46:00 UTC (rev 2832)
@@ -1273,7 +1273,7 @@
     catch (SDOPackage::InvalidParameter &e)
       {
         RTC_ERROR(("InvalidParameter exception: name (%s) is not found", id));
-        throw e;
+        throw;
       }
     catch (...)
       {
@@ -1308,7 +1308,7 @@
       }
     catch (SDOPackage::InvalidParameter &e)
       {
-        throw e;
+        throw;
       }
     catch (...)
       {