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

9 files changed, 61 insertions, 45 deletions

diff --git a/performance-tests/Misc/basic_func.h b/performance-tests/Misc/basic_func.h
index 84dba6d208f..9628087aa2c 100644
--- a/performance-tests/Misc/basic_func.h
+++ b/performance-tests/Misc/basic_func.h
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    performance-tests/Misc
-// 
+//
 // = FILENAME
 //    basic_func.h
 //
@@ -13,11 +13,18 @@
 //
 // = AUTHOR
 //    David Levine
-// 
+//
 // ============================================================================
 
+#ifndef BASIC_FUNC_H
+#define BASIC_FUNC_H
+
 #include "ace/ACE.h"
 
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 extern int A,B,C,D,E,F;
 
 // If your compiler optimizes away Empty_Iteration_Test::run (), then
@@ -67,5 +74,4 @@ class Foo_d_v : public Foo_v
     virtual void v_func ();
 };
 
-
-// EOF
+#endif /8 BASIC_FUNC_H */
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
index 7375602c22e..8a4d57a6cbc 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#if !defined (ACE_BASELINE_TEST_H)
+#ifndef ACE_BASELINE_TEST_H
 #define ACE_BASELINE_TEST_H
 
 #include "Benchmark_Base.h"
diff --git a/performance-tests/Synch-Benchmarks/Benchmark_Base.h b/performance-tests/Synch-Benchmarks/Benchmark_Base.h
index c5ee7e9da17..ed3e46099a6 100644
--- a/performance-tests/Synch-Benchmarks/Benchmark_Base.h
+++ b/performance-tests/Synch-Benchmarks/Benchmark_Base.h
@@ -3,10 +3,15 @@
 
 /* Defines the base class used to dynamically link in the benchmark tests */
 
-#if !defined (ACE_BENCHMARK_BASE_H)
+#ifndef ACE_BENCHMARK_BASE_H
 # define ACE_BENCHMARK_BASE_H
 
 # include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 # include "ace/Service_Repository.h"
 # include "ace/Synch.h"
 # include "ace/Service_Types.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h b/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
index 1845c06d023..eae59d82db6 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
@@ -1,6 +1,6 @@
 // $Id$
 
-#if !defined (ACE_ADAPTIVE_LOCK_PERFORMANCE_TEST_BASE_H)
+#ifndef ACE_ADAPTIVE_LOCK_PERFORMANCE_TEST_BASE_H
 #define ACE_ADAPTIVE_LOCK_PERFORMANCE_TEST_BASE_H
 #include "Benchmark_Performance.h"
 
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
index b1b7eaa7c94..44951835f40 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
@@ -3,7 +3,7 @@
 
 /* Defines the class used to dynamically link in the benchmark tests */
 
-#if !defined (ACE_BENCHMARK_PERFORMANCE_H)
+#ifndef ACE_BENCHMARK_PERFORMANCE_H
 #define ACE_BENCHMARK_PERFORMANCE_H
 
 #include "../Benchmark_Base.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
index 29fe7affc73..18eab50afed 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#if !defined (ACE_PERFORMANCE_TEST_H)
+#ifndef ACE_PERFORMANCE_TEST_H
 #define ACE_PERFORMANCE_TEST_H
 
 #include "../Benchmark_Base.h"
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
index a8ea66c4ff3..80a867df9de 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.h
@@ -3,10 +3,15 @@
 
 // Option manager for performance tests.
 
-#if !defined (_PERFORMANCE_TEST_OPTIONS_H)
+#ifndef _PERFORMANCE_TEST_OPTIONS_H
 #define _PERFORMANCE_TEST_OPTIONS_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Profile_Timer.h"
 #include "ace/Log_Msg.h"
 #include "ace/Thread_Manager.h"
@@ -86,36 +91,36 @@ public:
 
   ACE_Atomic_Op<ACE_Thread_Mutex, size_t> msg_count;        // Keep track of number of messages atomically.
   int *thr_work_count;  // Count activity per-thread.
-  int thr_wc_size;	     // Max number of threads.
+  int thr_wc_size;           // Max number of threads.
 
 private:
