ChangeLogTag: Mon Jun 30 15:05:00 UTC 2008 Simon Massey <sma at prismtech dot com>

4 files changed, 15 insertions, 15 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index c1d4fd0f26e..b74633ec3ea 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -8,7 +8,7 @@
 static FILE *output_file = 0;
 // File handle of the file into which received data is written.
 
-static const char *output_file_name = "output";
+static const ACE_TCHAR *output_file_name = ACE_TEXT ("output");
 // File name of the file into which received data is written.
 
 int endstream = 0;
@@ -92,7 +92,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **)
+                ACE_TCHAR *[])
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -135,7 +135,7 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+            ACE_TCHAR *argv[])
 {
   // Parse the command line arguments
   ACE_Get_Opt opts (argc,
@@ -161,8 +161,8 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
   try
     {
@@ -201,7 +201,7 @@ main (int argc,
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
-                           ACE_TEXT_CHAR_TO_TCHAR (output_file_name)),
+                           output_file_name),
                           -1);
 
       else
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 02e0d800987..5e813d38c08 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -83,7 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR *argv[]);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 0dc42d655a5..be006606cd8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -55,7 +55,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 
 int
 Sender::parse_args (int argc,
-                    char **argv)
+                    ACE_TCHAR *argv[])
 {
   // Parse command line arguments
   ACE_Get_Opt opts (argc, argv, "f:p:r:d");
@@ -66,10 +66,10 @@ Sender::parse_args (int argc,
       switch (c)
         {
         case 'f':
-          this->filename_ = opts.opt_arg ();
+          this->filename_ = ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ());
           break;
         case 'p':
-          this->protocol_ = opts.opt_arg ();
+          this->protocol_ = ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ());
           break;
         case 'r':
           this->frame_rate_ = ACE_OS::atoi (opts.opt_arg ());
@@ -111,7 +111,7 @@ Sender::bind_to_receiver (void)
 
 int
 Sender::init (int argc,
-              char **argv)
+              ACE_TCHAR *argv[])
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -326,8 +326,8 @@ Sender::pace_data (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 014c827d70a..687bdfec133 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -62,7 +62,7 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR *argv[]);
   // Method to initialize the various data components.
 
   int pace_data (void);
@@ -72,7 +72,7 @@ public:
   // Set the protocol object corresponding to the transport protocol chosen.
 
 private:
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Method to parse the command line arguments.
 
   int bind_to_receiver (void);