revert conflicting ignores, re-indent, and remove cli delay

9 files changed, 161 insertions, 173 deletions

diff --git a/.gitignore b/.gitignore
index 4ebaed388b9..d4a2a896b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,16 +12,6 @@
 *.sdf
 *.sln
 *.suo
-Debug
-*A.cpp
-*A.h
-*A.inl
-*C.cpp
-*C.h
-*C.inl
-*S.cpp
-*S.h
-*S.inl
 *S_T.cpp
 *S_T.h
 *S_T.inl
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 25fa67ed311..89095eb746d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -25,25 +25,25 @@ static ACE_CString getHostName ()
 
 Active_Pid_Setter::Active_Pid_Setter(ImR_Activator_i &owner, pid_t pid)
   :owner_(owner)
-  {
+{
   owner_.active_check_pid_ = pid;
-  }
+}
 
 Active_Pid_Setter::~Active_Pid_Setter()
-  {
-    owner_.active_check_pid_ = ACE_INVALID_PID;
-  }
+{
+  owner_.active_check_pid_ = ACE_INVALID_PID;
+}
 
 ImR_Activator_i::ImR_Activator_i (void)
-: registration_token_(0)
-, debug_(0)
-, notify_imr_ (false)
-, induce_delay_ (0)
-, name_ (getHostName ())
-, env_buf_len_ (Activator_Options::ENVIRONMENT_BUFFER)
-, max_env_vars_ (Activator_Options::ENVIRONMENT_MAX_VARS)
-, detach_child_ (false)
-, active_check_pid_ (ACE_INVALID_PID)
+  : registration_token_(0)
+  , debug_(0)
+  , notify_imr_ (false)
+  , induce_delay_ (0)
+  , name_ (getHostName ())
+  , env_buf_len_ (Activator_Options::ENVIRONMENT_BUFFER)
+  , max_env_vars_ (Activator_Options::ENVIRONMENT_MAX_VARS)
+  , detach_child_ (false)
+  , active_check_pid_ (ACE_INVALID_PID)
 {
 }
 
@@ -88,7 +88,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
         orb_->resolve_initial_references ("ImplRepoService");
 
       this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
-        this->orb_->orb_core ()->reactor ());
+                               this->orb_->orb_core ()->reactor ());
 
       locator_ = ImplementationRepository::Locator::_narrow (obj.in ());
 
@@ -98,7 +98,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
             {
               CORBA::String_var ior = orb_->object_to_string (obj.in ());
               ORBSVCS_DEBUG((LM_DEBUG, "ImR Activator: ImplRepoService ior=<%C>\n",
-                ior.in()));
+                             ior.in()));
             }
 
           this->registration_token_ =
@@ -116,7 +116,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
     {
       if (debug_ > 1)
         ex._tao_print_exception (
-          "ImR Activator: Can't register with ImR.");
+                                 "ImR Activator: Can't register with ImR.");
     }
 
   if (debug_ > 0)
@@ -151,7 +151,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
       // locator in some scenarios, such as when the locator persists its database, and
       // wants to reconnect to running activators to auto_start some servers.
       this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
-        "ImR_Activator");
+                                            "ImR_Activator");
       ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in ()));
 
       obj = orb->resolve_initial_references ("POACurrent");
@@ -180,7 +180,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
           if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1)
             {
               ORBSVCS_ERROR_RETURN ((LM_ERROR,
-                "The ACE_Process_Manager didnt get initialized\n"), -1);
+                                     "The ACE_Process_Manager didnt get initialized\n"), -1);
             }
         }
 
@@ -193,7 +193,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
       if (this->debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-            "ImR Activator: The Activator IOR is: <%C>\n", ior.in ()));
+                          "ImR Activator: The Activator IOR is: <%C>\n", ior.in ()));
         }
 
       // The last thing we do is write out the ior so that a test program can assume
