diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 14:17:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 14:17:15 +0000 |
| commit | f3816a04f84e412cf4aad7c69614f1eb4f633c4c (patch) | |
| tree | dda445419479e4e255bb7a580989330fc01983f6 /TAO/tao/Utils | |
| parent | 629d8fa36ffcf9e901daf36bd77d5b1c5978d453 (diff) | |
| download | ATCD-f3816a04f84e412cf4aad7c69614f1eb4f633c4c.tar.gz | |
Mon Sep 29 14:16:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Utils')
| -rw-r--r-- | TAO/tao/Utils/ORB_Manager.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Utils/ORB_Manager.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index aec156c98eb..aba6b9ff4ee 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -41,7 +41,7 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, int TAO_ORB_Manager::init (int &argc, - ACE_TCHAR **argv, + ACE_TCHAR *argv[], const char *orb_name) { if (CORBA::is_nil (this->orb_.in ())) diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h index 90626f7aca9..238afc26c9e 100644 --- a/TAO/tao/Utils/ORB_Manager.h +++ b/TAO/tao/Utils/ORB_Manager.h @@ -57,7 +57,7 @@ public: */ TAO_ORB_Manager (CORBA::ORB_ptr orb = CORBA::ORB::_nil(), PortableServer::POA_ptr poa = PortableServer::POA::_nil(), - PortableServer::POAManager_ptr poa_manager = + PortableServer::POAManager_ptr poa_manager = PortableServer::POAManager::_nil()); /** @@ -68,7 +68,7 @@ public: * @retval 0 Success */ int init (int &argc, - char *argv[], + ACE_TCHAR *argv[], const char *orb_name = 0); #if !defined (CORBA_E_MICRO) @@ -81,7 +81,7 @@ public: * @retval 0 Success */ int init_child_poa (int &argc, - char *argv[], + ACE_TCHAR *argv[], const char *poa_name, const char *orb_name = 0); #endif /* CORBA_E_MICRO */ |