diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-05-02 19:31:43 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-05-02 19:31:43 +0000 |
commit | b346ca07b9db29c2beb4f93e2f76b27d68ba4e55 (patch) | |
tree | c2c9ad92cd4928b0630652271eb1eba5c7e8836a /TAO/orbsvcs/orbsvcs/Naming | |
parent | 17491961edde93a5c382a341fc35128767d24855 (diff) | |
download | ATCD-b346ca07b9db29c2beb4f93e2f76b27d68ba4e55.tar.gz |
*** empty log message ***
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp | 13 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index adbaefb8b21..6a30e9f57fb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -32,8 +32,8 @@ TAO_Naming_Server::TAO_Naming_Server (void) // Constructor which takes an ORB and POA. -TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_var &orb, - PortableServer::POA_var &child_poa, +TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb, + PortableServer::POA_ptr child_poa, int argc, char **argv) { @@ -82,11 +82,16 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, if (ACE_OS::strcmp (this->naming_context_name_, "NameService") == 0) { + // Get the naming context ptr to NameService. + this->naming_context_var_ = + this->naming_context_impl_._this (TAO_TRY_ENV); + TAO_CHECK_ENV; + PortableServer::ObjectId_var id = - PortableServer::string_to_ObjectId (this->naming_context_name_); + PortableServer::string_to_ObjectId ("NameService"); child_poa->activate_object_with_id (id.in (), - &naming_context_impl_, + &this->naming_context_impl_, TAO_TRY_ENV); TAO_CHECK_ENV; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index 87cd96bf7ac..78b88d324b2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -41,8 +41,8 @@ public: TAO_Naming_Server (void); //Default constructor. - TAO_Naming_Server (CORBA::ORB_var &orb, - PortableServer::POA_var &root_poa, + TAO_Naming_Server (CORBA::ORB_ptr orb, + PortableServer::POA_ptr root_poa, int argc = 0, char **argv = 0); // Takes the POA under which to register the Naming Service |