[openrtm-commit:02799] r3038 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-09-04 17:08:01 +0900 (Mon, 04 Sep 2017)
New Revision: 3038

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[incompat] refs #4176

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-09-04 07:47:54 UTC (rev 3037)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2017-09-04 08:08:01 UTC (rev 3038)
@@ -1555,14 +1555,16 @@
 	// Get the POAManager
 	m_pPOAManager = m_pPOA->the_POAManager();
 #ifdef ORB_IS_OMNIORB
-#ifdef RTM_OMNIORB_42
 	CORBA::PolicyList pl;
 	pl.length(1);
+#ifdef RTM_OMNIORB_42
 	pl[0] = omniPolicy::create_local_shortcut_policy(omniPolicy::LOCAL_CALLS_SHORTCUT);
-	m_pShortCutPOA = m_pPOA->create_POA("shortcut", m_pPOAManager, pl);
 #else
-	m_pShortCutPOA = m_pPOA;
+	CORBA::Any v;
+	v <<= omniPolicy::LOCAL_CALLS_SHORTCUT;
+	pl[0] = m_pORB->create_policy(omniPolicy::LOCAL_SHORTCUT_POLICY_TYPE, v);
 #endif
+	m_pShortCutPOA = m_pPOA->create_POA("shortcut", m_pPOAManager, pl);
 #endif
 
 #ifdef ORB_IS_OMNIORB