diff options
32 files changed, 82 insertions, 47 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6ca5bc42b76..a05e4ab7e67 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,38 @@ +Wed Oct 8 13:19:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp + * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h + * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp + * orbsvcs/Fault_Notifier/FT_Notifier_i.h + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h + * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp + * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp + * orbsvcs/tests/Event/Mcast/Simple/consumer.cpp + * orbsvcs/tests/Event/Mcast/Simple/supplier.cpp + * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp + * orbsvcs/tests/Event/Performance/Connect.cpp + * orbsvcs/tests/Event/Performance/Inversion.cpp + * orbsvcs/tests/Event/ThreadFlags/testflags.cpp + * orbsvcs/tests/Event/UDP/receiver.cpp + * orbsvcs/tests/Event/UDP/sender.cpp + * orbsvcs/tests/FT_App/FT_Client.cpp + * orbsvcs/tests/FT_App/FT_Creator.cpp + * orbsvcs/tests/FT_App/FT_Creator.h + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h + * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp + * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h + * orbsvcs/tests/FT_App/StubBatchConsumer.cpp + * orbsvcs/tests/FT_App/StubBatchConsumer.h + * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp + * orbsvcs/tests/FT_App/StubFaultAnalyzer.h + * orbsvcs/tests/FT_App/StubFaultConsumer.cpp + * orbsvcs/tests/FT_App/StubFaultConsumer.h + * orbsvcs/tests/FT_App/StubFaultNotifier.cpp + * orbsvcs/tests/FT_App/StubFaultNotifier.h + ACE_TCHAR fixes + Wed Oct 8 13:16:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Utils/Server_Main.cpp: diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index ab7d5c60913..e6f9d3de782 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -93,7 +93,7 @@ TAO::FT_ReplicationManager::~FT_ReplicationManager (void) } //public -int TAO::FT_ReplicationManager::parse_args (int argc, char * argv[]) +int TAO::FT_ReplicationManager::parse_args (int argc, ACE_TCHAR * argv[]) { ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("n:o:f:")); int c; diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index c8f1b65c95e..23132c142c9 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -104,7 +104,7 @@ namespace TAO * @param argv traditional C argv * @return zero for success; nonzero is process return code for failure. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize this object. diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 823d5b1fefb..62da1afcc8a 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -125,7 +125,7 @@ int TAO::FT_FaultDetectorFactory_i::write_ior() ////////////////////////////////////////////////////// // FT_FaultDetectorFactory_i public, non-CORBA methods -int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, char * argv[]) +int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, ACE_TCHAR * argv[]) { ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("d:l:o:qr")); int c; diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index 8fc5a11b2bf..b15824ff170 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -110,7 +110,7 @@ namespace TAO * @param argv traditional C argv * @return zero for success; nonzero is process return code for failure. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize this object. diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 07861f0d4fa..7bf24a5e27d 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -145,7 +145,7 @@ int TAO::FT_FaultNotifier_i::write_ior() ////////////////////////////////////////////////////// // FT_FaultNotifier_i public, non-CORBA methods -int TAO::FT_FaultNotifier_i::parse_args (int argc, char * argv[]) +int TAO::FT_FaultNotifier_i::parse_args (int argc, ACE_TCHAR * argv[]) { ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:rq")); int c; diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index fad9523fb34..481db0924d4 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -60,7 +60,7 @@ namespace TAO * @param argv traditional C argv * @return zero for success; nonzero is process return code for failure. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize this object. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 8d93fa1ee73..0694c7b8b5c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -247,8 +247,8 @@ ECT_Consumer_Driver::dump_results (void) ACE_Throughput_Stats throughput; for (int i = 0; i < this->n_consumers_; ++i) { - char buf[BUFSIZ]; - ACE_OS::sprintf (buf, "consumer_%02d", i); + ACE_TCHAR buf[BUFSIZ]; + ACE_OS::sprintf (buf, ACE_TEXT("consumer_%02d"), i); this->consumers_[i]->dump_results (buf, gsf); this->consumers_[i]->accumulate (throughput); diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 384eb11560b..8a7d79dc677 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -110,7 +110,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNaming::NamingContextExt::_narrow(tmpobj.in()); // Bind the Event Channel using Naming Services - CosNaming::Name_var name = + CosNaming::Name_var name = root_context->to_name (ACE_TEXT_ALWAYS_CHAR (ecname)); root_context->rebind(name.in(), ec.in()); @@ -226,7 +226,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #if !defined (TAO_LACKS_EVENT_CHANNEL_ANY) // Initialize data fields in event. - const CORBA::String_var eventData = + const CORBA::String_var eventData = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR (ecname)); event[0].data.any_value <<= eventData; @@ -242,7 +242,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (iorfile != 0) { CORBA::String_var str = orb->object_to_string( ec.in() ); - std::ofstream iorFile( iorfile ); + std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(iorfile) ); iorFile << str.in() << std::endl; iorFile.close(); } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 13da5f5ea4d..ce905b3945c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -91,7 +91,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) } int -parse_args (int /* argc */, char ** /* argv */) +parse_args (int /* argc */, ACE_TCHAR ** /* argv */) { return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index 15f225d8715..5148c468c6d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -36,7 +36,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) } int -parse_args (int /*argc*/, char ** /*argv*/) +parse_args (int /*argc*/, ACE_TCHAR ** /*argv*/) { return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index e46af7aeab8..cfe01d9b337 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -540,7 +540,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message) } int -parse_args (int argc, char ** argv) +parse_args (int argc, ACE_TCHAR ** argv) { ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("d")); int opt; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index d34d8ae0dac..1b1145d67dc 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -44,18 +44,18 @@ EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[]) { const ACE_TCHAR *arg = arg_shifter.get_current (); - if (ACE_OS::strcmp (arg, "-connection_order") == 0) + if (ACE_OS::strcmp (arg, ACE_TEXT("-connection_order")) == 0) { arg_shifter.consume_arg (); if (arg_shifter.is_parameter_next ()) { const ACE_TCHAR* opt = arg_shifter.get_current (); - if (ACE_OS::strcasecmp (opt, "consumers") == 0) + if (ACE_OS::strcasecmp (opt, ACE_TEXT("consumers")) == 0) this->order_ = 0; - else if (ACE_OS::strcasecmp (opt, "suppliers") == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("suppliers")) == 0) this->order_ = 1; - else if (ACE_OS::strcasecmp (opt, "interleaved") == 0) + else if (ACE_OS::strcasecmp (opt, ACE_TEXT("interleaved")) == 0) this->order_ = 2; else ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index ac1fc1155ec..6b240c1f941 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -27,7 +27,7 @@ EC_Inversion::EC_Inversion (void) } int -EC_Inversion::parse_args (int &argc, char *argv []) +EC_Inversion::parse_args (int &argc, ACE_TCHAR *argv []) { ACE_Arg_Shifter arg_shifter (argc, argv); @@ -35,7 +35,7 @@ EC_Inversion::parse_args (int &argc, char *argv []) { const ACE_TCHAR *arg = arg_shifter.get_current (); - if (ACE_OS::strcmp (arg, "-same_events") == 0) + if (ACE_OS::strcmp (arg, ACE_TEXT("-same_events")) == 0) { arg_shifter.consume_arg (); this->same_events_ = 1; diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp index db920afaee4..9ced5ca501e 100644 --- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp +++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp @@ -163,7 +163,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) const size_t numtests = sizeof(static_tests)/sizeof(static_tests[0]); if (argc > 1) { - char* which_test; + ACE_TCHAR* which_test = 0; while (0 != (which_test = *++argv)) { size_t testnum = ACE_OS_String::strtol (which_test, 0, 0); diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index 5ecf50fc613..28acb1bb434 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -309,7 +309,7 @@ int parse_args (int argc, ACE_TCHAR *argv[]) switch (c) { case 'm': - udp_mcast_address = get_opts.opt_arg (); + udp_mcast_address = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()); break; case 'v': diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp index aa396d73190..745e27980b4 100644 --- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp @@ -260,7 +260,7 @@ int parse_args (int argc, ACE_TCHAR *argv[]) switch (c) { case 'm': - udp_mcast_address = get_opts.opt_arg (); + udp_mcast_address = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()); break; case 'v': diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index ecbbaa27761..b929abce96a 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -55,8 +55,8 @@ private: CORBA::ORB_var orb_; int argc_; - char ** argv_; - const char * inFileName_; + ACE_TCHAR ** argv_; + const ACE_TCHAR * inFileName_; FILE *inFile_; FILE *commandIn_; @@ -196,7 +196,7 @@ FTClientMain::parse_args (int argc, ACE_TCHAR *argv[]) } case 'f': { - replica_iors_.push_back(get_opts.opt_arg ()); + replica_iors_.push_back(ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())); break; } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 8645266cdb2..f8de0ad8a40 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -52,12 +52,12 @@ FTAPP::FT_Creator::parse_args (int argc, ACE_TCHAR *argv[]) { case 'r': { - this->create_roles_.push_back (get_opts.opt_arg ()); + this->create_roles_.push_back (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())); break; } case 'u': { - this->unregister_roles_.push_back (get_opts.opt_arg ()); + this->unregister_roles_.push_back (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())); break; } case 'f': @@ -86,7 +86,7 @@ FTAPP::FT_Creator::parse_args (int argc, ACE_TCHAR *argv[]) case 'p': { - this->prefix_ = get_opts.opt_arg(); + this->prefix_ = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg()); break; } diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h index 76b04e8bb2d..56b9c55e68b 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h @@ -69,7 +69,7 @@ namespace FTAPP TAO::Object_Group_Creator creator_; CORBA::ORB_var orb_; - const char * registry_ior_; + const ACE_TCHAR * registry_ior_; StringVec create_roles_; StringVec unregister_roles_; diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index bb4aedec65c..81455a3f63d 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -158,7 +158,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior) ////////////////////////////////////////////////////// // FT_ReplicaFactory_i public, non-CORBA methods -int FT_ReplicaFactory_i::parse_args (int argc, char * argv[]) +int FT_ReplicaFactory_i::parse_args (int argc, ACE_TCHAR * argv[]) { ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:f:i:l:t:qu")); int c; diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index 627bc9ceec4..fec1751af4b 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -67,7 +67,7 @@ public: * @param argv traditional C argv * @return zero for success; nonzero is process return code for failure. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize this object. diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index b6756819aa1..46b3c18c63c 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -35,7 +35,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const } -int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[]) +int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, ACE_TCHAR * argv[]) { int optionError = 0; ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:")); diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index de87010da8e..89f1395931f 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h @@ -38,7 +38,7 @@ public: /** * Parse command line arguments. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize this object diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 34065840e40..70ccfbf26f6 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -17,7 +17,7 @@ StubBatchConsumer::~StubBatchConsumer () } -int StubBatchConsumer::parse_args (int argc, char * argv[]) +int StubBatchConsumer::parse_args (int argc, ACE_TCHAR * argv[]) { ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index 2712f5bbdf3..e38d27d010e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -44,7 +44,7 @@ public: /** * Parse command line arguments. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Publish this objects IOR. diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index dbbacfefea1..5d123ccb437 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -22,7 +22,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer () } -int StubFaultAnalyzer::parse_args (int argc, char * argv[]) +int StubFaultAnalyzer::parse_args (int argc, ACE_TCHAR * argv[]) { int optionError = 0; ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:")); @@ -33,7 +33,7 @@ int StubFaultAnalyzer::parse_args (int argc, char * argv[]) { case 'r': { - this->replicaIORs.push_back (get_opts.opt_arg ()); + this->replicaIORs.push_back (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ())); break; } case 'd': diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h index eec5a427da0..5ec22256ee1 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h @@ -43,7 +43,7 @@ public: /** * Parse command line arguments. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize this object @@ -71,7 +71,7 @@ public: ///////////////// // Implementation private: - int readIORFile(const char * fileName, CORBA::String_var & ior); + int readIORFile(const ACE_TCHAR * fileName, CORBA::String_var & ior); /////////////// // Data Members @@ -99,19 +99,19 @@ private: /** * a file to write to to signal "ready" */ - const char * readyFile_; + const ACE_TCHAR * readyFile_; /** * The detecor's IOR (-d option) */ - const char * detector_ior_; + const ACE_TCHAR * detector_ior_; ::FT::FaultDetectorFactory_var factory_; /** * The notifier's IOR (-n option) */ - const char * notifier_ior_; + const ACE_TCHAR * notifier_ior_; ::FT::FaultNotifier_var notifier_; diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index c46b4459b51..2aa86ed70b9 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -33,7 +33,7 @@ size_t StubFaultConsumer::notifications () const } -int StubFaultConsumer::parse_args (int argc, char * argv[]) +int StubFaultConsumer::parse_args (int argc, ACE_TCHAR * argv[]) { int optionError = 0; #ifndef NO_ARGS_FOR_NOW diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 89a59f19b28..67f4f0dea81 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -46,7 +46,7 @@ public: /** * Parse command line arguments. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Publish this objects IOR. diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index 944a2f59b68..a2182b085e1 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -32,7 +32,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const return this->object_id_.in(); } -int StubFaultNotifier::parse_args (int argc, char * argv[]) +int StubFaultNotifier::parse_args (int argc, ACE_TCHAR * argv[]) { int optionError = 0; ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:")); diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h index 5b336720dd1..4bf155d7beb 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h @@ -43,7 +43,7 @@ public: /** * Parse command line arguments. */ - int parse_args (int argc, char * argv[]); + int parse_args (int argc, ACE_TCHAR * argv[]); /** * Initialize. |