ChangeLogTag:Wed Oct 6 12:25:29 2004 Steve Huston <shuston@riverace.com>

17 files changed, 27 insertions, 29 deletions

diff --git a/examples/APG/Logging/Change_Mask.cpp b/examples/APG/Logging/Change_Mask.cpp
index 4cd0deac7e5..a34a00e63b1 100644
--- a/examples/APG/Logging/Change_Mask.cpp
+++ b/examples/APG/Logging/Change_Mask.cpp
@@ -6,7 +6,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   // Listing 1 code/ch03
   ACE_LOG_MSG->priority_mask (0, ACE_Log_Msg::PROCESS);
@@ -23,7 +23,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Howto_Syslog.cpp b/examples/APG/Logging/Howto_Syslog.cpp
index 0bafab546b7..283099a3da1 100644
--- a/examples/APG/Logging/Howto_Syslog.cpp
+++ b/examples/APG/Logging/Howto_Syslog.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
     (argv[0], ACE_Log_Msg::SYSLOG, ACE_TEXT ("syslogTest"));
   // Listing 1
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   foo ();
@@ -22,7 +22,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Simple1.cpp b/examples/APG/Logging/Simple1.cpp
index 93c8b681c23..cf7a12e410b 100644
--- a/examples/APG/Logging/Simple1.cpp
+++ b/examples/APG/Logging/Simple1.cpp
@@ -6,7 +6,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE(ACE_TEXT ("main"));
+  ACE_TRACE("main");
     
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHi Mom\n")));
   foo();
@@ -17,7 +17,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Simple2.cpp b/examples/APG/Logging/Simple2.cpp
index dfec1c68dd2..26315b9d689 100644
--- a/examples/APG/Logging/Simple2.cpp
+++ b/examples/APG/Logging/Simple2.cpp
@@ -6,7 +6,7 @@ void foo(void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_LOG_MSG->priority_mask (LM_DEBUG | LM_NOTICE,
                               ACE_Log_Msg::PROCESS);
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo(void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Trace_Return.cpp b/examples/APG/Logging/Trace_Return.cpp
index d466abc43c1..2aed470522b 100644
--- a/examples/APG/Logging/Trace_Return.cpp
+++ b/examples/APG/Logging/Trace_Return.cpp
@@ -10,7 +10,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  TRACE (ACE_TEXT ("main"));
+  TRACE ("main");
     
   MY_DEBUG (ACE_TEXT ("Hi Mom\n"));
   foo ();
@@ -21,7 +21,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  TRACE (ACE_TEXT ("foo"));
+  TRACE ("foo");
   MY_DEBUG (ACE_TEXT ("Howdy Pardner\n"));
   TRACE_RETURN_VOID ();
 }
diff --git a/examples/APG/Logging/Use_Callback.cpp b/examples/APG/Logging/Use_Callback.cpp
index 2deff99f4ea..2f08a2127ed 100644
--- a/examples/APG/Logging/Use_Callback.cpp
+++ b/examples/APG/Logging/Use_Callback.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
   ACE_LOG_MSG->msg_callback (callback);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_Callback2.cpp b/examples/APG/Logging/Use_Callback2.cpp
index a3f005e5949..bcfe8b8e5d7 100644
--- a/examples/APG/Logging/Use_Callback2.cpp
+++ b/examples/APG/Logging/Use_Callback2.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
   ACE_LOG_MSG->msg_callback (callback);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_LogManager.cpp b/examples/APG/Logging/Use_LogManager.cpp
index ad3280b8d4f..ddcbb758f87 100644
--- a/examples/APG/Logging/Use_LogManager.cpp
+++ b/examples/APG/Logging/Use_LogManager.cpp
@@ -8,7 +8,7 @@ void foo (void);
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   LOG_MANAGER->redirectToStderr ();
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
   LOG_MANAGER->redirectToSyslog ();
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHi Mom\n")));
   foo ();
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 }
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
   LOG_MANAGER->redirectToFile ("output.test");
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Use_Logger.cpp b/examples/APG/Logging/Use_Logger.cpp
index 9dd00caee42..5fb672c1ab4 100644
--- a/examples/APG/Logging/Use_Logger.cpp
+++ b/examples/APG/Logging/Use_Logger.cpp
@@ -8,7 +8,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 		     ACE_Log_Msg::LOGGER, 
                      ACE_DEFAULT_LOGGER_KEY);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_Logging_Server.cpp b/examples/APG/Logging/Use_Logging_Server.cpp
