From af050cd5c6e1e46fb4196002e9a414e1cd6725f5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 23 Oct 2008 06:39:56 +0000 Subject: Thu Oct 23 06:39:54 UTC 2008 Johnny Willemsen --- TAO/DevGuideExamples/AMH_AMI/middle_server.cpp | 2 +- TAO/DevGuideExamples/ChangeLog | 14 ++++++++++++++ .../EventServices/RTEC_Federated/EchoEventConsumerMain.cpp | 2 +- .../EventServices/RTEC_Federated/EchoEventSupplierMain.cpp | 6 +++--- .../RTEC_MCast_Federated/EchoEventConsumerMain.cpp | 2 +- .../RTEC_MCast_Federated/EchoEventSupplierMain.cpp | 12 ++++++------ TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp | 2 +- .../NamingService/Naming_Server/NamingTask.cpp | 2 +- .../NamingService/Naming_Server/NamingTask.h | 4 ++-- .../NamingService/corbaloc_Messenger/MessengerClient.cpp | 2 +- .../NamingService/corbaname_Messenger/MessengerClient.cpp | 3 ++- 11 files changed, 33 insertions(+), 18 deletions(-) diff --git a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp index f662a479458..98e8dea90a7 100644 --- a/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/middle_server.cpp @@ -15,7 +15,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) int c = 0; while (c < argc) { - if (ACE_OS::strcasecmp (argv[c], "-no_AMH") == 0) + if (ACE_OS::strcasecmp (argv[c], ACE_TEXT("-no_AMH")) == 0) use_synch = 1; c++; } diff --git a/TAO/DevGuideExamples/ChangeLog b/TAO/DevGuideExamples/ChangeLog index 5bf272d1a8b..3a28943ad34 100644 --- a/TAO/DevGuideExamples/ChangeLog +++ b/TAO/DevGuideExamples/ChangeLog @@ -1,3 +1,17 @@ +Thu Oct 23 06:39:54 UTC 2008 Johnny Willemsen + + * AMH_AMI/middle_server.cpp + * EventServices/RTEC_Federated/EchoEventConsumerMain.cpp + * EventServices/RTEC_Federated/EchoEventSupplierMain.cpp + * EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp + * EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp + * ImplRepo/IORTable/MessengerClient.cpp + * NamingService/corbaloc_Messenger/MessengerClient.cpp + * NamingService/corbaname_Messenger/MessengerClient.cpp + * NamingService/Naming_Server/NamingTask.cpp + * NamingService/Naming_Server/NamingTask.h + wchar fixes + Wed Oct 22 17:47:54 UTC 2008 Abdullah Sowayan * AMH_AMI/middle_server.cpp: diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp index a9ee13d6fbd..dcb4ef19d7f 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumerMain.cpp @@ -26,7 +26,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char* ecname = "EventService"; for (int i = 0; argv[i] != 0; i++) { - if (ACE_OS::strcmp(argv[i], "-ecname") == 0) { + if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) { if (argv[i+1] != 0) { ecname = argv[i+1]; } else { diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp index cfd9ff0b61e..4735d2e9682 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp @@ -44,7 +44,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char* remote_ecname = 0; const char* iorfile = 0; for (int i = 0; argv[i] != 0; i++) { - if (ACE_OS::strcmp(argv[i], "-ecname") == 0) { + if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) { if (argv[i+1] != 0) { i++; ecname = argv[i]; @@ -52,7 +52,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cerr << "Missing Event channel name" << std::endl; } } - if (ACE_OS::strcmp(argv[i], "-gateway") == 0) { + if (ACE_OS::strcmp(argv[i], ACE_TEXT("-gateway")) == 0) { if (argv[i+1] != 0) { i++; remote_ecname = argv[i]; @@ -60,7 +60,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cerr << "Missing Event channel name" << std::endl; } } - if (ACE_OS::strcmp(argv[i], "-iorfile") == 0) { + if (ACE_OS::strcmp(argv[i], ACE_TEXT("-iorfile")) == 0) { if (argv[i+1] != 0) { i++; iorfile = argv[i]; diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp index 71511628a2e..9bd23fbe075 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp @@ -26,7 +26,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char* ecname = "EventService"; for (int i = 0; argv[i] != 0; i++) { - if (ACE_OS::strcmp(argv[i], "-ecname") == 0) { + if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) { if (argv[i+1] != 0) { ecname = argv[i+1]; } else { diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 7f15d38e3ca..d6f3314dc7e 100644 --- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -48,40 +48,40 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) int mcast = 1; for (int i = 0; argv[i] != 0; i++) { - if (ACE_OS::strcmp(argv[i], "-ecname") == 0) { + if (ACE_OS::strcmp(argv[i], ACE_TEXT("-ecname")) == 0) { if (argv[i+1] != 0) { i++; ecname = argv[i]; } else { std::cerr << "Missing Event channel name" << std::endl; } - } else if (ACE_OS::strcmp(argv[i], "-address") == 0) { + } else if (ACE_OS::strcmp(argv[i], ACE_TEXT("-address")) == 0) { if (argv[i+1] != 0) { i++; address = argv[i]; } else { std::cerr << "Missing address" << std::endl; } - } else if (ACE_OS::strcmp(argv[i], "-port") == 0) { + } else if (ACE_OS::strcmp(argv[i], ACE_TEXT("-port")) == 0) { if (argv[i+1] != 0) { i++; port = ACE_OS::atoi(argv[i]); } else { std::cerr << "Missing port" << std::endl; } - } else if (ACE_OS::strcmp(argv[i], "-listenport") == 0) { + } else if (ACE_OS::strcmp(argv[i], ACE_TEXT("-listenport")) == 0) { if (argv[i+1] != 0) { i++; listenport = ACE_OS::atoi(argv[i]); } else { std::cerr << "Missing port" << std::endl; } - } else if (ACE_OS::strcmp(argv[i], "-iorfile") == 0) { + } else if (ACE_OS::strcmp(argv[i], ACE_TEXT("-iorfile")) == 0) { if (argv[i+1] != 0) { i++; iorfile = argv[i]; } - } else if (ACE_OS::strcmp(argv[i], "-udp") == 0) { + } else if (ACE_OS::strcmp(argv[i], ACE_TEXT("-udp")) == 0) { mcast = 0; } } diff --git a/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp b/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp index 5098d2cd525..7659b23a2cd 100644 --- a/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp +++ b/TAO/DevGuideExamples/ImplRepo/IORTable/MessengerClient.cpp @@ -11,7 +11,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { std::cerr << "Error: Must specify the name of an IOR file." << std::endl; return 1; } - ACE_CString ior = "file://"; + ACE_TString ior = ACE_TEXT("file://"); ior += argv[1]; CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp index 8b404d78311..6f2c99971e9 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" #include -NamingTask::NamingTask (int argc, char** argv) +NamingTask::NamingTask (int argc, ACE_TCHAR** argv) : argc_ (argc), argv_ (argv), initialized_(false) diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h index 5eb20293403..647b32f0a8f 100644 --- a/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h +++ b/TAO/DevGuideExamples/NamingService/Naming_Server/NamingTask.h @@ -9,14 +9,14 @@ class NamingTask : public ACE_Task { public: - NamingTask (int argc, char** argv); + NamingTask (int argc, ACE_TCHAR** argv); virtual int svc(); void waitInit (); void end(); private: int argc_; - char **argv_; + ACE_TCHAR **argv_; CORBA::ORB_var orb_; bool initialized_; }; diff --git a/TAO/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp index 98132b8f7ca..e71d7dc2b36 100644 --- a/TAO/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp +++ b/TAO/DevGuideExamples/NamingService/corbaloc_Messenger/MessengerClient.cpp @@ -10,7 +10,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); - const char* url = "corbaloc:rir:/NameService"; // default URL to InitRef + const ACE_TCHAR* url = ACE_TEXT("corbaloc:rir:/NameService"); // default URL to InitRef if ( argc < 2 ) { std::cout << "Defaulting URL to " << url << std::endl; std::cout << "Usage: " << argv[0] diff --git a/TAO/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp index 474cdfbdada..9c8104ebaa5 100644 --- a/TAO/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp +++ b/TAO/DevGuideExamples/NamingService/corbaname_Messenger/MessengerClient.cpp @@ -3,13 +3,14 @@ #include "MessengerC.h" #include "orbsvcs/CosNamingC.h" #include + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); - const char *url = "corbaname:rir:#example/Messenger"; // default URL to InitRef + const ACE_TCHAR *url = ACE_TEXT("corbaname:rir:#example/Messenger"); // default URL to InitRef if ( argc < 2 ) { std::cout << "Defaulting URL to " << url << std::endl; std::cout << "Usage: " << argv[0] -- cgit v1.2.1