14 files changed, 37 insertions, 54 deletions
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 4207926db61..8720611ff4e 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -65,10 +65,9 @@ Activity::init (int& argc, char *argv []
                 ACE_ENV_ARG_DECL)
 {
   // Copy command line parameter.
-  ACE_Argv_Type_Converter command_line(argc, argv);
+  ACE_Argv_Type_Converter convert(argc, argv);
 
-  this->orb_ = CORBA::ORB_init (command_line.get_argc(),
-                                command_line.get_ASCII_argv(),
+  this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -402,13 +401,13 @@ Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL)
 void
 Activity::create_started_flag_file (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag"))))
+      if ((current_arg = arg_shifter.get_the_parameter ("-Started_Flag")))
         {
           FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w"));
 
@@ -431,8 +430,9 @@ Activity::create_started_flag_file (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder);
 
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
@@ -442,7 +442,7 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER);
+      ACTIVITY::instance()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 346b2c6a414..ea5cef35093 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -24,10 +24,7 @@
 #include "activity_export.h"
 #include "ace/Null_Mutex.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 class Job_i;
 class Periodic_Task;
 class Builder;
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index 0d7054ff5b0..ef8cc8a0296 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -5,7 +5,7 @@ project : orbsvcslib, namingexe, rt_server {
   exename = activity
   // We use macros instead of dynamicflags so that 
   // the symbols will be exported from an exe. 
-  macros += ACTIVITY_BUILD_DLL
+  macros = ACTIVITY_BUILD_DLL
   Source_Files {
     Activity.cpp
     Builder.cpp
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 7ef5a89da40..37a99e01305 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -29,9 +29,9 @@ Builder::~Builder(void)
 int
 Builder::init (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
 
   int task_count = 0;
   int poa_count = 0;
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 20c001a4989..8e5d263de0b 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -16,19 +16,16 @@
 #include "orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 
+class Periodic_Task;
+class Job_i;
+class POA_Holder;
+
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "activity_export.h"
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 class Activity;
-class Periodic_Task;
-class Job_i;
-class POA_Holder;
 
 typedef POA_Holder** POA_LIST;
 typedef Periodic_Task** TASK_LIST;
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 69320dc5323..f20cad63015 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -23,7 +23,7 @@ Job_i::poa (void)
 }
 
 int
-Job_i::init (ACE_Arg_Shifter& arg_shifter)
+Job_i::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
   job_name_ = arg_shifter.get_current (); // Read the name of the Job
   arg_shifter.consume_arg ();
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 8ca42bb86b5..c4df011e570 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -16,10 +16,7 @@
 #include "JobS.h"
 #include "activity_export.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 /**
  * @class Job_i
@@ -34,7 +31,7 @@ class activity_Export Job_i : public POA_Job
   Job_i (void);
 
   /// Init the state of this object.
-  int init (ACE_Arg_Shifter& arg_shifter);
+  int init (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// = Accessors
   const ACE_CString& name (void);
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 07e3f1e97b8..5c9c4755533 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -11,9 +11,9 @@ POA_Holder::POA_Holder (void)
   }
 
 int
-POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
+POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   POA_name_ = arg_shifter.get_current (); // Read the name of the POA
   arg_shifter.consume_arg ();
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 3c056a88fba..8591c1df86a 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -17,10 +17,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "activity_export.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 /**
  * @class POA_Holder
@@ -35,7 +32,7 @@ class activity_Export POA_Holder
   POA_Holder (void);
 
   /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
-  int init (ACE_Arg_Shifter& arg_shifter);
+  int init (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// Activate the new POA using the parameters initialized before.
   void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 03a87bb3a6c..870fac04ecc 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -26,9 +26,9 @@ Periodic_Task::~Periodic_Task ()
 }
 
 int
-Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
+Periodic_Task::init_task (ACE_TArg_Shifter<char>& arg_shifter)
 {
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
@@ -101,7 +101,7 @@ Periodic_Task::job (Job_ptr job)
 }
 
 void
-Periodic_Task::dump_stats (ACE_TCHAR* msg)
+Periodic_Task::dump_stats (char* msg)
 {
   char buf[BUFSIZ];
   ACE_OS::sprintf (buf, "%s%s", name_.c_str (),".dat");
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index ca4c822eeff..a82180a1adf 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -19,12 +19,9 @@
 #include "ace/SString.h"
 #include "JobC.h"
 #include "activity_export.h"
+#include "ace/Arg_Shifter.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 class Task_Stats;
 
 /**
@@ -41,13 +38,13 @@ class activity_Export Periodic_Task : public ACE_Task <ACE_SYNCH>
   ~Periodic_Task ();
 
   /// Init the state of this object.
-  int init_task (ACE_Arg_Shifter& arg_shifter);
+  int init_task (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// Activate this task, synch on the given barrier.
   virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping) = 0;
 
   /// Dump the stats collected.
-  void dump_stats (ACE_TCHAR* msg);
+  void dump_stats (char* msg);
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index bcd6ae53d88..1ef20b42e0b 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -55,10 +55,10 @@ Task_Stats::end_time (ACE_hrtime_t time)
 }
 
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+Task_Stats::dump_samples (const char *file_name, const char *msg,
                           ACE_UINT32 scale_factor)
 {
-  FILE* output_file = ACE_OS::fopen (file_name, "w");
+  FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w"));
 
   // first dump what the caller has to say.
   ACE_OS::fprintf (output_file, "%s\n",msg);
@@ -67,7 +67,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
 
   // calc throughput.
 
-  ACE_TCHAR out_msg[BUFSIZ];
+  char out_msg[BUFSIZ];
 
   ACE_hrtime_t elapsed_microseconds = (end_time_ - base_time_) / scale_factor;
   double elapsed_seconds =
@@ -99,12 +99,12 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
 }
 
 void
-Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf)
+Task_Stats::dump_latency_stats (char *out_msg, ACE_UINT32 sf)
 {
   if (this->samples_count_ == 0u)
     {
       ACE_OS::sprintf (out_msg,
-                       ACE_TEXT ("# no data collected\n"));
+                       "# no data collected\n");
       return;
     }
 
@@ -141,7 +141,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf)
     ACE_UINT32 tmax = ACE_CU64_TO_CU32 (tmax_);
 
     ACE_OS::sprintf(out_msg,
-                  ACE_TEXT ("#latency   : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"),
+                  "#latency   : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n",
                   l_min, this->exec_time_min_at_,
                   l_avg,
                   l_max, this->exec_time_max_at_,
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h
index 8252c071c89..dcfb00a145b 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -61,10 +61,10 @@ class activity_Export Task_Stats
   /// Record a sample
   int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+  void dump_samples (const char *file_name, const char *msg,
                      ACE_UINT32 scale_factor);
  protected:
-  void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf);
+  void dump_latency_stats (char *out_msg, ACE_UINT32 sf);
 
   /// Base and end times
   ACE_hrtime_t base_time_;
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.inl b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
index 78ce13d05bc..0e9aa2b2bb7 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.inl
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
@@ -1,7 +1,5 @@
 //$Id$
 
-#include "ace/Log_Msg.h"
-
 ACE_INLINE int
 Task_Stats::sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time)
 {