ChangeLogTag: Tue Jul 01 12:18:00 UTC 2008 Simon Massey <sma at prismtech dot com>

2 files changed, 12 insertions, 11 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index 34b829f9524..bdbd8911ad7 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -18,7 +18,7 @@
 // Data Section
 // ******************************************************************
 
-static const char* ior = "file://supplier.ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://supplier.ior");
 static unsigned int low = 32;
 static unsigned int high = 32;
 
@@ -29,12 +29,12 @@ static unsigned int high = 32;
 class Consumer_Client : public Notify_Test_Client
 {
 public:
-  virtual int parse_args (int argc, char* argv[]);
+  virtual int parse_args (int argc, ACE_TCHAR *argv[]);
 };
 
 
 int
-Consumer_Client::parse_args (int argc, char *argv[])
+Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:");
   int c;
@@ -129,7 +129,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int status = 0;
   try
@@ -145,7 +145,7 @@ int main (int argc, char* argv[])
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior);
+                              orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
           sig_var sig = sig::_narrow (object.in ());
 
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 99e64b8d641..77f2e5c4bde 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -26,7 +26,7 @@
 const int PER_BATCH = 16;
 static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
 static int num_batches = 6;  // 6 sets of 16
-static const char* ior_output_file = "supplier.ior";
+static const ACE_TCHAR *ior_output_file = ACE_TEXT ("supplier.ior");
 
 // ******************************************************************
 // Subroutine Section
@@ -74,12 +74,12 @@ private:
 class Supplier_Client : public Notify_Test_Client
 {
 public:
-  virtual int parse_args (int argc, char* argv[]);
+  virtual int parse_args (int argc, ACE_TCHAR *argv[]);
 };
 
 
 int
-Supplier_Client::parse_args (int argc, char *argv[])
+Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "o:e:d");
   int c;
@@ -194,7 +194,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
@@ -222,9 +222,10 @@ int main (int argc, char* argv[])
         FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
-          "Cannot open output file for "
+          "Cannot open output file %s for "
           "writing IOR: %s",
-          ior_output_file),
+          ior_output_file,
+          ACE_TEXT_CHAR_TO_TCHAR (ior.in ())),
           1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);