@@ -204,7 +204,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
           if (fp == 0)
             {
               ORBSVCS_ERROR_RETURN ((LM_ERROR,
-                "ImR Activator: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1);
+                                     "ImR Activator: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1);
             }
           ACE_OS::fprintf (fp, "%s", ior.in ());
           ACE_OS::fclose (fp);
@@ -213,7 +213,7 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "ImR_Activator_i::init_with_orb");
+                               "ImR_Activator_i::init_with_orb");
       throw;
     }
   return 0;
@@ -252,7 +252,7 @@ ImR_Activator_i::fini (void)
       if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0)
         {
           this->locator_->unregister_activator (name_.c_str(),
-            this->registration_token_);
+                                                this->registration_token_);
         }
     }
   catch (const CORBA::COMM_FAILURE&)
@@ -268,10 +268,10 @@ ImR_Activator_i::fini (void)
                         ACE_TEXT ("(%P|%t) ImR Activator: Unable to unregister from ImR.\n")));
     }
   catch (const CORBA::Exception& ex)
-  {
-    ex._tao_print_exception ("ImR Activator: fini");
-    throw;
-  }
+    {
+      ex._tao_print_exception ("ImR Activator: fini");
+      throw;
+    }
 
   try
     {
@@ -435,8 +435,8 @@ ImR_Activator_i::still_running_i (const char *name, pid_t &pid)
 #if defined (ACE_WIN32)
       if (pid != ACE_INVALID_PID)
         {
-        Active_Pid_Setter aps(*this, pid);
-        pid_t waitp = this->process_mgr_.wait (pid, ACE_Time_Value::zero);
+          Active_Pid_Setter aps(*this, pid);
+          pid_t waitp = this->process_mgr_.wait (pid, ACE_Time_Value::zero);
           is_running = (waitp != pid);
         }
 #endif /* ACE_WIN32 */
@@ -458,34 +458,34 @@ ImR_Activator_i::start_server(const char* name,
       name += unique_prefix_len;
     }
 
- // if (debug_ > 1)
-    ORBSVCS_DEBUG((LM_DEBUG,
-                   "ImR Activator: Starting %C <%C>...\n",
-                   (unique ? "unique server" : "server"), name));
+  // if (debug_ > 1)
+  ORBSVCS_DEBUG((LM_DEBUG,
+                 "ImR Activator: Starting %C <%C>...\n",
+                 (unique ? "unique server" : "server"), name));
   pid_t pid;
   if (unique && this->still_running_i (name, pid))
     {
-     // if (debug_ > 1)
-        ORBSVCS_DEBUG((LM_DEBUG,
-                       "ImR Activator: Unique instance already running %d\n",
-                       static_cast<int> (pid)));
+      // if (debug_ > 1)
+      ORBSVCS_DEBUG((LM_DEBUG,
+                     "ImR Activator: Unique instance already running %d\n",
+                     static_cast<int> (pid)));
       char reason[32];
       ACE_OS::snprintf (reason,32,"pid:%d",static_cast<int> (pid));
       throw ImplementationRepository::CannotActivate(
-        CORBA::string_dup (reason));
+                                                     CORBA::string_dup (reason));
     }
 
   ACE_TString cmdline_tstr(ACE_TEXT_CHAR_TO_TCHAR(cmdline));
   size_t cmdline_buf_len = cmdline_tstr.length();
   if (debug_ > 1)
     ORBSVCS_DEBUG((LM_DEBUG,
-            "\tcommand line : len=%d <%s>\n\tdirectory : <%C>\n",
-            cmdline_buf_len, cmdline_tstr.c_str(), dir)  );
+                   "\tcommand line : len=%d <%s>\n\tdirectory : <%C>\n",
+                   cmdline_buf_len, cmdline_tstr.c_str(), dir)  );
 
   ACE_Process_Options proc_opts (
-                        1,
-                        cmdline_buf_len + 1,
-                        this->env_buf_len_, this->max_env_vars_);
+                                 1,
+                                 cmdline_buf_len + 1,
+                                 this->env_buf_len_, this->max_env_vars_);
   proc_opts.command_line (ACE_TEXT_CHAR_TO_TCHAR(cmdline));
   proc_opts.working_directory (dir);
   // Win32 does not support the CLOSE_ON_EXEC semantics for sockets
