Fix various compilation issues for QNX and LynxOS

19 files changed, 76 insertions, 32 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3a64dbdae3e..ef0973120da 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,33 @@
+Fri Mar  8 14:56:14 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc:
+        * bin/tao_other_tests.lst:
+
+          Dont run ImplRepo RestartServer test in single threaded builds.
+
+        * orbsvcs/ImplRepo_Service/Config_Backing_Store.h:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/Shared_Backing_Store.h:
+        * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
+        * orbsvcs/ImplRepo_Service/XML_Backing_Store.h:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp:
+        * orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp:
+        * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp:
+        * orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp:
+        * orbsvcs/tests/FT_Naming/Replication/client.cpp:
+        * tao/Storable_FlatFileStream.h:
+        * utils/nsgroup/nsgroup.cpp:
+
+          Fix issues with implicit conversion of _var types by using ".in ()".
+          Addresses compilation issues on QNX and LynxOS.
+
+          Also included ace/config-lite.h prior to use of ACE_LACKS_PRAGMA_ONCE
+          macro to ensure it was defined.
+
 Fri Mar  8 00:06:30 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index 27ddfa9ecca..bc88c2b4b16 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -134,7 +134,7 @@ TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_CO
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS
-TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
+TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS
 TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS
 TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_IFR !ACE_FOR_TAO !WCHAR
 TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS
diff --git a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h
index e32956aa50c..34ca3d026f0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Config_Backing_Store.h
@@ -16,6 +16,8 @@
 #ifndef CONFIG_BACKING_STORE_H
 #define CONFIG_BACKING_STORE_H
 
+#include "ace/config-lite.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 22aa5464247..2a6507277df 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -173,7 +173,9 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts)
 
   // initialize the repository. This will load any values that
   // may have been persisted before.
-  return this->repository_->init(this->root_poa_, this->imr_poa_, ior);
+  return this->repository_->init(this->root_poa_.in (),
+                                 this->imr_poa_.in (),
+                                 ior);
 }
 
 int
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index 354852586ce..9f7a8a9073e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -478,13 +478,13 @@ Shared_Backing_Store::persistent_remove (const ACE_CString& name,
     {
       err = remove<ImplementationRepository::ActivatorUpdate>
         (name, this->activator_uids_, this->filename_, listing_lf,
-         this->peer_replica_, this->seq_num_);
+         this->peer_replica_.in (), this->seq_num_);
     }
   else
     {
       err = remove<ImplementationRepository::ServerUpdate>
         (name, this->server_uids_, this->filename_, listing_lf,
-         this->peer_replica_, this->seq_num_);
+         this->peer_replica_.in (), this->seq_num_);
     }
   return err;
 }
@@ -542,7 +542,7 @@ Shared_Backing_Store::persistent_update(const Server_Info_Ptr& info, bool add)
     ImplementationRepository::repo_add :
     ImplementationRepository::repo_update;
   replicate<ImplementationRepository::ServerUpdate, ServerUIMap>
-    (peer_replica_, entry, type, ++seq_num_);
+    (peer_replica_.in (), entry, type, ++seq_num_);
   return 0;
 }
 
@@ -601,7 +601,7 @@ Shared_Backing_Store::persistent_update(const Activator_Info_Ptr& info,
     ImplementationRepository::repo_add :
     ImplementationRepository::repo_update;
   replicate<ImplementationRepository::ActivatorUpdate, ActivatorUIMap>
-    (peer_replica_, entry, type, ++seq_num_);
+    (peer_replica_.in (), entry, type, ++seq_num_);
   return 0;
 }
 
@@ -1225,7 +1225,7 @@ Shared_Backing_Store::register_replica(
   this->imr_ior_ = (const char*)ft_imr_ior;
 
   PortableServer::POA_var null_poa;
-  Locator_Repository::report_ior(null_poa);
+  Locator_Repository::report_ior(null_poa.in ());
 }
 
 ACE_CString
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
index fc235ba2b88..ee7b80b9d6f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h
@@ -17,6 +17,8 @@
 #ifndef SHARED_BACKING_STORE_H
 #define SHARED_BACKING_STORE_H
 
+#include "ace/config-lite.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
index b4fe9900d5a..6e565d8b902 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.h
@@ -16,6 +16,8 @@
 #ifndef XML_BACKING_STORE_H
 #define XML_BACKING_STORE_H
 
