ChangeLogTag:Wed Jul 21 21:45:22 1999 Nanbor Wang <nanbor@cs.wustl.edu>

4 files changed, 37 insertions, 21 deletions

diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 5abb8601885..96a895de393 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -139,8 +139,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
   if (! x)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in "
-                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+                ASYS_TEXT ("\nerror: x is a null pointer in ")
+                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
   else if (! (x->left()))
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
@@ -178,8 +178,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
   if (! x)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("\nerror: x is a null pointer in "
-                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+                ASYS_TEXT ("\nerror: x is a null pointer in ")
+                ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
   else if (! (x->right()))
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 532c15b04f0..61f4be62e7d 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -154,8 +154,8 @@ ACE_Reactor::run_reactor_event_loop (REACTOR_EVENT_HOOK eh)
       else if (result == -1)
         return -1;
     }
-  /* NOTREACHED */
-  return 0;
+
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -174,8 +174,8 @@ ACE_Reactor::run_alertable_reactor_event_loop (REACTOR_EVENT_HOOK eh)
       else if (result == -1)
         return -1;
     }
-  /* NOTREACHED */
-  return 0;
+
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -196,8 +196,7 @@ ACE_Reactor::run_reactor_event_loop (ACE_Time_Value &tv,
         return result;
     }
 
-  /* NOTREACHED */
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
@@ -218,8 +217,7 @@ ACE_Reactor::run_alertable_reactor_event_loop (ACE_Time_Value &tv,
         return result;
     }
 
-  /* NOTREACHED */
-  return 0;
+  ACE_NOTREACHED (return 0;)
 }
 
 int
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 005c3f99368..892062fbe04 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -646,6 +646,24 @@ bgcolor="#ffffff">
         in most of their APIs.  On these platforms, ACE also uses
         UNICODE as its system string type.<p>
 
+        <p>Notice that when spaning a string literal across several lines,
+        you must apply <CODE>ASYS_TEXT</CODE> to <b>every</b> line.
+        For example, it is <font color=red>illegal</font> to do this:
+        <pre>
+        ACE_ERROR ((LM_ERROR,
+                    ASYS_TEXT ("%p\n"),
+                    ASYS_TEXT ("\nerror: x is a null pointer in "
+                               "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+        </pre></p>
+
+        <p>Instead, this should be written like this:
+        <pre>
+        ACE_ERROR ((LM_ERROR,
+                    ASYS_TEXT ("%p\n"),
+                    ASYS_TEXT ("\nerror: x is a null pointer in ")
+                    ASYS_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+        </pre></p>
+
     <li><strong><code>ACE_TRACE</code></strong> handles conversion
         between char strings and UNICODE strings automatically.<p>
 
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
index 242ac972d44..0da3c4fc53a 100644
--- a/tests/Cache_Map_Manager_Test.cpp
+++ b/tests/Cache_Map_Manager_Test.cpp
@@ -357,7 +357,7 @@ functionality_test_cache (MAP_CACHING_STRATEGY &caching_strategy)
       ACE_UNUSED_ARG (result);
 
       if (debug)
-        ACE_DEBUG ((LM_DEBUG, "keys[%d]=%d value=[%d]=%d\n",
+        ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("keys[%d]=%d value=[%d]=%d\n"),
                     i, i, j, j));
       ++counter;
       ACE_ASSERT (cache.current_size () == counter);
@@ -434,7 +434,7 @@ test_caching_strategy_type (void)
   switch (caching_strategy_type)
     {
     case ACE_NULL:
-      ACE_DEBUG ((LM_DEBUG, "\nNull_Caching_Strategy\n\n"));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nNull_Caching_Strategy\n\n")));
       ACE_NEW (map_caching_strategy,
                MAP_NULL_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -442,7 +442,7 @@ test_caching_strategy_type (void)
       break;
 
     case ACE_LRU:
-      ACE_DEBUG ((LM_DEBUG, "\nLRU_Caching_Strategy\n\n"));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nLRU_Caching_Strategy\n\n")));
       ACE_NEW (map_caching_strategy,
                MAP_LRU_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -450,7 +450,7 @@ test_caching_strategy_type (void)
       break;
 
     case ACE_LFU:
-      ACE_DEBUG ((LM_DEBUG, "\nLFU_Caching_Strategy\n\n"));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nLFU_Caching_Strategy\n\n")));
       ACE_NEW (map_caching_strategy,
                MAP_LFU_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -458,7 +458,7 @@ test_caching_strategy_type (void)
       break;
 
     case ACE_FIFO:
-      ACE_DEBUG ((LM_DEBUG, "\nFIFO_Caching_Strategy\n\n"));
+      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\nFIFO_Caching_Strategy\n\n")));
       ACE_NEW (map_caching_strategy,
                MAP_FIFO_ADAPTER);
       ACE_NEW (hash_map_caching_strategy,
@@ -490,13 +490,13 @@ parse_args (int argc, ASYS_TCHAR *argv[])
     switch (cc)
       {
       case 'c':
-        if (ACE_OS::strcmp (get_opt.optarg, "null") == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("null")) == 0)
           caching_strategy_type = ACE_NULL;
-        if (ACE_OS::strcmp (get_opt.optarg, "lru") == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("lru")) == 0)
           caching_strategy_type = ACE_LRU;
-        if (ACE_OS::strcmp (get_opt.optarg, "lfu") == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("lfu")) == 0)
           caching_strategy_type = ACE_LFU;
-        if (ACE_OS::strcmp (get_opt.optarg, "fifo") == 0)
+        if (ACE_OS::strcmp (get_opt.optarg, ASYS_TEXT ("fifo")) == 0)
           caching_strategy_type = ACE_FIFO;
         break;
       case 'i':