8 files changed, 14 insertions, 18 deletions

diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 8c001e13797..681994cc00f 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -143,7 +143,7 @@ Activity::activate_job_list (void)
       job = list[i];
 
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Activating job:%s\n", job->name ().c_str ()));
+        ACE_DEBUG ((LM_DEBUG, "Activating job:%C\n", job->name ().c_str ()));
 
       // find your poa
       PortableServer::POA_var host_poa =
@@ -171,7 +171,7 @@ Activity::activate_job_list (void)
                              server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Registered %s with the naming service\n",
+                  "Registered %C with the naming service\n",
                   job_name.c_str ()));
 
       active_job_count_++;
@@ -227,10 +227,10 @@ Activity::activate_schedule (void)
 
               if (priority_model == RTCORBA::CLIENT_PROPAGATED)
                 ACE_DEBUG ((LM_DEBUG,
-                            "%s priority_model = RTCORBA::CLIENT_PROPAGATED\n", task->job ()));
+                            "%C priority_model = RTCORBA::CLIENT_PROPAGATED\n", task->job ()));
               else
                 ACE_DEBUG ((LM_DEBUG,
-                            "%s priority_model = RTCORBA::SERVER_DECLARED\n", task->job ()));
+                            "%C priority_model = RTCORBA::SERVER_DECLARED\n", task->job ()));
             }
         } /*  if (TAO_debug_level > 0) */
 
@@ -238,7 +238,7 @@ Activity::activate_schedule (void)
       task->activate_task (this->barrier_, this->priority_mapping_);
       active_task_count_++;
 
-      ACE_DEBUG ((LM_DEBUG, "Job %s scheduled\n", task->job ()));
+      ACE_DEBUG ((LM_DEBUG, "Job %C scheduled\n", task->job ()));
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Waiting for tasks to synch...\n"));
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 06024f1709b..cdf7533f0f5 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -198,7 +198,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
     }
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "creating POA %s\n", POA_name_.c_str ()));
+    ACE_DEBUG ((LM_DEBUG, "creating POA %C\n", POA_name_.c_str ()));
 
   // Get the POA Manager.
   PortableServer::POAManager_var poa_manager =
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index ba65b81941a..adf7897f900 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -222,7 +222,7 @@ DT_Creator::register_synch_obj (void)
     CORBA::string_dup (synch_name.c_str ());
 
   ACE_DEBUG ((LM_DEBUG,
-        "Synch Name %s\n",
+        "Synch Name %C\n",
         synch_name.c_str ()));
 
   ACE_NEW (synch_,
@@ -301,7 +301,7 @@ DT_Creator::activate_job_list (void)
       job = job_list_[i];
 
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Activating job:%s\n", job->name ().c_str ()));
+        ACE_DEBUG ((LM_DEBUG, "Activating job:%C\n", job->name ().c_str ()));
 
       // find your poa
       PortableServer::POA_var host_poa =
@@ -382,10 +382,10 @@ DT_Creator::activate_schedule (void)
 
       if (priority_model == RTCORBA::CLIENT_PROPAGATED)
         ACE_DEBUG ((LM_DEBUG,
-        "%s priority_model = RTCORBA::CLIENT_PROPAGATED\n", task->job ()));
+        "%C priority_model = RTCORBA::CLIENT_PROPAGATED\n", task->job ()));
       else
         ACE_DEBUG ((LM_DEBUG,
-        "%s priority_model = RTCORBA::SERVER_DECLARED\n", task->job ()));
+        "%C priority_model = RTCORBA::SERVER_DECLARED\n", task->job ()));
       */
     }
         //} /*  if (TAO_debug_level > 0) */
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index e29b54e87b3..cbdf77393e8 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -290,7 +290,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
         "Initialized POA Policy\n"));
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "creating POA %s\n", POA_name_.c_str ()));
+    ACE_DEBUG ((LM_DEBUG, "creating POA %C\n", POA_name_.c_str ()));
 
   // Get the POA Manager.
   PortableServer::POAManager_var poa_manager =
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 16c8a0aff8a..9e32d62cbb8 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -92,7 +92,7 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list)
         binding_list [i].binding_name [0].id.in ();
 
       ACE_DEBUG ((LM_DEBUG,
-      "Synch Name %s\n",
+      "Synch Name %C\n",
       synch_name.c_str ()));
 
       CosNaming::Name name (1);
diff --git a/TAO/examples/ior_corbaloc/client.cpp b/TAO/examples/ior_corbaloc/client.cpp
index ef15988248d..828c18a5efe 100644
--- a/TAO/examples/ior_corbaloc/client.cpp
+++ b/TAO/examples/ior_corbaloc/client.cpp
@@ -18,17 +18,15 @@
 // ============================================================================
 
 #include "ior_corbaloc_client_i.h"
-#include "ace/Argv_Type_Converter.h"
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 {
   try
     {
-      ACE_Argv_Type_Converter atc (argc, argv);
       IOR_corbaloc_Client_i client;
 
       int init_result;
-      init_result = client.init (atc.get_argc (), atc.get_TCHAR_argv ());
+      init_result = client.init (argc, argv);
 
         if (init_result == 0)
           {
diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp
index 78c06186f21..0e7fdd0ff0b 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -34,7 +34,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 
       // Get an object reference using a corbaname: style URL
       CORBA::Object_var obj =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
+        orb->string_to_object (argv[1]);
 
       // Narrow
       corbaloc::Status_var factory =
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
index 3a0fab5d9f9..4211452cc13 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -89,10 +89,8 @@ int
 IOR_corbaloc_Client_i::init (int& argc,
                              ACE_TCHAR *argv[])
 {
-
   try
     {
-
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);