+#include "ace/config-lite.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 5dfa2302077..f3cbf477afe 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -137,7 +137,7 @@ TAO_FT_Naming_Manager::delete_object_group (const char * group_name)
   if (!CORBA::is_nil (group.in()))
   {
     PortableGroup::ObjectGroupId group_id =
-      this->get_object_group_id (group);
+      this->get_object_group_id (group.in ());
 
     // Delete the object group from the factory
     this->group_factory_.delete_group (group_id);
@@ -185,7 +185,8 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st
     lb_strat_property_name.length (1);
     lb_strat_property_name[0].id =
       CORBA::string_dup (::FT_Naming::TAO_FT_LOAD_BALANCING_STRATEGY);
-    PortableGroup::Properties_var props = this->get_properties (obj_group);
+    PortableGroup::Properties_var props =
+      this->get_properties (obj_group.in ());
     PortableGroup::Value value;
     if (!TAO_PG::get_property_value (lb_strat_property_name, props.in (), value))
       {
@@ -241,10 +242,11 @@ TAO_FT_Naming_Manager::set_load_balancing_strategy (
   PortableGroup::Value value;
   // Add the load balancing strategy to the properties
   value <<= lb_strategy;
-  property_set.set_property (::FT_Naming::TAO_FT_LOAD_BALANCING_STRATEGY, value);
+  property_set.set_property (::FT_Naming::TAO_FT_LOAD_BALANCING_STRATEGY,
+                             value);
   PortableGroup::Properties properties;
   property_set.export_properties (properties);
-  this->set_properties_dynamically (group, properties);
+  this->set_properties_dynamically (group.in (), properties);
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
index 81cf29553ff..e4b837dd831 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
@@ -153,8 +153,8 @@ TAO_FT_Naming_Replication_Manager::register_with_peer_replica (
                         CORBA::INTERNAL ());
 
     // Store the returned references locally
-    this->naming_svr_->peer_root_context (peer_info->root_context);
-    this->naming_svr_->peer_naming_manager (peer_info->naming_manager);
+    this->naming_svr_->peer_root_context (peer_info->root_context. in ());
+    this->naming_svr_->peer_naming_manager (peer_info->naming_manager.in ());
   }
   catch (const CORBA::Exception& ex) {
     // Unable to contact the peer replica.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index d6ce860a4da..ac1218df0bc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -274,8 +274,8 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc,
         }
     }
 
-    this->naming_manager_.initialize (this->orb_,
-      this->naming_manager_poa_);
+  this->naming_manager_.initialize (this->orb_.in (),
+                                    this->naming_manager_poa_);
 
   }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
index e0c06856ae3..c77a3d82536 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
@@ -15,6 +15,7 @@
 #define TAO_STORABLE_NAMING_CONTEXT_READERWRITER_H
 
 #include /**/ "ace/pre.h"
+#include "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
index ea14855054b..63e58c4595a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -467,7 +467,7 @@ TAO::PG_Object_Group_Storable::read (TAO::Storable_Base & stream)
       MemberInfo * info = 0;
       ACE_NEW_THROW_EX (info, MemberInfo(member.in (),
                                          the_location,
-                                         factory,
+                                         factory.in (),
                                          factory_id),
                         CORBA::NO_MEMORY());
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 807ecc8a46b..92086c4ebd8 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -121,7 +121,7 @@ LB_server::start_orb_and_poa (void)
       poa_manager->activate ();
 
       ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
-      if (name_svc_.init (this->orb_, &timeout) != 0)
+      if (name_svc_.init (this->orb_.in (), &timeout) != 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            ACE_TEXT (" (%P|%t) LB_server: Could not connect ")
                            ACE_TEXT ("to naming service.\n")),
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 6b83cbd645b..9d7724f3e3e 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -653,7 +653,7 @@ do_failover_name_test (
         CORBA::Object_var obj1_on_replica = root_context_1->resolve (wide);
         // Make sure it is a context
         CosNaming::NamingContext_var nc =
-          CosNaming::NamingContext::_narrow (obj1_on_replica);
+          CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
       }
       catch (const CosNaming::NamingContext::NotFound& ex)
         {
@@ -1062,7 +1062,7 @@ do_failover_objectgroup_test (
                           RC_ERROR);
     }
 