@@ -526,11 +526,11 @@ ImR_Activator_i::start_server(const char* name,
   if (pid == ACE_INVALID_PID)
     {
       ORBSVCS_ERROR ((LM_ERROR,
-        "ImR Activator: Cannot start server <%C> using <%C>\n", name, cmdline));
+                      "ImR Activator: Cannot start server <%C> using <%C>\n", name, cmdline));
 
       throw ImplementationRepository::CannotActivate(
-        CORBA::string_dup (
-          "Process Creation Failed"));
+                                                     CORBA::string_dup (
+                                                                        "Process Creation Failed"));
     }
   else
     {
@@ -620,7 +620,7 @@ ImR_Activator_i::handle_exit (ACE_Process * process)
     {
       ORBSVCS_DEBUG
         ((LM_DEBUG,
-        ACE_TEXT ("Process %d exited with exit code %d, delay = %d\n"),
+          ACE_TEXT ("Process %d exited with exit code %d, delay = %d\n"),
           process->getpid (), process->return_value (), this->induce_delay_));
     }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index cc16d4f4fd3..29e7452055b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 //=============================================================================
 /**
-*  @file   ImR_Activator_i.h
-*
-*  @author Priyanka Gontla <gontla_p@ociweb.com>
-*  @author Darrell Brunsch <brunsch@cs.wustl.edu>
-*/
+ *  @file   ImR_Activator_i.h
+ *
+ *  @author Priyanka Gontla <gontla_p@ociweb.com>
+ *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+ */
 //=============================================================================
 
 #ifndef IMR_ACTIVATOR_I_H
@@ -47,27 +47,27 @@ struct ACE_Equal_To_pid_t
 
 
 #if (ACE_SIZEOF_VOID_P == 8)
-  typedef ACE_INT64 Act_token_type;
+typedef ACE_INT64 Act_token_type;
 #else
-  typedef ACE_INT32 Act_token_type;
+typedef ACE_INT32 Act_token_type;
 #endif
 
-  class Active_Pid_Setter;
+class Active_Pid_Setter;
 
 /**
-* @class ImR_Activator_i
-*
-* @brief IMR Activator Interface.
-*
-* This class provides the interface for the various activities
-* that can be done by the ImR_Activator.
-*
-*/
+ * @class ImR_Activator_i
+ *
+ * @brief IMR Activator Interface.
+ *
+ * This class provides the interface for the various activities
+ * that can be done by the ImR_Activator.
+ *
+ */
 class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::ActivatorExt,
                                          public ACE_Event_Handler
 {
  public:
-   friend class Active_Pid_Setter;
+  friend class Active_Pid_Setter;
 
   ImR_Activator_i (void);
 
@@ -96,7 +96,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac
   /// Shutdown the orb.
   void shutdown (bool signaled);
 
-private:
+ private:
 
   int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts);
 
@@ -111,7 +111,7 @@ private:
 
   bool in_upcall (void);
 
-private:
+ private:
 
   typedef ACE_Unbounded_Set<ACE_CString> UniqueServerList;
 
@@ -159,14 +159,14 @@ private:
 };
 
 class Active_Pid_Setter
-  {
-  public:
-    Active_Pid_Setter(ImR_Activator_i &owner, pid_t pid);
-    ~Active_Pid_Setter();
+{
+public:
+  Active_Pid_Setter(ImR_Activator_i &owner, pid_t pid);
+  ~Active_Pid_Setter();
 
-    ImR_Activator_i &owner_;
+  ImR_Activator_i &owner_;
 
-  };
+};
 
 
 #endif /* IMR_ACTIVATOR_I_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 94d0bed3c87..a06e329026e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -159,7 +159,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb)
         ACE_ASSERT (invalid_rmode_specified);
         ACE_UNUSED_ARG (invalid_rmode_specified);
         ORBSVCS_ERROR_RETURN ((
-          LM_ERROR, ACE_TEXT ("Repository failed to initialize\n")), -1);
+                               LM_ERROR, ACE_TEXT ("Repository failed to initialize\n")), -1);
       }
     }
 
