[openrtm-commit:02917] r3072 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-11-14 14:47:41 +0900 (Tue, 14 Nov 2017)
New Revision: 3072

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
   trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
   trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
   trunk/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
Log:
[compat,->RELENG_1_2] bug fix.

Modified: trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-11-09 08:18:34 UTC (rev 3071)
+++ trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-11-14 05:47:41 UTC (rev 3072)
@@ -32,7 +32,7 @@
   typedef _CORBA_Unbounded_Sequence_String StringUSequence;
 #endif
 
-#if not defined(ORB_IS_RTORB) && not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   // prototype of static functions 
   static void print_key(std::stringstream& s, OctetUSequence& key);
   
@@ -53,7 +53,7 @@
    * @brief Convert from IOR string to IOR structure
    * @endif
    */
-#if not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   bool toIOR(const char* iorstr, IOP::IOR& ior)
   {
 #ifndef ORB_IS_RTORB
@@ -121,7 +121,7 @@
    * @brief Convert from IOR structure to IOR string 
    * @endif
    */
-#if not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   bool toString(IOP::IOR& ior, std::string& iorstr)
   {
 #ifndef ORB_IS_RTORB
@@ -185,7 +185,7 @@
    */
   bool replaceEndpoint(std::string& iorstr, const std::string& endpoint)
   {
-#if not defined(ORB_IS_RTORB) && not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
     try
       {
         IOP::IOR ior;
@@ -231,7 +231,7 @@
   std::string formatIORinfo(const char* iorstr)
   {
     std::stringstream retstr;
-#if not defined(ORB_IS_RTORB) && not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
     IOP::IOR ior;
     toIOR(iorstr, ior);
 
@@ -293,7 +293,7 @@
   }
 
 
-#if not defined(ORB_IS_RTORB) && not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   //------------------------------------------------------------
   // static functions
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2017-11-09 08:18:34 UTC (rev 3071)
+++ trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2017-11-14 05:47:41 UTC (rev 3072)
@@ -50,7 +50,7 @@
    *
    * @endif
    */
-#if not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   bool toIOR(const char* iorstr, IOP::IOR& ior);
 #endif
 
@@ -63,7 +63,7 @@
    *
    * @endif
    */
-#if not defined(ORB_IS_ORBEXPRESS) && not defined(ORB_IS_TAO)
+#if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   bool toString(IOP::IOR& ior, std::string& iorstr);
 #endif
   

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h	2017-11-09 08:18:34 UTC (rev 3071)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h	2017-11-14 05:47:41 UTC (rev 3072)
@@ -29,7 +29,7 @@
 };
 
 // Why RtORB does not allow forward declaration?
-#if not defined ORB_IS_RTORB && not defined ORB_IS_ORBEXPRESS
+#if !defined ORB_IS_RTORB && !defined ORB_IS_ORBEXPRESS
 namespace SDOPackage
 {
   class NVList;

Modified: trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp	2017-11-09 08:18:34 UTC (rev 3071)
+++ trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp	2017-11-14 05:47:41 UTC (rev 3072)
@@ -535,7 +535,7 @@
                                         const coil::vstring& modules,
                                         vProperties& modprops)
   {
-#if not defined(VXWORKS_69) && not defined(VXWORKS_66)
+#if !defined(VXWORKS_69) && !defined(VXWORKS_66)
     std::string l = "manager.modules." + lang;
     coil::Properties& lprop(Manager::instance().getConfig().getNode(l));
     std::vector<coil::Properties> prop;

Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h	2017-11-09 08:18:34 UTC (rev 3071)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortConsumer.h	2017-11-14 05:47:41 UTC (rev 3072)
@@ -25,7 +25,7 @@
 #include <rtm/CdrBufferBase.h>
 
 // Why RtORB does not allow the following foward declaration?
-#if not defined(ORB_IS_RTORB) && not defined(ORB_IS_ORBEXPRESS)
+#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS)
 namespace SDOPackage
 {
   class NVList;