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

15 files changed, 146 insertions, 101 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h
index 07d64c46271..6e81c989e15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.h
+++ b/TAO/orbsvcs/orbsvcs/Event/BCU.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ace ORB
-// 
+//
 // = FILENAME
 //    Benchmark Computation Units
 //
@@ -18,10 +18,15 @@
 //    numbers.
 // ============================================================================
 
-#if !defined (ACE_BCU_H)
+#ifndef ACE_BCU_H
 #define ACE_BCU_H
 
 #include "ace/OS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/orbsvcs_export.h"
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index a3c398030c8..ddf74892afb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    orbsvcs
-// 
+//
 // = FILENAME
 //    Dispatching_Module
 //
@@ -58,15 +58,15 @@ public:
   // Default construction.
 
   virtual void open (ACE_ES_Consumer_Module *up,
-		     ACE_ES_Correlation_Module *down);
+                     ACE_ES_Correlation_Module *down);
   // Link to adjacent modules.
 
   virtual void connected (ACE_Push_Consumer_Proxy *consumer,
-			  CORBA::Environment &);
+                          CORBA::Environment &);
   // Forward down_.
 
   virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-			      CORBA::Environment &);
+                              CORBA::Environment &);
   // Forward down_.
 
   virtual void disconnected (ACE_Push_Consumer_Proxy *consumer);
@@ -77,11 +77,11 @@ public:
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &) = 0;
+                     CORBA::Environment &) = 0;
   // Forward up_.
 
   virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
+                              u_long &command_action);
   // Called by ACE_ES_Dispatch_Requests when dequeued by RT_Tasks.
 
   virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q);
@@ -132,32 +132,32 @@ class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request : public ACE_RT_Task_Command
 public:
   ACE_ES_Dispatch_Request (void);
   // Default construction.
-  
+
   virtual ~ACE_ES_Dispatch_Request (void);
   // Default destruction.
-  
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   RtecScheduler::handle_t rt_info);
+
+  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
+                           RtecScheduler::handle_t rt_info);
   // All the events must be added after construction to the
   // event_set.
 
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   const TAO_EC_Event_Array &event_set,
-			   RtecScheduler::handle_t rt_info);
+  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
+                           const TAO_EC_Event_Array &event_set,
+                           RtecScheduler::handle_t rt_info);
   // Set consumer_ to <consumer> and copy <event_set> to event_set_.
   // <rt_info> describes the method receiving this dispatch.
 
   ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   const RtecEventComm::Time &time,
-			   RtecScheduler::handle_t rt_info);
+                           const RtecEventComm::Time &time,
+                           RtecScheduler::handle_t rt_info);
   // Set consumer_ to <consumer> and sets
   // single_event_.header.creation_time to <time>.  Sets
   // use_single_event_ to 1.  <rt_info> describes the method
   // receiving this dispatch.
 
   ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   const TAO_EC_Event &event,
-			   RtecScheduler::handle_t rt_info);
+                           const TAO_EC_Event &event,
+                           RtecScheduler::handle_t rt_info);
   // Sets consumer_ and the first slot of event_set_.  We use the
   // event_set_ instead of the single_event_ so that we can just carry
   // around the pointer to <event>.  <rt_info> describes the method
@@ -167,8 +167,8 @@ public:
   // Description of the method receiving this request.
 
   void set (ACE_ES_Dispatching_Base *dispatching_module,
-	    RtecScheduler::OS_Priority priority,
-	    RtecScheduler::Preemption_Subpriority sub_priority);
+            RtecScheduler::OS_Priority priority,
+            RtecScheduler::Preemption_Subpriority sub_priority);
   // For multi-threaded implementations, <dispatching_module> is
   // called back when a request is dequeued.  <priority> is the
   // dispatch priority of the event.  <sub_priority> is the enqueue
@@ -240,7 +240,7 @@ protected:
 
 #if defined (ACE_WIN32)
 class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
-// = TITLE 
+// = TITLE
 //     Event Service ReactorEx Notification Strategy
 //
 // = DESCRIPTION
