diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-06 14:48:09 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-06 14:48:09 +0000 |
| commit | eec8c4114c795cebd5ab5d28d3fe3a7c651551ed (patch) | |
| tree | 1bbe2b784920842e8adc4a1644e4040fa7ba723e | |
| parent | 15205d4d8ee04df6bc3f0b15d1f273c17de3a14d (diff) | |
| download | ATCD-eec8c4114c795cebd5ab5d28d3fe3a7c651551ed.tar.gz | |
Mon Oct 6 14:47:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Client_Module.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Server_Module.cpp | 10 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Server_Module.h | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index 6ad4387702b..ed58e647d20 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -5,6 +5,7 @@ #include "tao/StringSeqC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (DLL_ORB, Test_Client_Module, @@ -37,7 +38,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } - int Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) { @@ -83,7 +83,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) for (int i = new_argc - argc, j = 0; j < argc; ++i, ++j) - new_argv[i] = CORBA::string_dup (argv[j]); + new_argv[i] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[j])); // Initialize the ORB. this->orb_ = CORBA::ORB_init (new_argc, @@ -93,7 +93,9 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (this->orb_.in ())) return -1; - if (::parse_args (new_argc, new_argv.get_buffer ()) != 0) + ACE_Argv_Type_Converter converter (new_argc, new_argv.get_buffer ()); + + if (::parse_args (new_argc, converter.get_TCHAR_argv ()) != 0) return 1; CORBA::Object_var obj = diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 2840db80254..7b328ee3e40 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -5,6 +5,7 @@ #include "tao/StringSeqC.h" #include "ace/Service_Config.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (DLL_ORB, Test_Server_Module, @@ -38,6 +39,10 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } +Test_Server_Module::~Test_Server_Module (void) +{ +} + int Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) { @@ -84,7 +89,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) for (int i = new_argc - argc, j = 0; j < argc; ++i, ++j) - new_argv[i] = CORBA::string_dup (argv[j]); + new_argv[i] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[j])); // Initialize the ORB. this->orb_ = CORBA::ORB_init (new_argc, @@ -109,7 +114,8 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) this->poa_manager_->activate (); - if (::parse_args (new_argc, new_argv.get_buffer ()) != 0) + ACE_Argv_Type_Converter converter (new_argc, new_argv.get_buffer ()); + if (::parse_args (new_argc, converter.get_TCHAR_argv ()) != 0) return -1; PortableServer::ObjectId_var id = diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h index f525f46716b..eff87d751db 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.h +++ b/TAO/tests/DLL_ORB/Test_Server_Module.h @@ -48,6 +48,8 @@ public: /// Run by a daemon thread to handle deferred processing. virtual int svc (void); + virtual ~Test_Server_Module (void); + private: /// Reference to the ORB. |