-  ACE_Profile_Timer _itimer;	        // Keep track of time.
-  char		*_service_entry;        // Name of the shared object file and shared object.
-  char		*_mapped_file;          // Name of the mapped file.
-  char		*_pipe_addr;            // Name of the STREAM pipe.
-  size_t	_sleep_time;            // Time to sleep.
-  size_t	_n_lwps;                // Number of LWPs.
-  size_t	_thr_count;             // Number of threads to spawn.
-  long		_t_flags;               // Flags to thr_create().
-  size_t	_high_water_mark;       // ACE_Queue high water mark.
-  size_t	_low_water_mark;        // ACE_Queue low water mark.
-  size_t	_msg_size;              // Size of a message.
-  size_t	_initial_queue_length;  // Initial number of items in the queue.
-  size_t	_logical_connections;   // Number of logical connections.
-  size_t	_physical_connections;  // Number of physical connections.
-  size_t	_iterations;            // Number of iterations to run the test program.
-  int		_generate;              // Generate the data.
-  int		_udp;                   // Use UDP format.
-  int		_debugging;             // Extra debugging info.
-  int		_verbosity;             // Extra verbose messages.
-  int		_ack;                   // Do an acknowledgement.
-  int		_checksum;              // Is checksumming enabled?.
-  int		_xdr;                   // Is xdr conversion enabled?.
-  int		_free_memory;           // Are we freeing up memory?.
-  int		_zero_copy;             // Implement a zero-copy driver?.
-  int		_print_summary;         // Print a summary of the results only.
-  int		_consecutive_ports;     // Number of consecutive messages from same port.
-  int		_eager_exit;            // Exit eagerly, without cleaning up.
+  ACE_Profile_Timer _itimer;            // Keep track of time.
+  char          *_service_entry;        // Name of the shared object file and shared object.
+  char          *_mapped_file;          // Name of the mapped file.
+  char          *_pipe_addr;            // Name of the STREAM pipe.
+  size_t        _sleep_time;            // Time to sleep.
+  size_t        _n_lwps;                // Number of LWPs.
+  size_t        _thr_count;             // Number of threads to spawn.
+  long          _t_flags;               // Flags to thr_create().
+  size_t        _high_water_mark;       // ACE_Queue high water mark.
+  size_t        _low_water_mark;        // ACE_Queue low water mark.
+  size_t        _msg_size;              // Size of a message.
+  size_t        _initial_queue_length;  // Initial number of items in the queue.
+  size_t        _logical_connections;   // Number of logical connections.
+  size_t        _physical_connections;  // Number of physical connections.
+  size_t        _iterations;            // Number of iterations to run the test program.
+  int           _generate;              // Generate the data.
+  int           _udp;                   // Use UDP format.
+  int           _debugging;             // Extra debugging info.
+  int           _verbosity;             // Extra verbose messages.
+  int           _ack;                   // Do an acknowledgement.
+  int           _checksum;              // Is checksumming enabled?.
+  int           _xdr;                   // Is xdr conversion enabled?.
+  int           _free_memory;           // Are we freeing up memory?.
+  int           _zero_copy;             // Implement a zero-copy driver?.
+  int           _print_summary;         // Print a summary of the results only.
+  int           _consecutive_ports;     // Number of consecutive messages from same port.
+  int           _eager_exit;            // Exit eagerly, without cleaning up.
 };
 
 // Make this available to any code that wants to see it!
diff --git a/performance-tests/TTCP/ORBeline/ttcp_i.h b/performance-tests/TTCP/ORBeline/ttcp_i.h
index b7a82a1b84a..0a4ed7b4b5c 100644
--- a/performance-tests/TTCP/ORBeline/ttcp_i.h
+++ b/performance-tests/TTCP/ORBeline/ttcp_i.h
@@ -5,7 +5,7 @@
 // ttcp_i.C
 // implementation of the ttcp and Profile_Logger objects.
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 // This is a total hack...
@@ -16,7 +16,7 @@
 class ttcp_string_i : public ttcp_string_impl {
 public:
 
-  ttcp_string_i();  
+  ttcp_string_i();
 
   virtual void send(const CORBA::String& ttcp_string);
   virtual void send_hack(const CORBA::String& ttcp_string);
@@ -30,7 +30,7 @@ private:
 class ttcp_sequence_i : public ttcp_sequence_impl {
 public:
 
-  ttcp_sequence_i();  
+  ttcp_sequence_i();
 
   virtual void send(const ttcp_sequence::my_sequence& ttcp_seq);
   virtual void send_hack(const CORBA::String& ttcp_string);
diff --git a/performance-tests/TTCP/Orbix/ttcp_i.h b/performance-tests/TTCP/Orbix/ttcp_i.h
index 5db365ee4d1..b9caf2135a5 100644
--- a/performance-tests/TTCP/Orbix/ttcp_i.h
+++ b/performance-tests/TTCP/Orbix/ttcp_i.h
@@ -3,14 +3,14 @@
 
 
 // ttcp_i.C
-// 
+//
 
-#if !defined (TTCP_I_H)
+#ifndef TTCP_I_H
 #define TTCP_I_H
 
 #include "ttcp.hh"
 
-class ttcp_sequence_i 
+class ttcp_sequence_i
   : virtual public ttcp_sequenceBOAImpl
 {
 public:
@@ -25,7 +25,7 @@ private:
 
 // DEF_TIE_ttcp_sequence (ttcp_sequence_i);
 
-class ttcp_string_i 
+class ttcp_string_i
   : virtual public ttcp_stringBOAImpl
 {
 public: