1 files changed, 7 insertions, 22 deletions
diff --git a/TAO/tests/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h
index 73acff90fcf..bab8bd7f491 100644
--- a/TAO/tests/NestedUpcall/Reactor/server.h
+++ b/TAO/tests/NestedUpcall/Reactor/server.h
@@ -10,16 +10,17 @@
 //    server.h
 //
 // = DESCRIPTION
-//      This class implements a simple NestedUpCalls CORBA server for the NestedUpCalls
-//      example using skeletons generated by the TAO ORB compiler.
+//      This class implements a simple NestedUpCalls CORBA server for
+//      the NestedUpCalls example using skeletons generated by the TAO
+//      ORB compiler.
 //
 // = AUTHORS
 //    Nagarajan Surendran (naga@cs.wustl.edu)
 //
 // ============================================================================
 
-#ifndef _NUC_SERVER_H
-#define _NUC_SERVER_H
+#ifndef TAO_NUC_SERVER_H
+#define TAO_NUC_SERVER_H
 
 #include "ace/Get_Opt.h"
 
@@ -29,9 +30,7 @@
 
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
-#include "orbsvcs/CosNamingC.h"
 #include "reactor_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
 
 class NestedUpCalls_Server
 {
@@ -52,7 +51,7 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
+            char *argv[],
             CORBA::Environment& env);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
@@ -67,32 +66,18 @@ private:
   // Initialises the name server and registers NestedUpCalls reactor with the
   // name server.
 
-  int use_naming_service_;
-  //Flag to tell server not to use the TAO Naming Service to register
-  //the NestedUpCalls reactor.
-
   FILE* ior_output_file_;
   // File to output the NestedUpCalls reactor IOR.
 
   TAO_ORB_Manager orb_manager_;
   // The ORB manager
 
-  TAO_Naming_Server my_name_server_;
-  // An instance of the name server used for registering the reactor
-  // objects.
-
   Reactor_i reactor_impl_;
   // Implementation object of the NestedUpCalls reactor.
 
   Reactor_var reactor_;
   // Reactor_var to register with NamingService.
 
-  CosNaming::NamingContext_var NestedUpCalls_context_;
-  // Naming context for the NestedUpCalls_reactor.
-
-  CosNaming::NamingContext_var naming_context_;
-  // Naming context for the Naming Service.
-
   int argc_;
   // Number of commandline arguments.
 
@@ -100,4 +85,4 @@ private:
   // commandline arguments.
 };
 
-#endif /* _NUC_SERVER_H */
+#endif /* TAO_NUC_SERVER_H */