Const and unicode fixes

    * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
    * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
    * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
    * TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp:
    * TAO/tao/ImR_Client/ImR_Client.cpp:

5 files changed, 9 insertions, 9 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index 526ce5ebca9..cf42205511d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -849,7 +849,7 @@ LiveCheck::remove_server (const char *server, int pid)
 {
   ACE_CString s(server);
   LiveEntry *entry = 0;
-  int result = entry_map_.find (s, entry);
+  int const result = entry_map_.find (s, entry);
   if (result != -1 && entry->has_pid (pid))
     {
       if (!this->in_handle_timeout ())
@@ -900,7 +900,7 @@ LiveCheck::remove_deferred_servers (void)
                           ACE_TEXT ("removing %s\n"), (*re).c_str()));
         }
       LiveEntry *entry = 0;
-      int result = entry_map_.unbind (*re, entry);
+      int const result = entry_map_.unbind (*re, entry);
       if (result == 0)
         {
           delete entry;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index ff32bcf6faa..48f83d725ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -538,7 +538,7 @@ Locator_Repository::remove_server (const ACE_CString& name,
     }
   Server_Info_Ptr si;
   this->servers().find (name, si);
-  int ret = this->servers().unbind (name);
+  int const ret = this->servers().unbind (name);
   if (ret != 0)
     {
       return ret;
@@ -634,7 +634,7 @@ Locator_Repository::remove_activator (const ACE_CString& name)
       return err;
     }
 
-  int ret = activators().unbind (lcase(name));
+  int const ret = activators().unbind (lcase(name));
   if (ret != 0)
     {
       return ret;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
index 50bad62defa..0a4925b5cb8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp
@@ -1263,11 +1263,11 @@ Shared_Backing_Store::LocatorListings_XMLHandler::remove_unmatched(
   Locator_Repository::SIMap::CONST_ITERATOR siit (this->unmatched_servers_);
   for (; siit.next (sientry); siit.advance() )
     {
-      int ret = repo.servers().unbind (sientry->ext_id_);
+      int const ret = repo.servers().unbind (sientry->ext_id_);
       if (ret != 0)
         {
           ORBSVCS_ERROR((LM_ERROR,
-            ACE_TEXT ("ERROR: could not remove server: %s\n"),
+            ACE_TEXT ("ERROR: could not remove server: %C\n"),
             sientry->int_id_->key_name_.c_str()));
         }
     }
@@ -1280,7 +1280,7 @@ Shared_Backing_Store::LocatorListings_XMLHandler::remove_unmatched(
       if (ret != 0)
         {
           ORBSVCS_ERROR((LM_ERROR,
-            ACE_TEXT ("ERROR: could not remove activator: %s\n"),
+            ACE_TEXT ("ERROR: could not remove activator: %C\n"),
             aientry->int_id_->name.c_str()));
         }
     }
diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
index 8a84e881653..11256716029 100644
--- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp
@@ -320,7 +320,7 @@ XML_Backing_Store::load_activator (const ACE_CString& activator_name,
                                    const ACE_CString& ior,
                                    const NameValues& )
 {
-  Activator_Info *ai;
+  Activator_Info *ai = 0;
   ACE_NEW (ai,
            Activator_Info (activator_name, token, ior));
 
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index d60f17d3d7e..52951696fce 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -310,7 +310,7 @@ namespace TAO
       {
         CORBA::String_var poaname = poa->the_name ();
         TAOLIB_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_ImR_Client (%P|%t) - Informing IMR that <%C> is running at: <%C>\n"),
+                    ACE_TEXT ("TAO_ImR_Client (%P|%t) - Informing IMR that <%C> is running at <%C>\n"),
                     poaname.in(), partial_ior.c_str ()));
       }