@@ -252,7 +252,7 @@ class TAO_ORBSVCS_Export ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
 {
 public:
   ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh,
-		       TAO_EC_Timer_Module *tm);
+                       TAO_EC_Timer_Module *tm);
   // Stores away <eh> for when this->open is called.
 
   int open (void);
@@ -266,7 +266,7 @@ public:
   // point to a dispatching module.
   virtual int notify (void);
   virtual int notify (ACE_Event_Handler *,
-		      ACE_Reactor_Mask mask);
+                      ACE_Reactor_Mask mask);
 
   //  ACE_HANDLE get_handle (void);
   // Returns event_.handle ().
@@ -284,7 +284,7 @@ typedef ACE_ES_ReactorEx_NS ACE_ES_Notification_Strategy;
 #else // *******************************************************
 
 class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Strategy
-// = TITLE 
+// = TITLE
 //     Event Service Reactor Notification Strategy
 //
 // = DESCRIPTION
@@ -293,7 +293,7 @@ class TAO_ORBSVCS_Export ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Str
 {
 public:
   ACE_ES_Reactor_NS (ACE_Event_Handler *eh,
-		     TAO_EC_Timer_Module *tm);
+                     TAO_EC_Timer_Module *tm);
   // Calls ACE_Reactor_Notification_Strategy with the ORB's reactor
   // and signal mask.
 
@@ -330,18 +330,18 @@ class TAO_ORBSVCS_Export ACE_ES_Dispatch_Queue : public ACE_RT_Task
 {
 public:
   ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module,
-			 ACE_ES_Notification_Strategy *notification_strategy);
+                         ACE_ES_Notification_Strategy *notification_strategy);
   // Stores <dispatching_module> for this->threads_closed.  Stores
   // away <notification_strategy> for this->synch_threads.
 
   int open_queue (RtecScheduler::Period &period,
-		  int threads);
+                  int threads);
   // This is a hack to get the channel to work with the new
   // scheduler.
 
 #if 0
   int open_queue (RtecScheduler::OS_Priority priority,
-		  int threads);
+                  int threads);
   // Creates a name from the <priority> and tries to find a scheduling
   // qos structure.  If one is not found, but created, qos_ is set
   // with default values.  Either way, if qos_->thread_ > 0, it calls
@@ -383,7 +383,7 @@ public:
   // Delete queues.
 
   void connected (ACE_Push_Consumer_Proxy *consumer,
-		  CORBA::Environment &);
+                  CORBA::Environment &);
   // Allocate any needed dispatching resources for this consumers
   // priority.
 
@@ -395,7 +395,7 @@ public:
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // Enqueues the request on the appropriate Dispatch Queue.
 
   virtual void activate (int threads_per_queue);
@@ -465,7 +465,7 @@ public:
   // the dispatching base constructor.
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // Forward up_.
 };
 
@@ -480,16 +480,16 @@ class TAO_ORBSVCS_Export ACE_ES_RTU_Dispatching : public ACE_ES_Priority_Dispatc
 {
 public:
   ACE_ES_RTU_Dispatching (ACE_EventChannel *channel);
-  // Store <channel>.  
+  // Store <channel>.
 
   virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
+                              u_long &command_action);
   // Called by ACE_Dispatch_Queues and handle_signal when an event
   // needs to be dequeued.  Implements an RTU-like delayed preemption
   // policy.
 
   virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // Calls ACE_ES_Priority_Dispatching::push and then checks if
   // preemption is necessary.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 46a1ca2233e..e5ba8e67229 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -159,10 +159,10 @@ private:
   ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> supplier_;
   // Our supplier personality....
 
-  // We use a different Consumer_Proxy 
+  // We use a different Consumer_Proxy
   typedef ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map;
   typedef ACE_Map_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map_Iterator;
