diff options
-rw-r--r-- | TAO/ChangeLog | 21 | ||||
-rw-r--r-- | TAO/examples/Callback_Quoter/Consumer_Handler.cpp | 4 | ||||
-rw-r--r-- | TAO/examples/Callback_Quoter/Consumer_Handler.h | 2 | ||||
-rw-r--r-- | TAO/examples/Callback_Quoter/Supplier_i.cpp | 4 | ||||
-rw-r--r-- | TAO/examples/Callback_Quoter/Supplier_i.h | 2 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Identity_Client.h | 2 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Identity_Server.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Load_Balancing_Service.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/Logging/Logger_i.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/Logging/Logging_Service_i.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/Logging/Logging_Service_i.h | 2 | ||||
-rw-r--r-- | TAO/examples/OBV/Typed_Events/Client_i.h | 2 | ||||
-rw-r--r-- | TAO/examples/Persistent_Grid/Grid_Client_i.h | 2 | ||||
-rw-r--r-- | TAO/examples/Persistent_Grid/Persistent_Client.h | 2 | ||||
-rw-r--r-- | TAO/examples/Persistent_Grid/Simple_util.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/Quoter/client.cpp | 2 | ||||
-rw-r--r-- | TAO/examples/Simple/bank/Bank_Client_i.h | 2 | ||||
-rw-r--r-- | TAO/examples/Simple/grid/Grid_Client_i.h | 2 |
18 files changed, 40 insertions, 19 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 01af31f054e..61acd757a6a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,24 @@ +Fri Oct 3 11:08:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Callback_Quoter/Consumer_Handler.cpp + * examples/Callback_Quoter/Consumer_Handler.h + * examples/Callback_Quoter/Supplier_i.cpp + * examples/Callback_Quoter/Supplier_i.h + * examples/Load_Balancing/Identity_Client.h + * examples/Load_Balancing/Identity_Server.cpp + * examples/Load_Balancing/Load_Balancing_Service.cpp + * examples/Logging/Logger_i.cpp + * examples/Logging/Logging_Service_i.cpp + * examples/Logging/Logging_Service_i.h + * examples/OBV/Typed_Events/Client_i.h + * examples/Persistent_Grid/Grid_Client_i.h + * examples/Persistent_Grid/Persistent_Client.h + * examples/Persistent_Grid/Simple_util.cpp + * examples/Quoter/client.cpp + * examples/Simple/bank/Bank_Client_i.h + * examples/Simple/grid/Grid_Client_i.h + ACE_TCHAR fixes + Thu Oct 2 19:25:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Kokyu_dsrt_schedulers/fp_example/server.cpp diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 8871e69fb2f..8f3ecd1682e 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -62,7 +62,7 @@ Consumer_Handler::~Consumer_Handler (void) // Reads the Server factory IOR from a file. int -Consumer_Handler::read_ior (char *filename) +Consumer_Handler::read_ior (ACE_TCHAR *filename) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (filename, 0); @@ -70,7 +70,7 @@ Consumer_Handler::read_ior (char *filename) if (f_handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for reading: %p\n", - ACE_TEXT_CHAR_TO_TCHAR (filename)), + filename), -1); ACE_Read_Buffer ior_buffer (f_handle); diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h index 1afb85124f7..853a2f9f401 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h @@ -94,7 +94,7 @@ private: CORBA::ORB_var orb_; // Our orb. - int read_ior (char *filename); + int read_ior (ACE_TCHAR *filename); // Function to read the server IOR from a file. int parse_args (void); diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index 88bbe57e145..ceab107ed10 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -54,7 +54,7 @@ Supplier::~Supplier (void) // Reads the Server factory IOR from a file. int -Supplier::read_ior (char *filename) +Supplier::read_ior (ACE_TCHAR *filename) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (filename, 0); @@ -62,7 +62,7 @@ Supplier::read_ior (char *filename) if (f_handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for reading\n", - ACE_TEXT_CHAR_TO_TCHAR (filename)), + filename), -1); ACE_Read_Buffer ior_buffer (f_handle); diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h index 47114de719c..b1b70dd244e 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.h +++ b/TAO/examples/Callback_Quoter/Supplier_i.h @@ -65,7 +65,7 @@ private: CORBA::ORB_var orb_; // Remember our orb. - int read_ior (char *filename); + int read_ior (ACE_TCHAR *filename); // Function to read the Notifier IOR from a file. int parse_args (void); diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h index a0bc744ebf5..aa8123ad750 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.h +++ b/TAO/examples/Load_Balancing/Identity_Client.h @@ -64,7 +64,7 @@ private: TAO_ORB_Manager orb_manager_; // The ORB manager. - const char *group_factory_ior_; + const ACE_TCHAR *group_factory_ior_; // The ior of the <Object_Group_Factory> object we shall use to // to obtain an <Object_Group> object. diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 05a35f9a744..49047e878fb 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -66,7 +66,7 @@ Identity_Server::parse_args (int argc, ACE_TCHAR *argv[]) int Identity_Server::init (int argc, - char* argv[]) + ACE_TCHAR* argv[]) { int result; diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index b11ca8067da..a7232ca9a76 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -61,7 +61,7 @@ Load_Balancing_Service::parse_args (int argc, ACE_TCHAR *argv[]) int Load_Balancing_Service::init (int argc, - char* argv[]) + ACE_TCHAR* argv[]) { int result; CORBA::String_var ior; diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 58d9e384606..7fe7a04a76c 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -142,7 +142,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, ACE_TCHAR msgbuf [ACE_MAXLOGMSGLEN + 4]; // Format the message for proper display. - ACE_OS::strcpy (msgbuf, "::"); + ACE_OS::strcpy (msgbuf, ACE_TEXT("::")); // Copy the message data into the temporary buffer ACE_OS::strncat (msgbuf, diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 95d4dff9ab7..ad35b282a65 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Logging_Service, Logging_Service_i, "$Id$") Logger_Server::Logger_Server (void) - :service_name_ (const_cast<char *> ("LoggingService")) + :service_name_ (ACE_TEXT("LoggingService")) { // Do nothing } diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index 6b9c07532f0..c30a6eb342b 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -93,7 +93,7 @@ private: ACE_TCHAR **argv_; // commandline arguments. - char* service_name_; + const ACE_TCHAR* service_name_; // The id to give the Logger_Factory instance (defaults to // "LoggingService") }; diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h index 7dc2d3eb2e3..72894ea1a58 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.h +++ b/TAO/examples/OBV/Typed_Events/Client_i.h @@ -46,7 +46,7 @@ public: virtual ~Checkpoint_Client_i (void); // Destructor - virtual int run (const char *,int, char** ); + virtual int run (const char *,int, ACE_TCHAR** ); // Execute the methods private: diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.h b/TAO/examples/Persistent_Grid/Grid_Client_i.h index 44c48de5c28..082c0d87bbb 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.h +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.h @@ -39,7 +39,7 @@ public: virtual ~Grid_Client_i (void); // Destructor - virtual int run (const char *, int, char *[]); + virtual int run (const char *, int, ACE_TCHAR *[]); // Execute the methods. virtual int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/examples/Persistent_Grid/Persistent_Client.h b/TAO/examples/Persistent_Grid/Persistent_Client.h index 93f1de5f419..93ad2fd9e99 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client.h +++ b/TAO/examples/Persistent_Grid/Persistent_Client.h @@ -39,7 +39,7 @@ public: virtual ~Persistent_Client_i (void); // Destructor - virtual int run (const char *, int, char *[]); + virtual int run (const char *, int, ACE_TCHAR *[]); // Execute the methods. virtual int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index 16cfb95b5ed..c975d826b82 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -45,7 +45,7 @@ Server<Servant>::parse_args (void) if (this->ior_output_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Unable to open %s for writing: %p\n", - ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())), -1); + get_opts.opt_arg ()), -1); break; case 'm': diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index 3194cde40f0..6ebd3607fdd 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -358,7 +358,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int threads = 1; for (i = 0; i < argc; i++) - if (ACE_OS::strcmp (argv[i], "-n") == 0) + if (ACE_OS::strcmp (argv[i], ACE_TEXT("-n")) == 0) threads = ACE_OS::atoi(argv[i + 1]); Quoter_Task **clients = new Quoter_Task*[threads]; diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h index 44fa6e2d4d4..c202e0e1d24 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.h +++ b/TAO/examples/Simple/bank/Bank_Client_i.h @@ -40,7 +40,7 @@ public: virtual ~Bank_Client_i (void); // Destructor - virtual int run (const char *, int, char *[]); + virtual int run (const char *, int, ACE_TCHAR *[]); // Execute the methods. private: diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h index 1e5c0e27764..013914eebc3 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.h +++ b/TAO/examples/Simple/grid/Grid_Client_i.h @@ -39,7 +39,7 @@ public: virtual ~Grid_Client_i (void); // Destructor - virtual int run (const char *, int, char *[]); + virtual int run (const char *, int, ACE_TCHAR *[]); // Execute the methods. virtual int parse_args (int argc, ACE_TCHAR *argv[]); |