@@ -308,8 +308,8 @@ ImR_Locator_i::shutdown
     {
       // Note : shutdown is oneway, so we can't throw
       ORBSVCS_ERROR ((
-        LM_ERROR,
-        ACE_TEXT ("(%P|%t) ImR: Shutdown of all servers not implemented.\n")));
+                      LM_ERROR,
+                      ACE_TEXT ("(%P|%t) ImR: Shutdown of all servers not implemented.\n")));
     }
   if (activators != 0 && this->repository_->activators ().current_size () > 0)
     {
@@ -340,7 +340,7 @@ ImR_Locator_i::shutdown
               if (debug_ > 1)
                 {
                   ex._tao_print_exception (
-                    ACE_TEXT ("(%P|%t) ImR: shutdown activator"));
+                                           ACE_TEXT ("(%P|%t) ImR: shutdown activator"));
                 }
             }
         }
@@ -430,7 +430,7 @@ ImR_Locator_i::register_activator
 
   if (debug_ > 0)
     ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Activator registered for %C.\n"),
-                aname));
+                    aname));
 
   _tao_rh->register_activator (token);
 }
@@ -449,9 +449,9 @@ ImR_Locator_i::unregister_activator
       if (info->token != token && debug_ > 0)
         {
           ORBSVCS_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("(%P|%t) ImR: Ignoring unregister activator:%C. Wrong token.\n"),
-            aname));
+                          LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) ImR: Ignoring unregister activator:%C. Wrong token.\n"),
+                          aname));
           _tao_rh->unregister_activator ();
           return;
         }
@@ -460,16 +460,16 @@ ImR_Locator_i::unregister_activator
 
       if (debug_ > 0)
         ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Activator %C unregistered.\n"),
-                    aname));
+                        aname));
     }
   else
     {
       if (debug_ > 0)
         ORBSVCS_DEBUG ((
-          LM_DEBUG,
-          ACE_TEXT ("(%P|%t) ImR: Ignoring unregister activator: %C. ")
-          ACE_TEXT ("Unknown activator.\n"),
-          aname));
+                        LM_DEBUG,
+                        ACE_TEXT ("(%P|%t) ImR: Ignoring unregister activator: %C. ")
+                        ACE_TEXT ("Unknown activator.\n"),
+                        aname));
     }
   _tao_rh->unregister_activator ();
 }
@@ -530,7 +530,7 @@ ImR_Locator_i::child_death_i (const char* name, int pid)
     {
       if (debug_ > 1)
         ORBSVCS_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) ImR: Failed to find server/pid in repository.\n")));
+                        ACE_TEXT ("(%P|%t) ImR: Failed to find server/pid in repository.\n")));
     }
 
 }
@@ -588,7 +588,7 @@ ImR_Locator_i::spawn_pid
     {
       if (debug_ > 1)
         ORBSVCS_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) ImR: Failed to find server in repository.\n")));
+                        ACE_TEXT ("(%P|%t) ImR: Failed to find server in repository.\n")));
     }
   this->pinger_.set_pid (name, pid);
 
@@ -743,7 +743,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
           if (debug_ > 0)
             {
               ORBSVCS_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) ImR: Unable to set timeout policy.\n")));
+                              ACE_TEXT ("(%P|%t) ImR: Unable to set timeout policy.\n")));
             }
           ret = CORBA::Object::_duplicate (obj);
         }
@@ -751,7 +751,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        ACE_TEXT ("(%P|%t) ImR_Locator_i::set_timeout_policy ()"));
+                               ACE_TEXT ("(%P|%t) ImR_Locator_i::set_timeout_policy ()"));
     }
 
   return ret._retn ();
