changed include protection from #if !defined to ifndef, and added #pragma once, if possible

5 files changed, 26 insertions, 26 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h b/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h
index acc872f2ee1..d783604a6be 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ir_implrepo_impl.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/orbsvcs/tests/ImplRepo
-// 
+//
 // = FILENAME
 //    ir_implrepo_impl.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (IR_IMPLREPO_IMPL_H)
-#define	IR_IMPLREPO_IMPL_H
+#ifndef IR_IMPLREPO_IMPL_H
+#define IR_IMPLREPO_IMPL_H
 
 #include "Impl_RepoS.h"
 #include "tao/TAO.h"
@@ -36,7 +36,7 @@ typedef IR_Simple_i_ptr IR_Simple_i_ref;
 class IR_iRepo_i : public POA_Implementation_Repository
 {
   // = TITLE
-  //    Implementation Repository 
+  //    Implementation Repository
   //
   // = DESCRIPTION
   //    This provides the interface to communicate directly with the
@@ -55,14 +55,14 @@ public:
                                   CORBA::Object_ptr &obj,
                                   const Implementation_Repository::INET_Addr &addr,
                                   CORBA::Environment &_tao_environment);
-  
+
   // = Other methods
 
   int init (int argc, char **argv, CORBA::Environment& env);
   // Initialize the Server state - parsing arguments and waiting
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
   void start (const char *server);
   // Starts the program registered as <server>
@@ -101,7 +101,7 @@ class IR_Adapter_Activator : public POA_PortableServer::AdapterActivator
   //    Implementation Repository Adapter Activator
   //
   // = DESCRIPTION
-  //    Part of the Default Servant/DSI combination that forwards 
+  //    Part of the Default Servant/DSI combination that forwards
   //    arbitrary requests.  This allows for the setting up of child POAs
   //    with default servants.
 public:
@@ -122,7 +122,7 @@ class IR_Simple_i: public POA_simple_object
   //    Simple Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    returns the cube of a long, another that shuts down the server.
 public:
   //  = Constructor and Destructor
diff --git a/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h b/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h
index 6da5fd7fc5c..df38d3b39f0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ir_server_impl.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (IR_SERVER_IMPL_H)
+#ifndef IR_SERVER_IMPL_H
 #define IR_SERVER_IMPL_H
 
 #include "ir_simple_object_impl.h"
@@ -30,7 +30,7 @@ class IR_Server_i
   //   CORBA Server Implementation
   //
   // = DESCRIPTION
-  //   
+  //
 public:
   // = Initialization and termination methods.
   IR_Server_i (void);
@@ -43,7 +43,7 @@ public:
   // Initialize the Server state - parsing arguments and waiting
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   IR_Simple_i *server_impl_;
diff --git a/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h b/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h
index 53d178751b7..eb0d7fc24c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/ir_simple_object_impl.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/tests/Simple
-// 
+//
 // = FILENAME
 //    simple_object_impl.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (IR_SIMPLE_OBJECT_IMPL_H)
-#define	IR_SIMPLE_OBJECT_IMPL_H
+#ifndef IR_SIMPLE_OBJECT_IMPL_H
+#define IR_SIMPLE_OBJECT_IMPL_H
 
 #include "Impl_RepoS.h"
 
@@ -35,7 +35,7 @@ class IR_Simple_i: public POA_simple_object
   //    Simple Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    returns the cube of a long, another that shuts down the server.
 public:
   IR_Simple_i (CORBA::ORB_ptr orb_ptr,
diff --git a/TAO/orbsvcs/tests/ImplRepo/server_impl.h b/TAO/orbsvcs/tests/ImplRepo/server_impl.h
index a87424cff4a..c33e6edf8cd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/server_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/server_impl.h
@@ -18,7 +18,7 @@
 //
 // ============================================================================
 
-#if !defined (SERVER_IMPL_H)
+#ifndef SERVER_IMPL_H
 #define SERVER_IMPL_H
 
 #include "simple_object_impl.h"
@@ -30,7 +30,7 @@ class Server_i
   //   CORBA Server Implementation
   //
   // = DESCRIPTION
-  //   
+  //
 public:
   // = Initialization and termination methods.
   Server_i (void);
@@ -43,7 +43,7 @@ public:
   // Initialize the Server state - parsing arguments and waiting
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   Simple_i server_impl;
@@ -57,7 +57,7 @@ private:
   // The ORB manager.
 
   char *ir_server_key_;
-  
+
   FILE *ior_output_file_;
   // File where the IOR of the server object is stored.
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
index 59bf4106b7b..1b0818a5444 100644
--- a/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
+++ b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/tests/Simple
-// 
+//
 // = FILENAME
 //    simple_object_impl.h
 //
@@ -14,11 +14,11 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
+//
 // ============================================================================
 
-#if !defined (SIMPLE_OBJECT_IMPL_H)
-#define	SIMPLE_OBJECT_IMPL_H
+#ifndef SIMPLE_OBJECT_IMPL_H
+#define SIMPLE_OBJECT_IMPL_H
 
 #include "Simple_ObjectS.h"
 
@@ -35,7 +35,7 @@ class Simple_i: public POA_simple_object
   //    Simple Object Implementation
   //
   // = DESCRIPTION
-  //    Implementation of a simple object that has two methods, one that 
+  //    Implementation of a simple object that has two methods, one that
   //    returns the cube of a long, another that shuts down the server.
 public:
   Simple_i (const char *obj_name = 0);