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

12 files changed, 81 insertions, 41 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 2afe1be97a5..7229424b1ea 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_CUBIT_CLIENT_H)
+#ifndef _CUBIT_CLIENT_H
 #define _CUBIT_CLIENT_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 #include "tao/corba.h"
 #include "cubitC.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 2f2e65cb619..361cf838b46 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (_CUBIT_SERVER_H)
+#ifndef _CUBIT_SERVER_H
 #define _CUBIT_SERVER_H
 
 #include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Log_Msg.h"
 #include "tao/TAO.h"
 #include "Cubit_Client.h"
@@ -47,11 +52,11 @@ public:
 
   int init (int argc,
             char **argv,
-	    CORBA::Environment& env);
+            CORBA::Environment& env);
   // Initialize the Cubit_Server state - parsing arguments and ...
 
   int run (CORBA::Environment& env);
-  // Run the orb 
+  // Run the orb
 
 private:
   int parse_args (void);
@@ -65,7 +70,7 @@ private:
 
   Cubit_Factory_i *factory_impl_;
   // Implementation object of the cubit factory.
-       
+
   int argc_;
   // Number of commandline arguments.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index b4c43ab1e07..318d821af33 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -4,17 +4,17 @@
 //
 // = LIBRARY
 //    TAO/tests/IDL_Cubit
-// 
+//
 // = FILENAME
 //    Cubit_Client.h
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
+//
 // ============================================================================
 
-#if !defined (_CUBIT_I_H)
-#define	_CUBIT_I_H
+#ifndef _CUBIT_I_H
+#define _CUBIT_I_H
 
 #include "cubitS.h"
 
@@ -64,23 +64,23 @@ public:
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
-				   Cubit::long_seq_out output,
-				   CORBA::Environment &env);
+                                   Cubit::long_seq_out output,
+                                   CORBA::Environment &env);
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
-				    Cubit::octet_seq_out output,
-				    CORBA::Environment &_env);
+                                    Cubit::octet_seq_out output,
+                                    CORBA::Environment &_env);
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
                                    Cubit::many_seq_out output,
                                    CORBA::Environment &_tao_environment);
   // Cube an Many sequence.
-  
+
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
-			      Cubit::RtiPacket_out output,
-			      CORBA::Environment &env);
+                              Cubit::RtiPacket_out output,
+                              CORBA::Environment &env);
   // Cube a sequence.
 
   virtual void shutdown (CORBA::Environment &env);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
index 9793c60632b..31b2ca800f0 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.h
@@ -4,16 +4,16 @@
 //
 // = LIBRARY
 //    TAO/tests/IDL_Cubit
-// 
+//
 // = FILENAME
 //    RTI_IO.h
 //
 // = AUTHOR
 //    Dave Meyer <dmeyer@std.saic.com>
-// 
+//
 // ============================================================================
 
-#if !defined (_RTIFUNCS_H)
+#ifndef _RTIFUNCS_H
 #define _RTIFUNCS_H
 
 #include "cubitC.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 84100d9c182..e08c85d7af9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (MT_CUBIT_TASK_H)
+#ifndef MT_CUBIT_TASK_H
 #define MT_CUBIT_TASK_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/ARGV.h"
 #include "tao/TAO.h"
 #include "cubit_i.h"