@@ -766,9 +766,9 @@ ImR_Locator_i::add_or_update_server
   if (this->opts_->readonly ())
     {
       ORBSVCS_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) ImR: Cannot add/update server <%C> due to locked ")
-                  ACE_TEXT ("database.\n"),
-                  server));
+                      ACE_TEXT ("(%P|%t) ImR: Cannot add/update server <%C> due to locked ")
+                      ACE_TEXT ("database.\n"),
+                      server));
       CORBA::Exception *ex =
         new CORBA::NO_PERMISSION (CORBA::SystemException::_tao_minor_code
                                   (TAO_IMPLREPO_MINOR_CODE,0),
@@ -793,7 +793,7 @@ ImR_Locator_i::add_or_update_server
     {
       if (debug_ > 1)
         ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Updating server <%C>.\n"),
-                    server));
+                        server));
 
       info.edit ()->update_options (options);
       info.update_repo();
@@ -803,24 +803,24 @@ ImR_Locator_i::add_or_update_server
     {
       // Note : The info var may be null, so we use options.
       ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR: Server: %C\n")
-                  ACE_TEXT ("\tActivator: %C\n")
-                  ACE_TEXT ("\tCommand Line: %C\n")
-                  ACE_TEXT ("\tWorking Directory: %C\n")
-                  ACE_TEXT ("\tActivation: %C\n")
-                  ACE_TEXT ("\tStart Limit: %d\n")
-                  ACE_TEXT ("\n"),
-                  server,
-                  options.activator.in (),
-                  options.command_line.in (),
-                  options.working_directory.in (),
-                  ImR_Utils::activationModeToString (options.activation),
-                  options.start_limit
-                  ));
+                      ACE_TEXT ("\tActivator: %C\n")
+                      ACE_TEXT ("\tCommand Line: %C\n")
+                      ACE_TEXT ("\tWorking Directory: %C\n")
+                      ACE_TEXT ("\tActivation: %C\n")
+                      ACE_TEXT ("\tStart Limit: %d\n")
+                      ACE_TEXT ("\n"),
+                      server,
+                      options.activator.in (),
+                      options.command_line.in (),
+                      options.working_directory.in (),
+                      ImR_Utils::activationModeToString (options.activation),
+                      options.start_limit
+                      ));
 
       for (CORBA::ULong i = 0; i < options.environment.length (); ++i)
         ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Environment variable %C=%C\n"),
-                    options.environment[i].name.in (),
-                    options.environment[i].value.in ()));
+                        options.environment[i].name.in (),
+                        options.environment[i].value.in ()));
     }
 
   _tao_rh->add_or_update_server ();
@@ -970,8 +970,8 @@ ImR_Locator_i::remove_server
   if (this->opts_->readonly ())
     {
       ORBSVCS_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) ImR: Can't remove server <%C> due to locked database.\n"),
-                  id));
+                      ACE_TEXT ("(%P|%t) ImR: Can't remove server <%C> due to locked database.\n"),
+                      id));
       CORBA::Exception *ex =
         new CORBA::NO_PERMISSION (CORBA::SystemException::_tao_minor_code
                                   (TAO_IMPLREPO_MINOR_CODE, 0),
@@ -1004,7 +1004,7 @@ ImR_Locator_i::remove_server
   else
     {
       ORBSVCS_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) ImR: Can't remove unknown server <%C>.\n"), id));
+                      ACE_TEXT ("(%P|%t) ImR: Can't remove unknown server <%C>.\n"), id));
       CORBA::Exception *ex = new ImplementationRepository::NotFound;
       ImplementationRepository::AMH_AdministrationExceptionHolder h (ex);
       _tao_rh->remove_server_excep (&h);
@@ -1024,7 +1024,7 @@ ImR_Locator_i::force_remove_server
   if (this->opts_->readonly ())
     {
       ORBSVCS_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) ImR: Can't remove server <%C> due to locked database.\n"),
