diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-12 19:22:31 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-12 19:22:31 +0000 |
commit | 08d547d5961d466167d85a2a45ddb522534f85ce (patch) | |
tree | 159c38c1f1b173c1763d5b0f9fe3977b2e3912d2 /TAO/examples/ior_corbaloc | |
parent | 04b0daa3fdfc1a7fcab674adf808fe1996468dd3 (diff) | |
download | ATCD-08d547d5961d466167d85a2a45ddb522534f85ce.tar.gz |
Diffstat (limited to 'TAO/examples/ior_corbaloc')
-rw-r--r-- | TAO/examples/ior_corbaloc/client.cpp | 4 | ||||
-rw-r--r-- | TAO/examples/ior_corbaloc/corbaname_client.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/TAO/examples/ior_corbaloc/client.cpp b/TAO/examples/ior_corbaloc/client.cpp index ef15988248d..828c18a5efe 100644 --- a/TAO/examples/ior_corbaloc/client.cpp +++ b/TAO/examples/ior_corbaloc/client.cpp @@ -18,17 +18,15 @@ // ============================================================================ #include "ior_corbaloc_client_i.h" -#include "ace/Argv_Type_Converter.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { try { - ACE_Argv_Type_Converter atc (argc, argv); IOR_corbaloc_Client_i client; int init_result; - init_result = client.init (atc.get_argc (), atc.get_TCHAR_argv ()); + init_result = client.init (argc, argv); if (init_result == 0) { diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp index 78c06186f21..0e7fdd0ff0b 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -34,7 +34,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) // Get an object reference using a corbaname: style URL CORBA::Object_var obj = - orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1])); + orb->string_to_object (argv[1]); // Narrow corbaloc::Status_var factory = diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp index 3a0fab5d9f9..4211452cc13 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp @@ -89,10 +89,8 @@ int IOR_corbaloc_Client_i::init (int& argc, ACE_TCHAR *argv[]) { - try { - // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); |