@@ -31,8 +36,8 @@ public:
   Cubit_Task (const char *args,
               const char* orbname,
               u_int num_of_objs,
-	      ACE_Thread_Manager *thr_mgr,
-	      u_int task_id);
+              ACE_Thread_Manager *thr_mgr,
+              u_int task_id);
   // Constructor.
 
   virtual int svc (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index bf9fc4af03b..334a2d76491 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (GLOBALS_H)
+#ifndef GLOBALS_H
 #define GLOBALS_H
 
 // ============================================================================
@@ -21,6 +21,11 @@
 // ============================================================================
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Get_Opt.h"
 #include "ace/Synch_T.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index d5ccfc21ff0..23b53972a78 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -14,10 +14,15 @@
 //
 // ============================================================================
 
-#if !defined (TASK_CLIENT_H)
+#ifndef TASK_CLIENT_H
 #define TASK_CLIENT_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
index b42ea4c334c..653426c106b 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.h
@@ -11,14 +11,19 @@
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan
-//    Surendran. 
+//    Surendran.
 //
 // ============================================================================
 
-#if !defined (_MT_CUBIT_TIMER_H)
+#ifndef _MT_CUBIT_TIMER_H
 #define _MT_CUBIT_TIMER_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/High_Res_Timer.h"
 
 class MT_Cubit_Timer
@@ -37,10 +42,10 @@ public:
 private:
   ACE_High_Res_Timer timer_;
   // timer.
-  
+
   ACE_Time_Value delta_;
   // Elapsed time in microseconds.
-  
+
   u_int granularity_;
   // This is the granularity of the timing of the CORBA requests. A
   // value of 5 represents that we will take time every 5 requests,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
index cd8e4074f39..cad2577da57 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h
@@ -11,11 +11,11 @@
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee, Sergio Flores-Gaitan and Nagarajan
-//    Surendran. 
+//    Surendran.
 //
 // ============================================================================
 
-#if !defined (UTIL_THREAD_H)
+#ifndef UTIL_THREAD_H
 #define UTIL_THREAD_H
 
 #include "Task_Client.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
index 7cc2dab60b2..b01a1acc4b6 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.h
@@ -16,6 +16,11 @@
 // ============================================================================
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -42,7 +47,7 @@ class Client_i : public virtual MT_Priority
 public:
   Client_i (void);
   //constructor.
-  
+
   ~Client_i (void);
   // destructor.
 
@@ -109,7 +114,7 @@ private:
 
   ACE_High_Res_Timer timer_;
   // Timer for timing the tests.
-  
+
   MT_Priority priority_;
   // Priority helper object.
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index fd2622208ab..c8292d754f2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#if !defined (_CUBIT_I_H)
+#ifndef _CUBIT_I_H
 #define _CUBIT_I_H
 
 #include "cubitS.h"
@@ -27,19 +27,19 @@ public:
   // = Initialization and termination methods.
   Cubit_i (CORBA::ORB_ptr orb);
   ~Cubit_i (void);
-   
+
   virtual CORBA::Octet cube_octet (CORBA::Octet o,
                                    CORBA::Environment &env);
 
   virtual CORBA::Short cube_short (CORBA::Short s,
                                    CORBA::Environment &env);
-  
+
   virtual CORBA::Long cube_long (CORBA::Long l,
                                  CORBA::Environment &env);
-  
+
   virtual Cubit::Many cube_struct (const Cubit::Many &values,
                                    CORBA::Environment &env);
-  
+
   virtual void noop (CORBA::Environment &env);
 
   virtual void shutdown (CORBA::Environment &env);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index b409b7d904e..9a2432155c9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -11,11 +11,11 @@
 //
 // = AUTHOR
 //    Andy Gokhale, Sumedh Mungee,Sergio Flores-Gaitan and Nagarajan
-//    Surendran. 
+//    Surendran.
 //
 // ============================================================================
 
-#if !defined (SERVER_H)
+#ifndef SERVER_H
 #define SERVER_H
 
 // ACE includes.
@@ -28,6 +28,11 @@
 #endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/ARGV.h"
@@ -50,7 +55,7 @@ extern "C" STATUS vmeDrv (void);
 extern "C" STATUS vmeDevCreate (char *);
 #endif /* VME_DRIVER */
 
-class Server  
+class Server
 {
   // = TITLE
   //     A multithreaded cubit server class.
@@ -132,7 +137,7 @@ private:
 
   MT_Priority priority_;
   // Priority helper object.
-  
+
   ACE_Thread_Manager servant_manager_;
   // Thread manager for the servant threads.
 };