+                      ACE_TEXT ("(%P|%t) ImR: Can't remove server <%C> due to locked database.\n"),
                       name));
       ex =
         new CORBA::NO_PERMISSION (CORBA::SystemException::_tao_minor_code
@@ -1042,7 +1042,7 @@ ImR_Locator_i::force_remove_server
       ImplementationRepository::AMH_AdministrationExtExceptionHolder h (ex);
       _tao_rh->force_remove_server_excep (&h);
       return;
-   }
+    }
 
   if (!si->alt_info_.null ())
     {
@@ -1064,7 +1064,7 @@ ImR_Locator_i::force_remove_server
       delete aam_rh;
       _tao_rh->force_remove_server ();
       return;
-     }
+    }
 
   bool active = (signum > 0) ?
     this->kill_server_i (si, signum, ex) :
@@ -1162,14 +1162,14 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
     }
   catch (const CORBA::TIMEOUT &ex)
     {
-    info.edit ()->reset_runtime ();
+      info.edit ()->reset_runtime ();
       // Note : This is a good thing. It means we didn't waste our time waiting for
       // the server to finish shutting down.
       if (debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) ImR: Timeout while waiting for <%C> shutdown.\n"),
-                      id));
+                          ACE_TEXT ("(%P|%t) ImR: Timeout while waiting for <%C> shutdown.\n"),
+                          id));
         }
       if (!force && this->opts_->throw_shutdown_exceptions ())
         {
@@ -1178,12 +1178,12 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
     }
   catch (const CORBA::COMM_FAILURE& ex)
     {
-    info.edit ()->reset_runtime ();
+      info.edit ()->reset_runtime ();
       if (debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ImR: COMM_FAILURE while waiting for <%C> shutdown.\n"),
-                      id));
+                          ACE_TEXT ("ImR: COMM_FAILURE while waiting for <%C> shutdown.\n"),
+                          id));
         }
       if (!force && this->opts_->throw_shutdown_exceptions ())
         {
@@ -1195,13 +1195,13 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
       CORBA::ULong minor = ex.minor () & TAO_MINOR_MASK;
       if (minor != TAO_POA_DISCARDING && minor != TAO_POA_HOLDING)
         {
-        info.edit ()->reset_runtime ();
+          info.edit ()->reset_runtime ();
         }
       if (debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ImR: TRANSIENT while waiting for <%C> shutdown.\n"),
-                      id));
+                          ACE_TEXT ("ImR: TRANSIENT while waiting for <%C> shutdown.\n"),
+                          id));
         }
       if (!force && this->opts_->throw_shutdown_exceptions ())
         {
@@ -1213,8 +1213,8 @@ ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si,
       if (debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-            ACE_TEXT ("(%P|%t) ImR: Exception while shutting down <%C>\n"),
-            id));
+                          ACE_TEXT ("(%P|%t) ImR: Exception while shutting down <%C>\n"),
+                          id));
         }
       if (!force && this->opts_->throw_shutdown_exceptions ())
         {
@@ -1238,7 +1238,7 @@ ImR_Locator_i::shutdown_server
       ImplementationRepository::AMH_AdministrationExceptionHolder h (ex);
       _tao_rh->shutdown_server_excep (&h);
       return;
-   }
+    }
 
   if (this->shutdown_server_i (si, ex, false))
     {
@@ -1294,7 +1294,7 @@ ImR_Locator_i::server_is_running
       if (debug_ > 0)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) ImR: Auto adding NORMAL server <%C>.\n"),
+                          ACE_TEXT ("(%P|%t) ImR: Auto adding NORMAL server <%C>.\n"),
                           id));
         }
 
@@ -1362,8 +1362,8 @@ ImR_Locator_i::server_is_running
 
 void
 ImR_Locator_i::server_is_shutting_down