-  
+
   Consumer_Map consumer_proxy_map_;
   RtecEventChannelAdmin::ProxyPushConsumer_var default_consumer_proxy_;
   // We talk to the EC (as a supplier) using either an per-supplier
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index e5bfe24a4e8..b00aca0c11f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -54,6 +54,11 @@
 #define TAO_EC_GATEWAY_UDP_H
 
 #include "ace/SOCK_CODgram.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecUDPAdminS.h"
@@ -83,8 +88,8 @@ public:
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
-	     RtecUDPAdmin::AddrServer_ptr addr_server,
-	     ACE_SOCK_Dgram* dgram,
+             RtecUDPAdmin::AddrServer_ptr addr_server,
+             ACE_SOCK_Dgram* dgram,
              CORBA::Environment &_env);
   // To do its job this class requires to know the local EC it will
   // connect to; it also requires to build an RT_Info for the local
@@ -149,7 +154,7 @@ public:
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
              const ACE_INET_Addr& ignore_from,
-	     RtecUDPAdmin::AddrServer_ptr addr_server,
+             RtecUDPAdmin::AddrServer_ptr addr_server,
              CORBA::Environment &_env);
   // To do its job this class requires to know the local EC it will
   // connect to; it also requires to build an RT_Info for the local
@@ -175,10 +180,10 @@ public:
   // The PushSupplier method.
   virtual void disconnect_push_supplier (CORBA::Environment &);
 
-  
+
   void get_addr (const RtecEventComm::EventHeader& header,
-		 RtecUDPAdmin::UDP_Addr_out addr,
-		 CORBA::Environment& env);
+                 RtecUDPAdmin::UDP_Addr_out addr,
+                 CORBA::Environment& env);
   // Call the RtecUDPAdmin::AddrServer
 
 private:
@@ -243,7 +248,7 @@ public:
   TAO_ECG_Mcast_EH (TAO_ECG_UDP_Receiver *recv);
 
   int open (RtecEventChannelAdmin::EventChannel_ptr ec,
-	    CORBA::Environment& _env);
+            CORBA::Environment& _env);
   // Register for changes in the EC subscription list.
   // When the subscription list becomes non-empty we join the proper
   // multicast groups (using the receiver to translate between event
@@ -260,9 +265,9 @@ public:
   // Reactor callbacks
 
   void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-			CORBA::Environment& _env);
+                        CORBA::Environment& _env);
   void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-			CORBA::Environment& _env);
+                        CORBA::Environment& _env);
   // The Observer methods
 
   class Observer : public POA_RtecEventChannelAdmin::Observer
@@ -282,9 +287,9 @@ public:
 
     // The Observer methods
     virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-				  CORBA::Environment& _env);
+                                  CORBA::Environment& _env);
     virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-				  CORBA::Environment& _env);
+                                  CORBA::Environment& _env);
 
   private:
     TAO_ECG_Mcast_EH* eh_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index ef2220d1714..8d7c41842b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -14,7 +14,7 @@
 //
 // = DESCRIPTION
 //   Simple implementations of the UDP Administration service.
-//   
+//
 //   connects to a "remote" EC as a consumer, it also connects to the
 //   <local> EC as a supplier of events, this later EC is usually
 //   collocated.
@@ -60,8 +60,8 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-			 RtecUDPAdmin::UDP_Addr_out addr,
-			 CORBA::Environment& env);
+                         RtecUDPAdmin::UDP_Addr_out addr,
+                         CORBA::Environment& env);
 
 private:
   CORBA::UShort port_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 2203852802e..27ed245a42d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -31,6 +31,11 @@
 #define ACE_EVENT_CHANNEL_H
 
 #include "ace/Containers.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Map_Manager.h"
 
 #include "tao/Timeprobe.h"