-    if (RC_SUCCESS != svc.set_naming_manager (naming_manager_1))
+    if (RC_SUCCESS != svc.set_naming_manager (naming_manager_1.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref),
@@ -1284,7 +1284,7 @@ do_persistence_name_test (
 
         // Make sure it is a context
         CosNaming::NamingContext_var nc =
-          CosNaming::NamingContext::_narrow (obj1_on_replica);
+          CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
       }
       catch (const CosNaming::NamingContext::NotFound& ex)
         {
@@ -1388,7 +1388,7 @@ do_persistence_objectgroup_test (
                           RC_ERROR);
     }
 
-    if( RC_SUCCESS != group_svc.set_naming_manager (naming_manager_1) )
+    if( RC_SUCCESS != group_svc.set_naming_manager (naming_manager_1.in ()) )
     {
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref),
@@ -1569,7 +1569,9 @@ do_persistence_objectgroup_test (
 
             // Add back member
             group_var =
-              naming_manager_1->add_member (group_var, location_name, member);
+              naming_manager_1->add_member (group_var.in (),
+                                            location_name,
+                                            member.in ());
             PortableGroup::Locations_var locations =
               naming_manager_1->locations_of_members (group_var);
 
@@ -1851,7 +1853,7 @@ do_equivalence_name_test (
 
         // Make sure it is a context
         CosNaming::NamingContext_var nc =
-          CosNaming::NamingContext::_narrow (obj1_on_replica);
+          CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
       }
       catch (const CosNaming::NamingContext::NotFound& ex)
         {
@@ -2331,7 +2333,7 @@ do_equivalence_objectgroup_test (
                           RC_ERROR);
     }
 
-    if (RC_SUCCESS != svc1.set_naming_manager (naming_manager_1))
+    if (RC_SUCCESS != svc1.set_naming_manager (naming_manager_1.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT ("ERROR: invalid ior <%s>\n"),
@@ -2348,7 +2350,7 @@ do_equivalence_objectgroup_test (
                           RC_ERROR);
     }
 
-    if (RC_SUCCESS != svc2.set_naming_manager (naming_manager_2))
+    if (RC_SUCCESS != svc2.set_naming_manager (naming_manager_2.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm2ref),
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index 2ec9b232cd7..323cd540ddf 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -119,7 +119,7 @@ LB_server::start_orb_and_poa (void)
       poa_manager->activate ();
 
       ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
-      if (name_svc_.init (this->orb_, &timeout) != 0)
+      if (name_svc_.init (this->orb_.in (), &timeout) != 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            ACE_TEXT ("LB_server: Could not connect to naming ")
                            ACE_TEXT ("service.\n")),
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 0c948882670..81eef2d3c0c 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -288,7 +288,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           root_context_2->resolve (wide);
         // Make sure it is a context
         CosNaming::NamingContext_var nc =
-          CosNaming::NamingContext::_narrow (obj1_on_replica);
+          CosNaming::NamingContext::_narrow (obj1_on_replica.in ());
       }
       catch (const CosNaming::NamingContext::NotFound& ex)
         {
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc b/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
index c619da302e2..61f6b50edbc 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/RestartServer.mpc
@@ -7,7 +7,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micro {
+project(*Server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micro, threads {
   exename = MessengerServer
   after += *idl
   Source_Files {
@@ -23,7 +23,7 @@ project(*Server): taoserver, iortable, avoids_minimum_corba, avoids_corba_e_micr
   }
 }
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba {
+project(*Client): taoclient, anytypecode, avoids_minimum_corba, threads {
   exename = MessengerClient
   after += *idl
   Source_Files {
diff --git a/TAO/tao/Storable_FlatFileStream.h b/TAO/tao/Storable_FlatFileStream.h
index 357199f98d3..3980d750456 100644
--- a/TAO/tao/Storable_FlatFileStream.h
+++ b/TAO/tao/Storable_FlatFileStream.h
@@ -15,6 +15,7 @@
 #define STORABLE_FLATFILESTREAM_H
 
 #include /**/ "ace/pre.h"
+#include "ace/config-lite.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index 81a728e211f..31817e6f06b 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -166,7 +166,7 @@ NSGROUP::start_orb (void)
 
     CORBA::ORB_var orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
-    if (RC_SUCCESS != svc_.set_orb (orb_))
+    if (RC_SUCCESS != svc_.set_orb (orb_.in ()))
     {
 
       ACE_ERROR_RETURN (( LM_ERROR,
@@ -183,7 +183,7 @@ NSGROUP::start_orb (void)
     FT_Naming::NamingManager_var naming_manager_ =
       FT_Naming::NamingManager::_narrow (naming_manager_object.in ());
 
-    if (RC_SUCCESS != svc_.set_naming_manager (naming_manager_))
+    if (RC_SUCCESS != svc_.set_naming_manager (naming_manager_.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT (" (%P|%t) Unable to get Naming ")
@@ -199,7 +199,7 @@ NSGROUP::start_orb (void)
     CosNaming::NamingContextExt_var name_service_ =
       CosNaming::NamingContextExt::_narrow (naming_object.in ());
 
-    if (RC_SUCCESS != svc_.set_name_context (name_service_))
+    if (RC_SUCCESS != svc_.set_name_context (name_service_.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
                           ACE_TEXT (" (%P|%t) Unable to get Name Service ")