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

1 files changed, 9 insertions, 9 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 03626895a55..b3f3cc5f1c8 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -11,7 +11,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_stat.h"
 
-static const char* ior = "file://supplier.ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://supplier.ior");
 static CORBA::Short order_policy = CosNotification::FifoOrder;
 static int expected = 30; // Must match the amount sent by supplier
 static Notify_Sequence_Push_Consumer* consumer_1;
@@ -20,12 +20,12 @@ static bool use_ordering = false;
 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, "ok:e:d:");
   int c;
@@ -47,16 +47,16 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
     case 'd':
       {
-        const char* order = get_opts.optarg;
-        if (ACE_OS::strcmp (order, "fifo") == 0)
+        const ACE_TCHAR *order = get_opts.optarg;
+        if (ACE_OS::strcmp (order, ACE_TEXT ("fifo")) == 0)
         {
           order_policy = CosNotification::FifoOrder;
         }
-        else if (ACE_OS::strcmp (order, "priority") == 0)
+        else if (ACE_OS::strcmp (order, ACE_TEXT ("priority")) == 0)
         {
           order_policy = CosNotification::PriorityOrder;
         }
-        else if (ACE_OS::strcmp (order, "deadline") == 0)
+        else if (ACE_OS::strcmp (order, ACE_TEXT ("deadline")) == 0)
         {
           order_policy = CosNotification::DeadlineOrder;
 #if !defined (ACE_HAS_TIMED_MESSAGE_BLOCKS)
@@ -121,7 +121,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
   consumer_1->_connect (admin);
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
   {
@@ -136,7 +136,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 ());