-  (ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh,
-   const char* fqname)
+(ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh,
+ const char* fqname)
 {
   UpdateableServerInfo info (this->repository_, fqname);
   if (info.null ())
@@ -1371,9 +1371,9 @@ ImR_Locator_i::server_is_shutting_down
       if (debug_ > 1)
         {
           ORBSVCS_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_shutting_down: ")
-                      ACE_TEXT ("Unknown server: %C\n"),
-                      fqname));
+                          ACE_TEXT ("(%P|%t) ImR_Locator_i::server_is_shutting_down: ")
+                          ACE_TEXT ("Unknown server: %C\n"),
+                          fqname));
         }
       _tao_rh->server_is_shutting_down ();
       return;
@@ -1381,8 +1381,8 @@ ImR_Locator_i::server_is_shutting_down
 
   if (debug_ > 0)
     ORBSVCS_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) ImR: Server <%C> is shutting down.\n"),
-                fqname));
+                    ACE_TEXT ("(%P|%t) ImR: Server <%C> is shutting down.\n"),
+                    fqname));
 
   if (!info->is_mode(ImplementationRepository::PER_CLIENT))
     {
@@ -1405,8 +1405,8 @@ ImR_Locator_i::server_is_shutting_down
 
 void
 ImR_Locator_i::find
-  (ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh,
-   const char* id)
+(ImplementationRepository::AMH_AdministrationResponseHandler_ptr _tao_rh,
+ const char* id)
 {
   Server_Info_Ptr si = this->repository_->get_active_server (id);
   ImplementationRepository::ServerInformation_var imr_info;
@@ -1427,8 +1427,8 @@ ImR_Locator_i::find
           imr_info->startup.activation= ImplementationRepository::NORMAL;
           if (debug_ > 1)
             ORBSVCS_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%P|%t) ImR: Cannot find server <%C>\n"),
-                        id));
+                            ACE_TEXT ("(%P|%t) ImR: Cannot find server <%C>\n"),
+                            id));
         }
     }
   catch (const CORBA::Exception &ex)
@@ -1490,7 +1490,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 
       if (CORBA::is_nil (obj.in ()))
         {
-        info.reset_runtime ();
+          info.reset_runtime ();
           return;
         }
 
@@ -1504,7 +1504,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 
       if (CORBA::is_nil (info.activator.in ()))
         {
-        info.reset_runtime ();
+          info.reset_runtime ();
           return;
         }
 
@@ -1513,9 +1513,9 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
                         ACE_TEXT ("(%P|%t) ImR: Connected to activator <%C>\n"),
                         info.name.c_str ()));
     }
-  catch (const CORBA::Exception& ex)
+  catch (const CORBA::Exception& )
     {
-    info.reset_runtime ();
+      info.reset_runtime ();
     }
 }
 
@@ -1550,8 +1550,8 @@ ImR_Locator_i::auto_start_servers (void)
           if (debug_ > 1)
             {
               ORBSVCS_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) ImR: AUTO_START Could not activate <%C>\n"),
-                          server_entry->ext_id_.c_str ()));
+                              ACE_TEXT ("(%P|%t) ImR: AUTO_START Could not activate <%C>\n"),
+                              server_entry->ext_id_.c_str ()));
               ex._tao_print_exception ("AUTO_START");
             }
           // Ignore exceptions
@@ -1576,7 +1576,7 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
 
   if (sip->ior.length () == 0)
     {
-    sip->reset_runtime ();
+      sip->reset_runtime ();
       return; // can't connect
     }
 
@@ -1586,7 +1586,7 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
 
       if (CORBA::is_nil (obj.in ()))
         {
-        sip->reset_runtime ();
+          sip->reset_runtime ();
           return;
         }
 
@@ -1722,8 +1722,8 @@ ImR_Locator_i::create_aam (UpdateableServerInfo &info, bool running)
 //-------------------------------------------------------------------------
 
 SyncListener::SyncListener (const char *server,
-                             CORBA::ORB_ptr orb,
-                             LiveCheck &pinger)
+                            CORBA::ORB_ptr orb,
+                            LiveCheck &pinger)
   :LiveListener (server),
    orb_ (CORBA::ORB::_duplicate (orb)),
    pinger_ (pinger),