@@ -70,7 +75,7 @@ void operator += (TAO_EC_Event_Array &dest,
 // = DESCRIPTION
 //   The Event Channel must compare events (actually event headers)
 //   for equality.
-// 
+//
 ACE_INLINE int operator == (const RtecEventComm::Event &event1,
                             const RtecEventComm::Event &event2);
 
@@ -200,8 +205,8 @@ public:
          SHUTDOWN = CONSUMER | SUPPLIER };
 
   ACE_EventChannel (CORBA::Boolean activate_threads = 1,
-		    u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-		    TAO_Module_Factory* factory = 0);
+                    u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+                    TAO_Module_Factory* factory = 0);
   // Construction of the given <type>.  Check the **_CHANNEL
   // enumerations defined below.
   // By default we activate the threads on construction, but it is
@@ -272,9 +277,9 @@ public:
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-		     CORBA::Environment &env);
+                     CORBA::Environment &env);
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-				CORBA::Environment &env);
+                                CORBA::Environment &env);
   // The observer manipulators
 
   // = Timer managment
@@ -288,7 +293,7 @@ public:
 
   int cancel_timer (RtecScheduler::OS_Priority preemption_priority,
                     int id,
-		    ACE_ES_Timer_ACT *&act);
+                    ACE_ES_Timer_ACT *&act);
   // Cancel the timer associated with the priority of
   // <preemption_priority> and <id>.  <act> is filled in with the
   // Timer_ACT used when scheduling the timer.  Returns 0 on success,
@@ -327,10 +332,10 @@ private:
     //   + When was the last update.
     //   + Does it want to receive all changes?
     //
-    
+
     Observer_Entry (void);
     Observer_Entry (RtecEventChannelAdmin::Observer_Handle h,
-		    RtecEventChannelAdmin::Observer_ptr o);
+                    RtecEventChannelAdmin::Observer_ptr o);
 
     RtecEventChannelAdmin::Observer_Handle handle;
     // The handle
@@ -957,7 +962,7 @@ public:
   // Unregister the consumer from the Event Service.
 
   virtual void push (const ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &);
   // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin.
@@ -971,7 +976,7 @@ public:
 
   void fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos);
   // Fill the QoS with the disjuction off all the subscriptions in
-  // this EC. 
+  // this EC.
   // It leaves the gateways out of the list.
 
 private:
@@ -1159,14 +1164,14 @@ private:
   // = Push helper methods.
 
   int push_source (ACE_Push_Supplier_Proxy *source,
-		   const TAO_EC_Event &event,
-		   CORBA::Environment &_env);
+                   const TAO_EC_Event &event,
+                   CORBA::Environment &_env);
   // Push <event> to all consumers subscribed to all events from
   // <source>.  Returns 0 on success, -1 on failure.
 
   int push_source_type (ACE_Push_Supplier_Proxy *source,
                         const TAO_EC_Event &event,
-			CORBA::Environment &_env);
+                        CORBA::Environment &_env);
   // Push <event> to all consumers subscribed to <event>.type_ from
   // <source>.  Returns 0 on success, -1 on failure.
 
@@ -1217,7 +1222,7 @@ public:
 
   virtual void push (ACE_Push_Supplier_Proxy *proxy,
                      RtecEventComm::EventSet &event,
-		     CORBA::Environment &);
+                     CORBA::Environment &);
   // The supplier module acts on behalf of the supplier proxy to
   // forward events through the channel.
 
@@ -1238,7 +1243,7 @@ public:
 
   void fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos);
   // Fill the QoS with the disjuction off all the publications in
-  // this EC. 
+  // this EC.
   // It leaves the gateways out of the list.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index c740d70303e..66a281e7c22 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#if !defined (TAO_EC_EVENT_MANIP_H)
+#ifndef TAO_EC_EVENT_MANIP_H
 #define TAO_EC_EVENT_MANIP_H
 
 #include "orbsvcs/RtecEventCommC.h"
@@ -44,7 +44,7 @@ public:
 
   ~TAO_EC_Event_Set (void);
   // destructor
-  
+
   CORBA::ULong length (void) const;
   // The length.
 
@@ -71,7 +71,7 @@ private:
 private:
   CORBA::ULong length_;
   // The length of the buffer.
-  
+
   RtecEventComm::Event* buffer_;
   // The buffer.
 
