ChangeLogTag: Wed Jun 18 13:50:00 UTC 2008 Simon Massey <sma at prismtech dot com>

9 files changed, 62 insertions, 71 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9992e91d5e9..335487f36c7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Jun 18 13:50:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * examples/Buffered_AMI/client.cpp:
+        * examples/Buffered_Oneways/client.cpp:
+        * examples/Callback_Quoter/Consumer_Handler.cpp:
+        * examples/Callback_Quoter/Supplier_i.cpp:
+        * examples/Event_Comm/Consumer_Handler.cpp:
+        * examples/Event_Comm/Notifier_Handler.cpp:
+        * examples/Persistent_Grid/Simple_util.cpp:
+        * examples/Simple/Simple_util.cpp:
+
+          Correct Fuzz errors concerning Wide character build compatabily
+          with ORB_init().
+
 Wed Jun 18 13:22:00 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tests/Hello/run_test.pl:
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index 9bc9a2ce668..dac290cf74c 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -25,7 +25,7 @@ ACE_RCSID (Buffered_AMI,
            "$Id$")
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 // Default iterations.
 static CORBA::ULong iterations = 20;
@@ -95,7 +95,7 @@ public:
 };
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "a:b:k:m:i:t:x");
   int c;
@@ -234,16 +234,14 @@ setup_buffering_constraints (CORBA::ORB_ptr orb)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -257,7 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         PortableServer::POA::_narrow (base.in ());
 
       // Get an object reference from the argument string.
-      base = orb->string_to_object (IOR);
+      base = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index af8060f2195..634a9cbadc1 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -23,7 +23,7 @@
 ACE_RCSID(Buffered_Oneways, client, "$Id$")
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 // Default iterations.
 static CORBA::ULong iterations = 20;
@@ -48,7 +48,7 @@ static long interval = 1000;
 static int shutdown_server = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:f:c:b:i:z:t:x");
   int c;
@@ -114,16 +114,14 @@ parse_args (int argc, char **argv)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -132,7 +130,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var base =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (base.in ());
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 891a3a59f64..960c8590b39 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -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",
-                       filename),
+                       ACE_TEXT_CHAR_TO_TCHAR (filename)),
                       -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -114,7 +114,7 @@ Consumer_Handler::parse_args (void)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from %s : %p\n",
-                             get_opts.opt_arg ()),
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())),
                             -1);
         break;
 
@@ -148,7 +148,7 @@ Consumer_Handler::parse_args (void)
                            " [-a stock_name]"
                            " [-t threshold]"
                            "\n",
-                           this->argv_ [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->argv_ [0])),
                           -1);
       }
 
@@ -208,10 +208,7 @@ Consumer_Handler::init (int argc, char **argv)
   try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    0);
-
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -267,7 +264,7 @@ Consumer_Handler::init (int argc, char **argv)
           if (this->ior_ == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "%s: no ior specified\n",
-                               this->argv_[0]),
+                               ACE_TEXT_CHAR_TO_TCHAR (this->argv_[0])),
                               -1);
 
           CORBA::Object_var server_object =
@@ -276,7 +273,7 @@ Consumer_Handler::init (int argc, char **argv)
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "invalid ior <%s>\n",
-                               this->ior_),
+                               ACE_TEXT_CHAR_TO_TCHAR (this->ior_)),
                               -1);
           // The downcasting from CORBA::Object_var to Notifier_var is
           // done using the <_narrow> method.
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index ed4683d995f..bd315df5fa6 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -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",
-                        filename),
+                        ACE_TEXT_CHAR_TO_TCHAR (filename)),
                         -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -107,8 +107,7 @@ Supplier::parse_args (void)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read stock information from %s : %p\n",
-                             get_opts.opt_arg (),
-                             "get_args"),
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())),
                             -1);
         break;
 
@@ -121,8 +120,7 @@ Supplier::parse_args (void)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from %s : %p\n",
-                             get_opts.opt_arg (),
-                             "get_args"),
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())),
                             -1);
         break;
 
@@ -142,7 +140,7 @@ Supplier::parse_args (void)
                            " [-x]"
                            " [-s]"
                            "\n",
-                           this->argv_ [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->argv_ [0])),
                           -1);
       }
 
@@ -257,13 +255,10 @@ Supplier::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-
   try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    0);
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -282,7 +277,7 @@ Supplier::init (int argc, char **argv)
       if (this->ior_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%s: no ior specified\n",
-                           this->argv_[0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->argv_[0])),
                           -1);
       CORBA::Object_var notifier_object =
         this->orb_->string_to_object (this->ior_);
@@ -290,7 +285,7 @@ Supplier::init (int argc, char **argv)
       if (CORBA::is_nil (notifier_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "invalid ior <%s>\n",
-                           this->ior_),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->ior_)),
                           -1);
       // The downcasting from CORBA::Object_var to Notifier_var is
       // done using the <_narrow> method.