@@ -1922,7 +1922,7 @@ ImR_Loc_ResponseHandler::send_exception_ext (CORBA::Exception *ex)
   switch (this->op_id_)
     {
     case LOC_FORCE_REMOVE_SERVER:
-        ext_->force_remove_server_excep (&h);
+      ext_->force_remove_server_excep (&h);
       break;
     default:
       break;
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
index e8fd0801ec5..0e3f7f88ec7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp
@@ -550,7 +550,7 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder)
               {
                 this->entry_->release_callback ();
                 this->entry_->status (LS_TRANSIENT);
-             }
+              }
             break;
           }
         default: //case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
@@ -559,7 +559,7 @@ PingReceiver::ping_excep (Messaging::ExceptionHolder * excep_holder)
               {
                 this->entry_->release_callback ();
                 this->entry_->status (LS_DEAD);
-             }
+              }
           }
         }
     }
@@ -825,9 +825,9 @@ LiveCheck::add_server (const char *server,
       LiveEntry *old = 0;
       result = entry_map_.rebind (s, entry, old);
       if (old)
-      {
-        old->status (LS_CANCELED);
-      }
+        {
+          old->status (LS_CANCELED);
+        }
       delete old;
     }
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
index a4d494067bd..3a0bb2368d7 100644
--- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
+++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h
@@ -168,7 +168,7 @@ class Locator_Export LiveEntry
  *
  * An instance of the ping receiver is used to handle the reply from a ping
  * request. Instances are created for the ping, then destroyed.
-`*/
+ `*/
 class Locator_Export PingReceiver :
   public virtual POA_ImplementationRepository::AMI_ServerObjectHandler
 {
@@ -206,9 +206,9 @@ class Locator_Export PingReceiver :
  * */
 
 #if (ACE_SIZEOF_VOID_P == 8)
-  typedef ACE_INT64 LC_token_type;
+typedef ACE_INT64 LC_token_type;
 #else
-  typedef ACE_INT32 LC_token_type;
+typedef ACE_INT32 LC_token_type;
 #endif
 
 class Locator_Export LC_TimeoutGuard
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 279f73fb05f..c5eaa18069f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -29,8 +29,6 @@ TAO_IMR_i::~TAO_IMR_i (void)
 int
 TAO_IMR_i::run ()
 {
-ACE_Time_Value tv(0, 100000);
-ACE_OS::sleep(tv);
   if (this->op_.get () == 0)
     {
       ORBSVCS_ERROR ((LM_ERROR, "Unknown operation"));
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index ddc4935131d..f517c936c2e 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -199,15 +199,15 @@ Invocation::repl_line (void)
 }
 
 void
-Invocation::new_line (ostream &strm, int indent, int offset, bool add_nl, bool show_indent)
+Invocation::new_line (ostream &strm, size_t indent, int offset, bool add_nl, bool show_indent)
 {
   if (add_nl)
     {
       strm << "\n";
     }
 
-  int steps = indent / 20;
-  int extra = indent % 20;
+  size_t steps = indent / 20;
+  size_t extra = indent % 20;
 
   if (steps > 1)
     {
diff --git a/TAO/utils/logWalker/Invocation.h b/TAO/utils/logWalker/Invocation.h
index d1cc33b0b83..6c296d9c468 100644
--- a/TAO/utils/logWalker/Invocation.h
+++ b/TAO/utils/logWalker/Invocation.h
@@ -81,7 +81,7 @@ public:
   Thread *waiter (void) const;
   long handle (void) const;
 
-  void new_line (ostream &strm, int indent, int offset,  bool add_nl, bool show_indent);
+  void new_line (ostream &strm, size_t indent, int offset,  bool add_nl, bool show_indent);
   void dump_detail (ostream &strm, size_t indent, Dump_Mode mode, bool show_handle);
   void dump_rel_time (ostream &strm, const ACE_Time_Value& tv, const ACE_Time_Value& start);
   void dump_start_line (ostream &strm, size_t indent, const ACE_Time_Value& start);