@@ -79,7 +79,7 @@ private:
   // Synchronize access to the class internals.
 
   CORBA::ULong refcnt_;
-  // The reference count.  
+  // The reference count.
 };
 
 class TAO_ORBSVCS_Export TAO_EC_Event
@@ -104,7 +104,7 @@ public:
                 CORBA::ULong index);
   // Constructor, we assume ownership (i.e. duplicate and release the
   // set)
-  
+
   ~TAO_EC_Event (void);
   // Destructor
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
index 5ff831379c2..ced85087e93 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
@@ -1,24 +1,29 @@
 //
 // $Id$
 //
-#if !defined (FAST_REACTOR_H)
+#ifndef FAST_REACTOR_H
 #define FAST_REACTOR_H
 
 #if defined (ACE_OLD_STYLE_REACTOR)
 # if defined (ACE_WIN32)
 #   include "ace/ReactorEx.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx 
-# else 
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#   define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx
+# else
 #   include "ace/Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Reactor 
+#   define ACE_ES_FAST_REACTOR_BASE ACE_Reactor
 # endif /* ACE_WIN32 */
 #else
 # if defined (ACE_WIN32)
 #   include "ace/WFMO_Reactor.h"
 #   define ACE_ES_FAST_REACTOR_BASE ACE_WFMO_Reactor
-# else 
+# else
 #   include "ace/Select_Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor 
+#   define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor
 # endif /* ACE_WIN32 */
 #endif /* ACE_OLD_STYLE_REACTOR */
 //## end module.includes
@@ -34,14 +39,14 @@ public:
     ACE_Time_Value *this_timeout = &timer_buf ;
 
     if (this->timer_queue_->calculate_timeout (max_wait_time,
-					       this_timeout) == 0) 
+                                               this_timeout) == 0)
       {
-	ACE_Time_Value t (0, 500000);
-	ACE_OS::select (0, 0, 0, 0, &t);
+        ACE_Time_Value t (0, 500000);
+        ACE_OS::select (0, 0, 0, 0, &t);
       }
     else
       {
-	ACE_OS::select (0, 0, 0, 0, this_timeout);
+        ACE_OS::select (0, 0, 0, 0, this_timeout);
       }
 
     return this->timer_queue_->expire () == -1 ? -1 : 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
index 8ce6e79488b..c2c6f093f30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
+++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
@@ -10,10 +10,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_GPlot_File_H)
+#ifndef ACE_GPlot_File_H
 #define ACE_GPlot_File_H
 
 #include "ace/Map_Manager.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Synch.h"
 
 class TAO_ORBSVCS_Export ACE_GPlot_File
@@ -25,7 +30,7 @@ class TAO_ORBSVCS_Export ACE_GPlot_File
 //      entry   value
 //      entry   value
 //      entry   value
-//	  ...
+//        ...
 //    They represent x,y pairs to be graphed by GPlot.  entry's are
 //    type long.  value's are type long or float.
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index cc37eb01d12..4ba8dbb44c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ORB Services
-// 
+//
 // = FILENAME
 //    Local_ESTypes.h
 //
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
index 4ec2467f90b..b246930b37a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    ORB Services
-// 
+//
 // = FILENAME
 //    Memory_Pools
 //
@@ -18,6 +18,11 @@
 #define ACE_MEMORY_POOLS_H
 
 #include "ace/Synch.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "Event_Channel.h"
 #include "Dispatching_Modules.h"
 
@@ -31,10 +36,10 @@
   typedef ACE_Thread_Mutex ACE_MEMORY_POOL_MUTEX;
 #endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION || !ACE_HAS_THREADS */
 
-typedef char 
+typedef char
         ACE_ES_Dispatch_Request_Chunk[sizeof (ACE_ES_Dispatch_Request)];
 
-typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX> 
+typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX>
         _ACE_Dispatch_Request_Allocator;
 
 class TAO_ORBSVCS_Export ACE_ES_Dispatch_Request_Allocator : public _ACE_Dispatch_Request_Allocator
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
index dd8198bc255..8233726cdea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
@@ -50,7 +50,7 @@ class TAO_ORBSVCS_Export TAO_Module_Factory
   //   achieved by constructing modules with different dynamic
   //   types.  This class encapsulates all the strategies creation in
   //   a single point.
