ChangeLogTag: Fri Apr 12 22:41:43 UTC 2013 Adam Mitz <mitza@ociweb.com>

12 files changed, 135 insertions, 124 deletions

diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 548a5188d00..c8ab2234b8f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "IFR_Service.h"
 #include "tao/Environment.h"
 #include "orbsvcs/Shutdown_Utilities.h"
@@ -24,7 +25,7 @@ void
 IFR_Service_Shutdown_Functor::operator() (int which_signal)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
+    ORBSVCS_DEBUG ((LM_DEBUG,
                 "shutting down on signal %d\n", which_signal));
   (void) this->ifr_.shutdown ();
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index bbb97bf8f9f..53ab0dfb949 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -15,7 +15,7 @@ project(IFR_Service) : orbsvcsexe, install, ifrservice, ifr_client, imr_client
   }
 }
 
-project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe {
+project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, tao_idl_fe, svc_utils {
   after       += IFR_Service
   sharedname   = TAO_IFR_BE
   dynamicflags += TAO_IFR_BE_BUILD_DLL
diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp
index f010d756b33..dc8a924a7ee 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_global.cpp
@@ -13,6 +13,7 @@
 //=============================================================================
 
 
+#include "orbsvcs/Log_Macros.h"
 #include "be_global.h"
 #include "ast_generator.h"
 #include "global_extern.h"
@@ -169,7 +170,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           }
         else
           {
-            ACE_ERROR ((
+            ORBSVCS_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
                 av[i]
@@ -182,7 +183,7 @@ BE_GlobalData::parse_args (long &i, char **av)
         be_global->allow_duplicate_typedefs (true);
         break;
       default:
-        ACE_ERROR ((
+        ORBSVCS_ERROR ((
             LM_ERROR,
             ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
             av[i]
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index ed178ae3f0c..72d33de3371 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "global_extern.h"
 #include "be_extern.h"
 #include "../../tao/Version.h"
@@ -89,7 +90,7 @@ BE_ifr_orb_init (int &ac, ACE_TCHAR *av[])
 TAO_IFR_BE_Export void
 BE_version (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
+  ORBSVCS_DEBUG ((LM_DEBUG,
               "%s %s\n",
               ACE_TEXT ("TAO_IFR_BE, version"),
               ACE_TEXT (TAO_VERSION)));
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index de1670fbbcb..572a73246c8 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -67,6 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // BE_produce.cc - Produce the work of the BE - does nothing in the
 //                 dummy BE
 
+#include "orbsvcs/Log_Macros.h"
 #include "global_extern.h"
 #include "TAO_IFR_BE_Export.h"
 #include "be_extern.h"
@@ -87,7 +88,7 @@ BE_cleanup (void)
 TAO_IFR_BE_Export void
 BE_abort (void)
 {
-  ACE_ERROR ((LM_ERROR,
+  ORBSVCS_ERROR ((LM_ERROR,
               ACE_TEXT ("Fatal Error - Aborting\n")));
 
   // BE_cleanup will be called after the exception is caught.
@@ -104,7 +105,7 @@ BE_ifr_repo_init (void)
 
     if (CORBA::is_nil (object.in ()))
       {
-        ACE_ERROR_RETURN ((
+        ORBSVCS_ERROR_RETURN ((
             LM_ERROR,
             ACE_TEXT ("Null objref from resolve_initial_references\n")
           ),
@@ -117,7 +118,7 @@ BE_ifr_repo_init (void)
 
     if (CORBA::is_nil (repo.in ()))
       {
-        ACE_ERROR_RETURN ((
+        ORBSVCS_ERROR_RETURN ((
             LM_ERROR,
             ACE_TEXT ("CORBA::Repository::_narrow failed\n")
           ),
@@ -129,7 +130,7 @@ BE_ifr_repo_init (void)
   }
   catch (CORBA::ORB::InvalidName &)
   {
-    ACE_ERROR ((LM_ERROR,
+    ORBSVCS_ERROR ((LM_ERROR,
                 ACE_TEXT ("resolution of Interface Repository failed\n")));
     throw Bailout ();
   }
@@ -156,7 +157,7 @@ BE_produce (void)
 
       if (root == 0)
         {
-          ACE_ERROR ((LM_ERROR,
+          ORBSVCS_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%N:%l) BE_produce - ")
                       ACE_TEXT ("No Root\n")));
 
@@ -173,7 +174,7 @@ BE_produce (void)
           // only visit_scope() for the removing visitor.
           if (visitor.visit_scope (root) == -1)
             {
-              ACE_ERROR ((
+              ORBSVCS_ERROR ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) BE_produce -")
                   ACE_TEXT (" failed to accept removing visitor\n")
@@ -190,7 +191,7 @@ BE_produce (void)
 
           if (root->ast_accept (&visitor) == -1)
             {
-              ACE_ERROR ((
+              ORBSVCS_ERROR ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) BE_produce -")
                   ACE_TEXT (" failed to accept adding visitor\n")
diff --git a/TAO/orbsvcs/IFR_Service/be_util.cpp b/TAO/orbsvcs/IFR_Service/be_util.cpp
index b1feb7ce332..056515c1b18 100644
--- a/TAO/orbsvcs/IFR_Service/be_util.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_util.cpp
@@ -12,12 +12,13 @@
  */
 //=============================================================================
 
+#include "orbsvcs/Log_Macros.h"
 #include "be_util.h"
 #include "be_extern.h"
 
 #include "ast_generator.h"
 
-#include "ace/Log_Msg.h"
+#include "orbsvcs/Log_Macros.h"
 
 // Prepare an argument for a BE.
 void
@@ -33,12 +34,12 @@ be_util::arg_post_proc (void)
 void
 be_util::usage (void)
 {
-  ACE_DEBUG ((
+  ORBSVCS_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -o <dir>\t\tOutput directory for the generated file.")
       ACE_TEXT (" Default is current directory\n")
     ));
-  ACE_DEBUG ((
+  ORBSVCS_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -e\t\t\tGenerate just an include of original IDL file")
       ACE_TEXT (" if no IDL3 declarations are found\n")
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index f40deb210c4..6c6adccf89b 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1,6 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ast_argument.h"
 #include "ast_array.h"
 #include "ast_attribute.h"
@@ -85,7 +86,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
 
           if (d == 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -")
                   ACE_TEXT (" bad node in this scope\n")
@@ -104,7 +105,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
 
           if (d->ast_accept (this) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -")
                   ACE_TEXT (" failed to accept visitor\n")
@@ -173,7 +174,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
                   ACE_TEXT (" scope stack is empty\n")
@@ -204,7 +205,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
       if (be_global->ifr_scopes ().push (new_def.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" scope push failed\n")
@@ -215,7 +216,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" visit_scope failed\n")
@@ -230,7 +231,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
       if (be_global->ifr_scopes ().pop (tmp) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" scope pop failed\n")
@@ -350,7 +351,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
 
                   if (CORBA::is_nil (bases[i]))
                     {
-                      ACE_ERROR_RETURN ((
+                      ORBSVCS_ERROR_RETURN ((
                           LM_ERROR,
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                           ACE_TEXT ("visit_interface -")
@@ -371,7 +372,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // Push the new IR object onto the scope stack.
               if (be_global->ifr_scopes ().push (extant_def.in ()) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
@@ -384,7 +385,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // Visit the members, if any.
               if (this->visit_scope (node) == -1)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
@@ -408,7 +409,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // Pop the new IR object back off the scope stack.
               if (be_global->ifr_scopes ().pop (used_scope) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
@@ -496,7 +497,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_interface_fwd -")
@@ -548,7 +549,7 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
         }
       else
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_valuebox -")
               ACE_TEXT (" scope stack is empty\n")
@@ -696,7 +697,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // the new object's scope.
               if (be_global->ifr_scopes ().push (extant_def.in ()) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_valuetype -")
@@ -709,7 +710,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // Visit the members, if any.
               if (this->visit_scope (node) == -1)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_valuetype -")
@@ -733,7 +734,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // Pop the new IR object back off the scope stack.
               if (be_global->ifr_scopes ().pop (used_scope) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_valuetype -")
@@ -820,7 +821,7 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_valuetype_fwd -")
@@ -947,7 +948,7 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               // the new object's scope.
               if (be_global->ifr_scopes ().push (extant_def.in ()) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_component -")
@@ -968,7 +969,7 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               // Visit the members, if any.
               if (this->visit_scope (node) == -1)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_component -")
@@ -984,7 +985,7 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               // Pop the new IR object back off the scope stack.
               if (be_global->ifr_scopes ().pop (used_scope) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
@@ -1076,7 +1077,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_component_fwd -")
@@ -1365,7 +1366,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // the new object's scope.
               if (be_global->ifr_scopes ().push (extant_def.in ()) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_eventtype -")
@@ -1378,7 +1379,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // Visit the members, if any.
               if (this->visit_scope (node) == -1)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_eventtype -")
@@ -1402,7 +1403,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // Pop the new IR object back off the scope stack.
               if (be_global->ifr_scopes ().pop (used_scope) != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_eventtype -")
@@ -1494,7 +1495,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_eventtype_fwd -")
@@ -1718,7 +1719,7 @@ ifr_adding_visitor::visit_structure_fwd (AST_StructureFwd *node)
 
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_structure_fwd -")
@@ -1818,7 +1819,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_enum -")
                   ACE_TEXT (" scope stack is empty\n")
@@ -1881,7 +1882,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
 
   if (ft == 0)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
           ACE_TEXT ("visit_field - ")
@@ -1893,7 +1894,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
 
   if (ft->ast_accept (this) == -1)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
           ACE_TEXT ("visit_field - ")
@@ -1978,7 +1979,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
         }
       else
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_attribute -")
               ACE_TEXT (" scope stack is empty\n")
@@ -2095,7 +2096,7 @@ ifr_adding_visitor::visit_union_fwd (AST_UnionFwd *node)
 
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_union_fwd -")
@@ -2219,7 +2220,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
         }
       else
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_constant -")
               ACE_TEXT (" scope stack is empty\n")
@@ -2366,7 +2367,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
         }
       else
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -")
               ACE_TEXT (" scope stack is empty\n")
@@ -2387,7 +2388,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG,
+          ORBSVCS_DEBUG ((LM_DEBUG,
               "%s %s\n",
               ACE_TEXT ("ifr_adding_visitor::visit_typedef - ignoring duplicate typedef"),
               node->local_name ()->get_string ()));
@@ -2402,7 +2403,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
 {
   if (be_global->ifr_scopes ().push (be_global->repository ()) != 0)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
           ACE_TEXT (" scope push failed\n")
@@ -2413,7 +2414,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
 
   if (this->visit_scope (node) == -1)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
           ACE_TEXT (" visit_scope failed\n")
@@ -2427,7 +2428,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
 
   if (be_global->ifr_scopes ().pop (tmp) != 0)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
           ACE_TEXT (" scope pop failed\n")
@@ -2468,7 +2469,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
             }
           else
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_native -")
                   ACE_TEXT (" scope stack is empty\n")
@@ -2697,7 +2698,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type, bool owned)
     {
       if (base_type->ast_accept (this) == -1)
         {
-          ACE_ERROR ((
+          ORBSVCS_ERROR ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::element_type -")
               ACE_TEXT (" failed to accept visitor\n")
@@ -2713,7 +2714,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type, bool owned)
 
       if (CORBA::is_nil (contained.in ()))
         {
-          ACE_ERROR ((
+          ORBSVCS_ERROR ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::element_type -")
               ACE_TEXT (" lookup_id failed\n")
@@ -2747,7 +2748,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
           if (intf == 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                  LM_ERROR,
                  ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                  ACE_TEXT ("create_interface_def -")
@@ -2767,7 +2768,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
               if (status != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                      LM_ERROR,
                      ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                      ACE_TEXT ("create_interface_def -")
@@ -2786,7 +2787,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
           if (CORBA::is_nil (abs_bases[i]))
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("create_interface_def -")
@@ -2809,7 +2810,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
           if (intf == 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                  LM_ERROR,
                  ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                  ACE_TEXT ("create_interface_def -")
@@ -2829,7 +2830,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
               if (status != 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("create_interface_def -")
@@ -2848,7 +2849,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
           if (CORBA::is_nil (bases[i]))
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("create_interface_def -")
@@ -2907,7 +2908,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_interface_def -")
@@ -2920,7 +2921,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
       // Visit the members, if any.
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_interface_def -")
@@ -2945,7 +2946,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
       // Pop the new IR object back off the scope stack.
       if (be_global->ifr_scopes ().pop (used_scope) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_interface_def -")
@@ -2957,7 +2958,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node)
     }
   else
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_interface_def -")
           ACE_TEXT (" scope stack is empty\n")
@@ -3015,7 +3016,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node)
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_value_def -")
@@ -3028,7 +3029,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node)
       // Visit the members, if any.
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_value_def -")
@@ -3053,7 +3054,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node)
       // Pop the new IR object back off the scope stack.
       if (be_global->ifr_scopes ().pop (used_scope) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_value_def -")
@@ -3065,7 +3066,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node)
     }
   else
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_value_def -")
           ACE_TEXT (" scope stack is empty\n")
@@ -3107,7 +3108,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node)
 
       if (be_global->ifr_scopes ().push (new_def.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_component_def -")
@@ -3129,7 +3130,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node)
       // Visit the members, if any.
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_component_def -")
@@ -3145,7 +3146,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node)
       // Pop the new IR object back off the scope stack.
       if (be_global->ifr_scopes ().pop (used_scope) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_component_def -")
@@ -3157,7 +3158,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node)
     }
   else
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_component_def -")
           ACE_TEXT (" scope stack is empty\n")
@@ -3213,7 +3214,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node)
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_home_def -")
@@ -3226,7 +3227,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node)
       // Visit the members, if any.
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_home_def -")
@@ -3259,7 +3260,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node)
       // Pop the new IR object back off the scope stack.
       if (be_global->ifr_scopes ().pop (used_scope) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_home_def -")
@@ -3271,7 +3272,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node)
     }
   else
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_home_def -")
           ACE_TEXT (" scope stack is empty\n")
@@ -3332,7 +3333,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node)
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_event_def -")
@@ -3345,7 +3346,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node)
       // Visit the members, if any.
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_event_def -")
@@ -3370,7 +3371,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node)
       // Pop the new IR object back off the scope stack.
       if (be_global->ifr_scopes ().pop (used_scope) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_event_def -")
@@ -3382,7 +3383,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node)
     }
   else
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_event_def -")
           ACE_TEXT (" scope stack is empty\n")
@@ -3413,7 +3414,7 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
           /// This will put the repo entry into ir_current_.
           if (bt->ast_accept (this) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("create_value_member -")
@@ -3443,7 +3444,7 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
             vis = CORBA::PRIVATE_MEMBER;
             break;
           default:
-            ACE_ERROR_RETURN ((
+            ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_value_member -")
                 ACE_TEXT (" bad visibility value in node\n")
@@ -3456,7 +3457,7 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
 
       if (be_global->ifr_scopes ().top (current_scope) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("create_value_member -")
@@ -3501,7 +3502,7 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node)
     case AST_Decl::NT_sequence:
       if (node->ast_accept (this) == -1)
         {
-          ACE_ERROR ((
+          ORBSVCS_ERROR ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("get_scope_member -")
@@ -3834,7 +3835,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
           /// to the repository if it's not already there.
           if (arg->field_type ()->ast_accept (this) != 0)
             {
-              ACE_ERROR ((
+              ORBSVCS_ERROR ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("fill_initializers -")
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 52c791072d7..328b638b06f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -1,6 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ast_enum.h"
 #include "ast_exception.h"
 #include "ast_expression.h"
@@ -51,7 +52,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
         {
           if (e->field (f, i) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_scope -")
@@ -71,7 +72,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
             {
               if (ft->ast_accept (this) == -1)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                       ACE_TEXT ("visit_scope -")
@@ -183,7 +184,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_exception -")
@@ -201,7 +202,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 
           if (be_global->ifr_scopes ().push (new_def.in ()) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_exception -")
@@ -214,7 +215,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // Then add the real exception members.
           if (this->add_members (node, new_def.in ()) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                 ACE_TEXT ("visit_exception -")
@@ -228,7 +229,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // Pop the new IR object back off the scope stack.
           if (be_global->ifr_scopes ().pop (used_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_exception -")
@@ -244,7 +245,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 
           if (be_global->ifr_scopes ().push (new_def.in ()) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_exception -")
@@ -257,7 +258,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // Then add the real exception members.
           if (this->add_members (node, new_def.in ()) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                 ACE_TEXT ("visit_exception -")
@@ -271,7 +272,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // Pop the new IR object back off the scope stack.
           if (be_global->ifr_scopes ().pop (used_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_exception -")
@@ -430,7 +431,7 @@ ifr_adding_visitor_exception::add_members (AST_Exception *node,
 {
   if (this->visit_scope (node) == -1)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
           ACE_TEXT ("visit_exception -")
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 4ac03717560..b5703032394 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -1,6 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ast_argument.h"
 #include "ast_exception.h"
 #include "ast_expression.h"
@@ -51,7 +52,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::")
               ACE_TEXT ("visit_operation -")
@@ -179,7 +180,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
         }
       else
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::")
               ACE_TEXT ("visit_operation -")
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 74a8b36f80d..0c53a5bc7e2 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -1,6 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ast_enum.h"
 #include "ast_expression.h"
 #include "ast_field.h"
@@ -42,7 +43,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
         {
           if (s->field (f, i) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                 ACE_TEXT ("visit_scope -")
@@ -66,7 +67,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 
                   if (ft->ast_accept (&visitor) == -1)
                     {
-                      ACE_ERROR_RETURN ((
+                      ORBSVCS_ERROR_RETURN ((
                         LM_ERROR,
                         ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                         ACE_TEXT ("visit_scope -")
@@ -81,7 +82,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                 {
                   if (ft->ast_accept (this) == -1)
                     {
-                      ACE_ERROR_RETURN ((
+                      ORBSVCS_ERROR_RETURN ((
                         LM_ERROR,
                         ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                         ACE_TEXT ("visit_scope -")
@@ -139,7 +140,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                 ACE_TEXT ("visit_structure -")
@@ -158,7 +159,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
           if (be_global->ifr_scopes ().push (struct_def.in ()) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
@@ -171,7 +172,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // Then add the real structure members (which corrupts ir_current_).
           if (this->add_members (node, struct_def.in ()) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                 ACE_TEXT ("visit_structure -")
@@ -187,7 +188,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // Pop the new IR object back off the scope stack.
           if (be_global->ifr_scopes ().pop (used_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
@@ -207,7 +208,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
           if (be_global->ifr_scopes ().push (struct_def.in ()) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
@@ -219,7 +220,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
           if (this->add_members (node, struct_def.in ()) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                 ACE_TEXT ("visit_structure -")
@@ -235,7 +236,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // Pop the new IR object back off the scope stack.
           if (be_global->ifr_scopes ().pop (used_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
@@ -395,7 +396,7 @@ ifr_adding_visitor_structure::add_members (AST_Structure *node,
 {
   if (this->visit_scope (node) == -1)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
         LM_ERROR,
         ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
         ACE_TEXT ("visit_structure -")
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index b331f4ef0a2..a03bf8a5845 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -1,6 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ast_enum.h"
 #include "ast_expression.h"
 #include "ast_union.h"
@@ -52,7 +53,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
         {
           if (u->field (f, i) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_scope -")
@@ -79,7 +80,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 
                   if (ft->ast_accept (&visitor) == -1)
                     {
-                      ACE_ERROR_RETURN ((
+                      ORBSVCS_ERROR_RETURN ((
                         LM_ERROR,
                         ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                         ACE_TEXT ("visit_scope -")
@@ -94,7 +95,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                 {
                   if (ft->ast_accept (this) == -1)
                     {
-                      ACE_ERROR_RETURN ((
+                      ORBSVCS_ERROR_RETURN ((
                         LM_ERROR,
                         ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                         ACE_TEXT ("visit_scope -")
@@ -317,7 +318,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
       // This will put the discriminator in ir_current_.
       if (node->disc_type ()->ast_accept (this) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
             LM_ERROR,
             ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
             ACE_TEXT ("visit_union -")
@@ -339,7 +340,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
           if (be_global->ifr_scopes ().top (current_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                 ACE_TEXT ("visit_union -")
@@ -359,7 +360,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
           if (be_global->ifr_scopes ().push (union_def.in ()) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_union -")
@@ -372,7 +373,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // Then add the real union members (which corrupts ir_current_).
           if (this->add_members (node, union_def.in ()) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -")
                 ACE_TEXT (" visit_scope failed\n")),
@@ -387,7 +388,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // Pop the new IR object back off the scope stack.
           if (be_global->ifr_scopes ().pop (used_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_union -")
@@ -408,7 +409,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
           if (be_global->ifr_scopes ().push (union_def.in ()) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_union -")
@@ -420,7 +421,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
           if (this->add_members (node, union_def.in ()) == -1)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                 LM_ERROR,
                 ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                 ACE_TEXT ("visit_union -")
@@ -436,7 +437,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // Pop the new IR object back off the scope stack.
           if (be_global->ifr_scopes ().pop (used_scope) != 0)
             {
-              ACE_ERROR_RETURN ((
+              ORBSVCS_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_union -")
@@ -471,7 +472,7 @@ ifr_adding_visitor_union::add_members (AST_Union *node,
 {
   if (this->visit_scope (node) == -1)
     {
-      ACE_ERROR_RETURN ((
+      ORBSVCS_ERROR_RETURN ((
         LM_ERROR,
         ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -")
         ACE_TEXT (" visit_scope failed\n")),
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 1dd38fffbe3..c671f048e98 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -1,6 +1,7 @@
 /* -*- c++ -*- */
 // $Id$
 
+#include "orbsvcs/Log_Macros.h"
 #include "ifr_removing_visitor.h"
 #include "utl_scope.h"
 #include "ast_root.h"
@@ -34,7 +35,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
               if (d == 0)
                 {
-                  ACE_ERROR_RETURN ((
+                  ORBSVCS_ERROR_RETURN ((
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_scope -")
                       ACE_TEXT (" bad node in this scope\n")
@@ -87,7 +88,7 @@ ifr_removing_visitor::visit_root (AST_Root *node)
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_root -")
               ACE_TEXT (" scope push failed\n")
@@ -98,7 +99,7 @@ ifr_removing_visitor::visit_root (AST_Root *node)
 
       if (this->visit_scope (node) == -1)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_root -")
               ACE_TEXT (" visit_scope failed\n")
@@ -111,7 +112,7 @@ ifr_removing_visitor::visit_root (AST_Root *node)
 
       if (be_global->ifr_scopes ().pop (tmp) != 0)
         {
-          ACE_ERROR_RETURN ((
+          ORBSVCS_ERROR_RETURN ((
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_root -")
               ACE_TEXT (" scope pop failed\n")