[openrtm-commit:02975] r3111 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-12-10 16:07:01 +0900 (Sun, 10 Dec 2017)
New Revision: 3111

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
Log:
[compat,bugfix] Unmatched #ifdefs have been corrected.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-12-10 06:39:21 UTC (rev 3110)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2017-12-10 07:07:01 UTC (rev 3111)
@@ -111,7 +111,7 @@
     return false;
 #endif // ORB_IS_RTORB
   }
-
+#endif // ORB_IS_ORBEXPRESS
   /*!
    * @if jp
    * @brief IOR¹½Â¤ÂΤòIORʸ»úÎó¤ØÊÑ´¹¤¹¤ë
@@ -172,7 +172,7 @@
     return false;
 #endif // ORB_IS_RTORB
   }
-
+#endif // ORB_IS_ORBEXPRESS
   /*!
    * @if jp
    * @brief IORÆâ¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¤òÃÖ´¹¤¹¤ë

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2017-12-10 06:39:21 UTC (rev 3110)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.h	2017-12-10 07:07:01 UTC (rev 3111)
@@ -48,7 +48,7 @@
    */
 #if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   bool toIOR(const char* iorstr, IOP::IOR& ior);
-
+#endif // !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   /*!
    * @if jp
    * @brief IOR¹½Â¤ÂΤòIORʸ»úÎó¤ØÊÑ´¹¤¹¤ë
@@ -60,7 +60,7 @@
    */
 #if !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   bool toString(IOP::IOR& ior, std::string& iorstr);
-  
+#endif // !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
   /*!
    * @if jp
    * @brief IORÆâ¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¤òÃÖ´¹¤¹¤ë

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp	2017-12-10 06:39:21 UTC (rev 3110)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp	2017-12-10 07:07:01 UTC (rev 3111)
@@ -574,5 +574,6 @@
         p["module_file_path"] = modules[i].c_str();
         modprops.push_back(p);
       }
+#endif // VXWORKS_69, VXWORKS_66
   }
 }; // namespace RTC