diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 07:45:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-29 07:45:15 +0000 |
| commit | 562cf5ff24f95c61a1fc0b0f9853c7fd238002fa (patch) | |
| tree | 1a22b01eccb03c2b61d4773493bbc66feb7c2ce2 | |
| parent | 812680fe9819b2097ac6ae3c804b0fe7359e4c9c (diff) | |
| download | ATCD-562cf5ff24f95c61a1fc0b0f9853c7fd238002fa.tar.gz | |
Mon Sep 29 07:44:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/PI/ORBInitInfo.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Utils/ORB_Manager.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index da0158dcf8c..d79720ff657 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 29 07:44:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PI/ORBInitInfo.h: + * tao/Utils/ORB_Manager.cpp: + ACE_TCHAR changes + Mon Sep 29 07:42:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/ImplRepo_Service/tao_imr_i.cpp diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index bcbf37a597f..2752883afa5 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -244,7 +244,7 @@ private: int argc_; /// The argument vector passed to CORBA::ORB_init(). - char **argv_; + ACE_TCHAR **argv_; /// Reference to the CodecFactory returned by /// ORBInitInfo::codec_factory(). diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index 4ab7af28e56..aec156c98eb 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, - char **argv, + ACE_TCHAR **argv, const char *orb_name) { if (CORBA::is_nil (this->orb_.in ())) @@ -76,7 +76,7 @@ TAO_ORB_Manager::init (int &argc, #if !defined (CORBA_E_MICRO) int TAO_ORB_Manager::init_child_poa (int& argc, - char **argv, + ACE_TCHAR **argv, const char *poa_name, const char *orb_name) { |