-  // 
+  //
 public:
   virtual ~TAO_Module_Factory (void);
 
@@ -93,7 +93,7 @@ class TAO_ORBSVCS_Export TAO_Default_Module_Factory : public TAO_Module_Factory
   //   achieved by constructing modules with different dynamic
   //   types.  This class encapsulates all the strategies creation in
   //   a single point.
-  // 
+  //
 public:
   TAO_Default_Module_Factory (void);
   virtual ~TAO_Default_Module_Factory (void);
@@ -137,7 +137,7 @@ class TAO_ORBSVCS_Export TAO_Reactive_Module_Factory : public TAO_Module_Factory
   //   An Event Channel configured with this factory can exhibit high
   //   priority inversion, but it should provide high-performance due
   //   to the elimination of context switching.
-  // 
+  //
 public:
   TAO_Reactive_Module_Factory (void);
   virtual ~TAO_Reactive_Module_Factory (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index d506aa3393f..be8fc01ff9e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -18,10 +18,15 @@
 //
 // ============================================================================
 
-#if !defined (ACE_RT_TASK_H)
+#ifndef ACE_RT_TASK_H
 #define ACE_RT_TASK_H
 
 #include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/RtecSchedulerC.h"
 
 class TAO_ORBSVCS_Export ACE_RT_Thread_Manager : public ACE_Thread_Manager
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
index 3bd0a1c25c1..8ae5982544d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.h
@@ -13,6 +13,11 @@
 
 // Added these.
 #include "ace/Timer_Heap.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/Timer_List.h"
 
 #include "Local_ESTypes.h"
@@ -61,7 +66,7 @@ private:
   ACE_Timer_List timer_queue_;
   // The timer storage mechanism used by reactor_.
 
-#if !defined (ACE_OLD_STYLE_REACTOR)
+#ifndef ACE_OLD_STYLE_REACTOR
   ACE_ES_Fast_Reactor fast_reactor_;
   // The timer dispatch mechanism.
 #endif /* ! ACE_OLD_STYLE_REACTOR */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index 6e0c39fc0e2..2d988fac177 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -3,10 +3,15 @@
 // $Id$
 //
 
-#if !defined(TAO_EC_TIMER_MODULE_H)
+#ifndef TAO_EC_TIMER_MODULE_H
 #define TAO_EC_TIMER_MODULE_H
 
 #include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/orbsvcs/Event/RT_Task.h"
 
@@ -53,8 +58,8 @@ public:
   // Add a timer at the given priority.
 
   virtual int register_handler (RtecScheduler::Preemption_Priority priority,
-				ACE_Event_Handler* eh,
-				ACE_HANDLE handle) = 0;
+                                ACE_Event_Handler* eh,
+                                ACE_HANDLE handle) = 0;
   // Register a handler?????
 
   virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority) = 0;
@@ -95,8 +100,8 @@ public:
                             int id,
                             const void*& act);
   virtual int register_handler (RtecScheduler::Preemption_Priority priority,
-				ACE_Event_Handler* eh,
-				ACE_HANDLE handle);
+                                ACE_Event_Handler* eh,
+                                ACE_HANDLE handle);
   virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
 
 private:
@@ -149,14 +154,14 @@ public:
                             int id,
                             const void*& act);
   virtual int register_handler (RtecScheduler::Preemption_Priority priority,
-				ACE_Event_Handler* eh,
-				ACE_HANDLE handle);
+                                ACE_Event_Handler* eh,
+                                ACE_HANDLE handle);
   virtual ACE_Reactor* reactor (RtecScheduler::Preemption_Priority priority);
-  
+
 private:
   int shutdown_;
   // The reactors are shutdown, do not attempt to restart them.
-  
+
   ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES];
   // The set of ReactorTasks