[openrtm-commit:01528] r2608 - in tags/RELEASE_1_1_1/OpenRTM-aist: . src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2015-04-30 15:40:51 +0900 (Thu, 30 Apr 2015)
New Revision: 2608

Modified:
   tags/RELEASE_1_1_1/OpenRTM-aist/
   tags/RELEASE_1_1_1/OpenRTM-aist/configure.ac
   tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
   tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
r2605 merged from trunk. omniORB 4.2 support issue.


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592
   + /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/configure.ac
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/configure.ac	2015-04-30 06:40:25 UTC (rev 2607)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/configure.ac	2015-04-30 06:40:51 UTC (rev 2608)
@@ -1019,11 +1019,21 @@
 	case $omniorb_version in
 	4.0.*)
 		AC_MSG_RESULT(CORBA C++ mapping ver1.0 is used.)
+		AC_DEFINE([RTM_OMNIORB_40], [TRUE], [omniORB version is 4.0])
+		AC_MSG_RESULT(omniORB version is 4.0.)
 		;;
 	4.1|4.1.*)
 		AC_DEFINE([RTC_CORBA_CXXMAPPING11], [TRUE], [CORBA C++ mapping is ver1.1])
 		AC_MSG_RESULT(CORBA C++ mapping ver1.1 is used.)
+		AC_DEFINE([RTM_OMNIORB_41], [TRUE], [omniORB version is 4.1])
+		AC_MSG_RESULT(omniORB version is 4.1.)
 		;;
+	4.2|4.2.*)
+		AC_DEFINE([RTC_CORBA_CXXMAPPING11], [TRUE], [CORBA C++ mapping is ver1.1])
+		AC_MSG_RESULT(CORBA C++ mapping ver1.1 is used.)
+		AC_DEFINE([RTM_OMNIORB_42], [TRUE], [omniORB version is 4.2])
+		AC_MSG_RESULT(omniORB version is 4.2.)
+		;;
 	esac
 	AC_MSG_RESULT($omnirob_version)
 


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555
   + /tags/RELEASE_1_1_0_RC2/OpenRTM-aist/configure.ac:2173
/trunk/OpenRTM-aist/configure.ac:2154-2172,2174-2176,2180,2183-2208,2213,2278,2330,2397-2398,2400-2401,2409,2548-2555,2605

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2015-04-30 06:40:25 UTC (rev 2607)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp	2015-04-30 06:40:51 UTC (rev 2608)
@@ -399,6 +399,7 @@
   static void print_tagged_components(std::stringstream& sstr,
                                       IOP::MultipleComponentProfile& components)
   {
+#if defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
     CORBA::ULong total(components.length());
     
     for (CORBA::ULong index(0); index < total; ++index)
@@ -425,6 +426,7 @@
             sstr << "       Broken component" << std::endl;
           }
       }
+#endif // defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
   }
 #endif // ORB_IS_RTORB
 };

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp	2015-04-30 06:40:25 UTC (rev 2607)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/src/lib/rtm/Manager.cpp	2015-04-30 06:40:51 UTC (rev 2608)
@@ -1127,7 +1127,11 @@
                     CORBA::UShort port; 
                     coil::stringTo(port, addr_port[1].c_str());
                     iiop_addr.port = port;
+#if defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
                     omniIOR::add_IIOP_ADDRESS(iiop_addr);
+#else
+                    omniIOR::add_IIOP_ADDRESS(iiop_addr, 0);
+#endif // defined(RTC_OMNIORB_40) and defined(RTC_OMNIORB_41)
                   }
               }
           }