*** empty log message ***

5 files changed, 9 insertions, 14 deletions

diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
index 930be55a812..07a57ca3b88 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
@@ -63,22 +63,21 @@ Dump_Restore::handle_input (ACE_HANDLE)
       return 0;
     }
   
-  int result = -1;
   switch (option[0])
     {
     case 'P' :
     case 'p' :
-      result = set_proc_local ();
+      set_proc_local ();
       break;
     case 'N' :
     case 'n' :
-      result = set_node_local ();
+      set_node_local ();
       break;
     case 'H' :
     case 'h' :
       if (::scanf ("%s %hu", buf1, &port) <= 0)
 	break;
-      result = set_host (buf1, port);
+      set_host (buf1, port);
       break;
     case 'F':
     case 'f':
@@ -90,15 +89,15 @@ Dump_Restore::handle_input (ACE_HANDLE)
       break;
     case 'B' :
     case 'b' :
-      result = populate (Dump_Restore::BIND);
+      populate (Dump_Restore::BIND);
       break;
     case 'U' :
     case 'u' :
-      result = populate (Dump_Restore::UNBIND);
+      populate (Dump_Restore::UNBIND);
       break;
     case 'R' :
     case 'r' :
-      result = populate (Dump_Restore::REBIND);
+      populate (Dump_Restore::REBIND);
       break;
     case 'D':
     case 'd':
@@ -108,15 +107,11 @@ Dump_Restore::handle_input (ACE_HANDLE)
       break;
     case 'Q' :
     case 'q' :
-      result = quit ();
+      quit ();
       break;
     default :
       cout << "Unrecognized command." << endl;
     }
-//  if (result == 0)
-//    cout << "Last operation was successful!" << endl;
-//  else
-//    cout << "Last operation returned: " << result << endl;
 
   display_menu ();
   return 0;
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index 55248dc94f1..557d180c3cc 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -2,7 +2,6 @@
 // $Id$
 
 #define ACE_BUILD_SVC_DLL
-#include "ace/SString.h"
 #include "ace/Set.h"
 #include "ace/Get_Opt.h"
 #include "ace/Naming_Context.h"
diff --git a/netsvcs/lib/Name_Handler.h b/netsvcs/lib/Name_Handler.h
index b37525cdac3..de03ff91568 100644
--- a/netsvcs/lib/Name_Handler.h
+++ b/netsvcs/lib/Name_Handler.h
@@ -19,6 +19,7 @@
 
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
+#include "ace/SString.h"
 
 // Forward declaration.
 class ACE_Naming_Context;
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 51fb22cfa10..6b744d9d7a3 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -4,7 +4,6 @@
 
 #define ACE_BUILD_SVC_DLL
 #include "ace/Get_Opt.h"
-#include "ace/Time_Request_Reply.h"
 #include "TS_Clerk_Handler.h"
 
 ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor,
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index 1fa50763d85..fe0e025303a 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -20,6 +20,7 @@
 #include "ace/Connector.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/Malloc.h"
+#include "ace/Time_Request_Reply.h"
 
 // A simple struct containing delta time and a sequence number
 struct ACE_Time_Info