index 1d304f2577b..eaad6bf7a6b 100644
--- a/examples/APG/Logging/Use_Logging_Server.cpp
+++ b/examples/APG/Logging/Use_Logging_Server.cpp
@@ -11,7 +11,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
   ACE_LOG_MSG->msg_callback (callback);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n")));
diff --git a/examples/APG/Logging/Use_Logging_Strategy.cpp b/examples/APG/Logging/Use_Logging_Strategy.cpp
index 0bf1e67afd5..559d85d65ae 100644
--- a/examples/APG/Logging/Use_Logging_Strategy.cpp
+++ b/examples/APG/Logging/Use_Logging_Strategy.cpp
@@ -24,7 +24,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"),
                        ACE_TEXT ("Service Config open")),
                       1);
-    ACE_TRACE (ACE_TEXT ("main"));
+    ACE_TRACE ("main");
     ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("%t%IHowdy Pardner\n")));
     ACE_DEBUG ((LM_INFO, ACE_TEXT ("%t%IGoodnight\n")));
 
diff --git a/examples/APG/Logging/Use_Multiple_Sinks.cpp b/examples/APG/Logging/Use_Multiple_Sinks.cpp
index 468fc09d838..7decd59217a 100644
--- a/examples/APG/Logging/Use_Multiple_Sinks.cpp
+++ b/examples/APG/Logging/Use_Multiple_Sinks.cpp
@@ -10,7 +10,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
   // Output to default destination (stderr)
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_OSTREAM_TYPE *output =
         (ACE_OSTREAM_TYPE *) new std::ofstream ("ostream.output.test");
diff --git a/examples/APG/Logging/Use_Ostream.cpp b/examples/APG/Logging/Use_Ostream.cpp
index f5665fbfd2e..54ab19170db 100644
--- a/examples/APG/Logging/Use_Ostream.cpp
+++ b/examples/APG/Logging/Use_Ostream.cpp
@@ -9,11 +9,10 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
 
-
   /* Alternatively, you can use the set_flags() method to do the same
      thing after the singleton has been created:
   */
@@ -33,7 +32,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Use_Stderr.cpp b/examples/APG/Logging/Use_Stderr.cpp
index 3b087a09af4..e0418c4d362 100644
--- a/examples/APG/Logging/Use_Stderr.cpp
+++ b/examples/APG/Logging/Use_Stderr.cpp
@@ -17,7 +17,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
      thing after the singleton has been created:
   */
 
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   // Listing 2 code/ch03
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
@@ -32,8 +32,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
-
 }
diff --git a/examples/APG/Logging/Use_Syslog.cpp b/examples/APG/Logging/Use_Syslog.cpp
index ef0cc8857f2..dce4a1fe6b0 100644
--- a/examples/APG/Logging/Use_Syslog.cpp
+++ b/examples/APG/Logging/Use_Syslog.cpp
@@ -8,7 +8,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   // This will be directed to stderr (the default ACE_Log_Msg
   // behavior).
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%IHi Mom\n")));
 
@@ -26,7 +26,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHowdy Pardner\n")));
 }
diff --git a/examples/APG/Logging/Wrap_Macros.cpp b/examples/APG/Logging/Wrap_Macros.cpp
index 73c908272d2..1de24754bcd 100644
--- a/examples/APG/Logging/Wrap_Macros.cpp
+++ b/examples/APG/Logging/Wrap_Macros.cpp
@@ -10,7 +10,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
   MY_DEBUG (ACE_TEXT ("Hi Mom\n"));
   foo ();
   MY_DEBUG (ACE_TEXT ("Goodnight\n"));
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
 
 void foo (void)
 {
-  ACE_TRACE (ACE_TEXT ("foo"));
+  ACE_TRACE ("foo");
   MY_DEBUG (ACE_TEXT ("Howdy Pardner\n"));
 }
 // Listing 1
diff --git a/examples/APG/Logging/Wrap_Macros_Alt.cpp b/examples/APG/Logging/Wrap_Macros_Alt.cpp
index 1926f001d36..306eefcd83a 100644
--- a/examples/APG/Logging/Wrap_Macros_Alt.cpp
+++ b/examples/APG/Logging/Wrap_Macros_Alt.cpp
@@ -6,7 +6,7 @@ void foo (void);
 
 int ACE_TMAIN (int, ACE_TCHAR *[])
 {
-  ACE_TRACE (ACE_TEXT ("main"));
+  ACE_TRACE ("main");
   
   // Listing 1 code/ch03
   ACE_DEBUG ((MY_DEBUG ACE_TEXT ("Hi Mom\n")));