@@ -324,13 +319,14 @@ Supplier::read_file (char *filename)
   f_ptr_ = ACE_OS::fopen (filename, "r");
 
   ACE_DEBUG ((LM_DEBUG,
-              "filename = %s\n",filename));
+              "filename = %s\n",
+              ACE_TEXT_CHAR_TO_TCHAR (filename)));
 
   // the stock values are to be read from a file.
   if (f_ptr_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open %s for writing: %p\n",
-                       filename),
+                       ACE_TEXT_CHAR_TO_TCHAR (filename)),
                       -1);
   return 0;
 }
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index b471eba752f..61b223f2d41 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -36,12 +36,10 @@ Consumer_Handler::init (int argc,
   try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA");
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (poa_object.in ());
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 4df1cb9b4ac..eef7c29dde6 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -88,12 +88,10 @@ Notifier_Handler::init (int argc,
  try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA");
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (poa_object.in ());
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index fa72a968eb8..dd107d2a386 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -11,7 +11,6 @@
 
 // Constructor.
 
-
 template <class Servant>
 Server<Servant>::Server (void)
   : ior_output_file_ (0),
@@ -46,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",
-                             get_opts.opt_arg ()), -1);
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())), -1);
         break;
 
       case 'm':
@@ -59,7 +58,7 @@ Server<Servant>::parse_args (void)
                            " [-d]"
                            " [-o] <ior_output_file>"
                            "\n",
-                           argv_ [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->argv_ [0])),
                           -1);
       }
 
@@ -113,7 +112,7 @@ Server<Servant>::init (const char *servant_name,
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
 
       if (this->ior_output_file_)
         {
@@ -172,7 +171,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename)
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open %s for writing: %p\n",
-                       filename),
+                       ACE_TEXT_CHAR_TO_TCHAR (filename)),
                       -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -214,7 +213,7 @@ Client<InterfaceObj, Var>::parse_args (void)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from %s : %p\n",
-                             get_opts.opt_arg ()),
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())),
                             -1);
         break;
       case 'x': // read the flag for shutting down
@@ -240,13 +239,10 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
   this->argc_ = argc;
   this->argv_ = argv;
 
-
   try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    0);
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -261,7 +257,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "invalid ior <%s>\n",
-                               this->ior_),
+                               ACE_TEXT_CHAR_TO_TCHAR (this->ior_)),
                               -1);
           this->server_ = InterfaceObj::_narrow (server_object.in ());
         }
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index bd153458f12..9418c3c228b 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -48,7 +48,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",
-                             get_opts.opt_arg ()), -1);
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())), -1);
         break;
 
       case 'n': //Use naming service
@@ -67,7 +67,7 @@ Server<Servant>::parse_args (void)
                            " [-i] <InterOperable Naming Service simple object key>"
                            " [-h (help)]"
                            "\n",
-                           argv_ [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->argv_ [0])),
                           -1);
       }
 
@@ -87,8 +87,8 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Adding (KEY:IOR) %s:%s\n",
-                this->ins_,
-                ior.in ()));
+                ACE_TEXT_CHAR_TO_TCHAR (this->ins_),
+                ACE_TEXT_CHAR_TO_TCHAR (ior.in ())));
 
 
   try
@@ -168,7 +168,7 @@ Server<Servant>::init (const char *servant_name,
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
-                  str.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (str.in ())));
 
       if (this->ins_)
         if (this->test_for_ins (str) != 0)
@@ -248,7 +248,7 @@ Server<Servant>::register_name (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Unable to bind %s \n",
-                         name),
+                         ACE_TEXT_CHAR_TO_TCHAR (name)),
                         -1);
     }
 
@@ -276,7 +276,7 @@ Client<INTERFACE_OBJECT, Var>::read_ior (char *filename)
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open %s for writing: %p\n",
-                       filename),
+                       ACE_TEXT_CHAR_TO_TCHAR (filename)),
                       -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -321,7 +321,7 @@ Client<INTERFACE_OBJECT, Var>::parse_args (void)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to read ior from %s : %p\n",
-                             get_opts.opt_arg ()),
+                             ACE_TEXT_CHAR_TO_TCHAR (get_opts.opt_arg ())),
                             -1);
         break;
       case 'x': // read the flag for shutting down
@@ -337,7 +337,7 @@ Client<INTERFACE_OBJECT, Var>::parse_args (void)
                            " [-x (shutdown server)]"
                            " [-h (help)]"
                            "\n",
-                           argv_ [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (this->argv_ [0])),
                           -1);
       }
 
@@ -361,14 +361,10 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
   this->argc_ = argc;
   this->argv_ = argv;
 
-
-
   try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    0);
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -383,7 +379,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "invalid ior <%s>\n",
-                               this->ior_),
+                               ACE_TEXT_CHAR_TO_TCHAR (this->ior_)),
                               -1);
           this->server_ = INTERFACE_OBJECT::_narrow (server_object.in ());
         }