Tue Nov 8 22:13:50 2005 William Otte <wotte@dre.vanderbilt.edu>

7 files changed, 20 insertions, 9 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 8222e0064e3..6e32af7a759 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Nov  8 22:13:50 2005  William Otte  <wotte@dre.vanderbilt.edu>
+
+	* DAnCE/NodeManager/NodeManager_Impl.cpp
+	* ciao/Container_Base.cpp
+	* ciao/Servant_Impl_Base.cpp
+	* ciao/Swapping_Servant_Home_Impl_T.cpp
+	* ciao/Upgradeable_Context_Impl_T.cpp
+	* examples/BasicSP/EC/EC.mpc
+
+	Resolved some warnings in OS X relating to ambiguous conversions.
+	
 Mon Nov  7 16:23:41 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* DAnCE/ExecutionManager/ExecutionManager.mpc
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 227935016d5..a74912b2da5 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -203,7 +203,7 @@ CIAO::NodeManager_Impl_Base::destroyManager
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (!this->map_.remove_nam (id))
+      if (!this->map_.remove_nam (id.in ()))
         {
           ACE_ERROR ((LM_ERROR,
                       "NodeManager_Impl::destroyManager: "
diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp
index 8d8d3e0c0ad..a71a555f673 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -620,7 +620,7 @@ namespace CIAO
       PortableServer::string_to_ObjectId (obj_id);
 
     CORBA::String_var str =
-      PortableServer::ObjectId_to_string (oid);
+      PortableServer::ObjectId_to_string (oid.in ());
 
     if (t == Container::Facet_Consumer)
     {
diff --git a/TAO/CIAO/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
index 4918c0cda49..6e5f0993c0b 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
@@ -84,7 +84,7 @@ namespace CIAO
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
 
-        sa->update_port_activator (facet_id ACE_ENV_ARG_PARAMETER);
+        sa->update_port_activator (facet_id.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         this->container_->the_facet_cons_POA ()->deactivate_object
@@ -110,7 +110,7 @@ namespace CIAO
 
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
-        sa->update_port_activator (cons_id ACE_ENV_ARG_PARAMETER);
+        sa->update_port_activator (cons_id.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         this->container_->the_facet_cons_POA ()->deactivate_object
diff --git a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index 22ddf32cb00..2b7e644b0b9 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -105,7 +105,7 @@ namespace CIAO
       PortableServer::string_to_ObjectId (this->obj_id_);
 
     Dynamic_Component_Servant_Base *servant = 0;
-    if (this->dynamic_servant_map_.find (oid, servant) == 0)
+    if (this->dynamic_servant_map_.find (oid.in (), servant) == 0)
     {
       servant->destroy (oid);
     }
@@ -230,7 +230,7 @@ namespace CIAO
     this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
     
-    this->dynamic_servant_map_.bind (oid, svt);
+    this->dynamic_servant_map_.bind (oid.in (), svt);
 
     COMP_VAR ho = COMP::_narrow (objref.in ()
                                  ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index 9a1564b7a5a..b2a85351487 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -66,10 +66,10 @@ namespace CIAO
          (reference ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
     
-    this->update_port_activator (oid ACE_ENV_ARG_PARAMETER);
+    this->update_port_activator (oid.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
     
-    this->deactivate_facet (oid ACE_ENV_ARG_PARAMETER);
+    this->deactivate_facet (oid.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index 2b0362f66ba..c850d19e968 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -57,7 +57,7 @@ project(EC_DnC_exec) : ciao_component_dnc {
   after    += EC_DnC_svnt
   sharedname = EC_exec
 
-  libs     += EC_stub BasicSP_stub EC_svnt
+  libs     += EC_stub BasicSP_stub BasicSP_svnt EC_svnt
 
   libpaths += ..