ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>

1 files changed, 29 insertions, 29 deletions

diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 91399e1c7b4..4de2cdbae1c 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -215,7 +215,7 @@ CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV)
   if (TAO_debug_level >= 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"),
+                  ACE_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"),
                   this->orb_core ()->orbid ()));
     }
 
@@ -572,8 +572,8 @@ CORBA_ORB::multicast_query (char *&buf,
       || acceptor.get_local_addr (my_addr) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("acceptor.open () || ")
-                  ASYS_TEXT ("acceptor.get_local_addr () failed")));
+                  ACE_TEXT ("acceptor.open () || ")
+                  ACE_TEXT ("acceptor.get_local_addr () failed")));
       result = -1;
     }
   else
@@ -591,7 +591,7 @@ CORBA_ORB::multicast_query (char *&buf,
         if (multicast_addr.set (mde.c_str()) == -1)
           {
             ACE_ERROR ((LM_ERROR,
-                        ASYS_TEXT("ORB.cpp: Multicast address setting failed\n")));
+                        ACE_TEXT("ORB.cpp: Multicast address setting failed\n")));
             stream.close ();
             dgram.close ();
             acceptor.close ();
@@ -602,7 +602,7 @@ CORBA_ORB::multicast_query (char *&buf,
       if (dgram.open (ACE_Addr::sap_any) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("Unable to open the Datagram!\n")));
+                      ACE_TEXT ("Unable to open the Datagram!\n")));
           result = -1;
         }
       else
@@ -640,19 +640,19 @@ CORBA_ORB::multicast_query (char *&buf,
 
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("\nsent multicast request.")));
+                        ACE_TEXT ("\nsent multicast request.")));
 
           // Check for errors.
           if (result == -1)
             ACE_ERROR ((LM_ERROR,
-                        ASYS_TEXT ("%p\n"),
-                        ASYS_TEXT ("error sending IIOP multicast")));
+                        ACE_TEXT ("%p\n"),
+                        ACE_TEXT ("error sending IIOP multicast")));
           else
             {
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,
-                            ASYS_TEXT ("\n%s; Sent multicast.")
-                            ASYS_TEXT ("# of bytes sent is %d.\n"),
+                            ACE_TEXT ("\n%s; Sent multicast.")
+                            ACE_TEXT ("# of bytes sent is %d.\n"),
                             __FILE__,
                             result));
               // Wait for response until timeout.
@@ -667,8 +667,8 @@ CORBA_ORB::multicast_query (char *&buf,
                                    &tv) == -1)
                 {
                   ACE_ERROR ((LM_ERROR,
-                              ASYS_TEXT ("%p\n"),
-                              ASYS_TEXT ("multicast_query: unable to accept")));
+                              ACE_TEXT ("%p\n"),
+                              ACE_TEXT ("multicast_query: unable to accept")));
                   result = -1;
                 }
               else
@@ -684,9 +684,9 @@ CORBA_ORB::multicast_query (char *&buf,
                   if (result != sizeof (ior_len))
                     {
                       ACE_ERROR ((LM_ERROR,
-                                  ASYS_TEXT ("%p\n"),
-                                  ASYS_TEXT ("multicast_query: unable to receive ")
-                                  ASYS_TEXT ("ior length")));
+                                  ACE_TEXT ("%p\n"),
+                                  ACE_TEXT ("multicast_query: unable to receive ")
+                                  ACE_TEXT ("ior length")));
                       result = -1;
                     }
                   else
@@ -700,9 +700,9 @@ CORBA_ORB::multicast_query (char *&buf,
                           if (buf == 0)
                             {
                               ACE_ERROR ((LM_ERROR,
-                                          ASYS_TEXT ("%p\n"),
-                                          ASYS_TEXT ("multicast_query: unable to ")
-                                          ASYS_TEXT ("allocate memory")));
+                                          ACE_TEXT ("%p\n"),
+                                          ACE_TEXT ("multicast_query: unable to ")
+                                          ACE_TEXT ("allocate memory")));
                               result = -1;
                             }
                         }
@@ -716,11 +716,11 @@ CORBA_ORB::multicast_query (char *&buf,
                                                   &tv);
                           if (result == -1)
                             ACE_ERROR ((LM_ERROR,
-                                        ASYS_TEXT ( "%p\n"),
-                                        ASYS_TEXT ("error reading ior")));
+                                        ACE_TEXT ( "%p\n"),
+                                        ACE_TEXT ("error reading ior")));
                           else if (TAO_debug_level > 0)
                             ACE_DEBUG ((LM_DEBUG,
-                                        ASYS_TEXT ("%s: service resolved to IOR <%s>\n"),
+                                        ACE_TEXT ("%s: service resolved to IOR <%s>\n"),
                                         __FILE__,
                                         buf));
                         }
@@ -1361,7 +1361,7 @@ CORBA::ORB_init (int &argc,
 
   if (TAO_debug_level >= 3)
     ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("TAO (%P|%t) created new ORB <%s>\n"),
+                ACE_TEXT ("TAO (%P|%t) created new ORB <%s>\n"),
                 orbid));
 
   // Before returning remember to store the ORB into the table...
@@ -1462,8 +1462,8 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ASYS_TEXT ("TAO_Stub pointer in CORBA::ORB::object_to_string() ")
-                        ASYS_TEXT ("is zero.\n")));
+                        ACE_TEXT ("TAO_Stub pointer in CORBA::ORB::object_to_string() ")
+                        ACE_TEXT ("is zero.\n")));
 
           ACE_THROW_RETURN (CORBA::MARSHAL (
                               CORBA_SystemException::_tao_minor_code (
@@ -1484,8 +1484,8 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
         {
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ASYS_TEXT ("TAO_Profile pointer in ")
-                        ASYS_TEXT ("CORBA::ORB::object_to_string() is zero.\n")));
+                        ACE_TEXT ("TAO_Profile pointer in ")
+                        ACE_TEXT ("CORBA::ORB::object_to_string() is zero.\n")));
 
           ACE_THROW_RETURN (CORBA::MARSHAL (
                               CORBA_SystemException::_tao_minor_code (
@@ -1928,7 +1928,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id,
 {
   if (CORBA::is_nil (obj))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("TAO (%P|%t): Cannot add nil object to table <%s>\n"),
+                       ACE_TEXT ("TAO (%P|%t): Cannot add nil object to table <%s>\n"),
                        object_id.c_str ()),
                       -1);
 
@@ -1942,7 +1942,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id,
 
   if (this->lookup_table_.add_ior (object_id, ior) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("TAO (%P|%t): Unable to add IOR to table <%s>\n"),
+                       ACE_TEXT ("TAO (%P|%t): Unable to add IOR to table <%s>\n"),
                        object_id.c_str ()),
                       -1);
 
@@ -2070,7 +2070,7 @@ void
 CORBA_ORB::unregister_value_factory (const char * /* repository_id */,
                                      CORBA_Environment &)
 {
-  ACE_ERROR((LM_ERROR, ASYS_TEXT ("(%N:%l) function not implemented\n")));
+  ACE_ERROR((LM_ERROR, ACE_TEXT ("(%N:%l) function not implemented\n")));
   // %! TODO
 }