ChangeLogTag:Thu Mar 23 14:48:12 2000 Nanbor Wang <nanbor@cs.wustl.edu>

63 files changed, 63 insertions, 63 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/BCU.h b/TAO/orbsvcs/orbsvcs/Event/BCU.h
index 4dd44a8a616..9fef153466f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/BCU.h
+++ b/TAO/orbsvcs/orbsvcs/Event/BCU.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_BCU_H
-#include "ace/pre.h"
 #define ACE_BCU_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h b/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
index 94fe5793787..7cf8de720f8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h
@@ -1,8 +1,8 @@
 // $Id$
 
 #ifndef DEBUG_MACROS_H
-#include "ace/pre.h"
 #define DEBUG_MACROS_H
+#include "ace/pre.h"
 
 #if defined (ACE_ES_NOLOGGING)
 #define ACE_ES_DEBUG(X)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 41dba0edead..0b7b754892e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -21,8 +21,8 @@
 // ============================================================================
 
 #ifndef ACE_DISPATCHING_MODULES_H
-#include "ace/pre.h"
 #define ACE_DISPATCHING_MODULES_H
+#include "ace/pre.h"
 
 #include "tao/Timeprobe.h"
 #include "orbsvcs/Event/ReactorTask.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 4766de3223c..3ac480fcbb3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_AND_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_AND_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index 4afb8cb03f5..61f565fcafe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_BASIC_FACTORY_H
-#include "ace/pre.h"
 #define TAO_EC_BASIC_FACTORY_H
+#include "ace/pre.h"
 
 #include "EC_Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 4633537ed96..5168d75d823 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_BASIC_FILTER_BUILDER_H
-#include "ace/pre.h"
 #define TAO_EC_BASIC_FILTER_BUILDER_H
+#include "ace/pre.h"
 
 #include "EC_Filter_Builder.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index 50269c51458..f5d7c02160d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_BITMASK_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_BITMASK_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index caafe0b4c0b..8dbb7dc5187 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_BUSY_LOCK_H
-#include "ace/pre.h"
 #define TAO_EC_BUSY_LOCK_H
+#include "ace/pre.h"
 
 #include "ace/OS.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
index 66623273ac2..3ec30798cda 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_COMMAND_H
-#include "ace/pre.h"
 #define TAO_EC_COMMAND_H
+#include "ace/pre.h"
 
 #include "ace/Functor.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
index 6847a1719e5..be93414a967 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONCRETE_PROXY_SET_H
-#include "ace/pre.h"
 #define TAO_EC_CONCRETE_PROXY_SET_H
+#include "ace/pre.h"
 
 #include "tao/corba.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index c873bfcda4d..31aa16deff3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONJUNCTION_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_CONJUNCTION_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 62949e8082a..74dd1fa746d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -22,8 +22,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONSUMERADMIN_H
-#include "ace/pre.h"
 #define TAO_EC_CONSUMERADMIN_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 4172ee9a7d9..9ec6e84b618 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_CONSUMERCONTROL_H
-#include "ace/pre.h"
 #define TAO_EC_CONSUMERCONTROL_H
+#include "ace/pre.h"
 
 #include "orbsvcs/Event/event_export.h"
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 9c1b81749f3..24581dab7e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_DEFAULT_FACTORY_H
-#include "ace/pre.h"
 #define TAO_EC_DEFAULT_FACTORY_H
+#include "ace/pre.h"
 
 #include "EC_Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h b/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
index a6274efc562..a585189b939 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h
@@ -27,8 +27,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_DEFAULTS_H
-#include "ace/pre.h"
 #define TAO_EC_DEFAULTS_H
+#include "ace/pre.h"
 
 #ifndef TAO_EC_ENABLE_DEBUG_MESSAGES
 #define TAO_EC_ENABLE_DEBUG_MESSAGES 0
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index a3c696e7763..94d597e3d46 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_DISJUNCTION_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_DISJUNCTION_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 1dffeb5ffa5..6660b24571d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_DISPATCHING_H
-#include "ace/pre.h"
 #define TAO_EC_DISPATCHING_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventCommC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 932d101a3a7..ab826954cbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_DISPATCHING_TASK_H
-#include "ace/pre.h"
 #define TAO_EC_DISPATCHING_TASK_H
+#include "ace/pre.h"
 
 #include "EC_ProxySupplier.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index be129baaf54..910c6d650db 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -24,8 +24,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_EVENT_CHANNEL_H
-#include "ace/pre.h"
 #define TAO_EC_EVENT_CHANNEL_H
+#include "ace/pre.h"
 
 #include "EC_Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index c90dfad6fbe..4a2e7076fe8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_FACTORY_H
-#include "ace/pre.h"
 #define TAO_EC_FACTORY_H
+#include "ace/pre.h"
 
 #include "orbsvcs/Event/event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index 6049ce9f0e8..620e4eaadf9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_FILTER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventCommC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index af9b7b5a7a3..842078e7018 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_FILTER_BUILDER_H
-#include "ace/pre.h"
 #define TAO_EC_FILTER_BUILDER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 8f5a77a73c0..307cc23adf1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -31,8 +31,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_GATEWAY_H
-#include "ace/pre.h"
 #define TAO_EC_GATEWAY_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecEventCommS.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index 19090205e56..6d1d6cdb9b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -51,8 +51,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_GATEWAY_UDP_H
-#include "ace/pre.h"
 #define TAO_EC_GATEWAY_UDP_H
+#include "ace/pre.h"
 
 #include "ace/SOCK_CODgram.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index a1933264be6..17129ca6336 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_MT_DISPATCHING_H
-#include "ace/pre.h"
 #define TAO_EC_MT_DISPATCHING_H
+#include "ace/pre.h"
 
 #include "EC_Dispatching.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 261925e778b..0e0c8e80ed1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_MASKED_TYPE_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_MASKED_TYPE_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index 286f352f4c1..6d101050de5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_NEGATION_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_NEGATION_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index 289671c2b80..78b0396a863 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_NULL_FACTORY_H
-#include "ace/pre.h"
 #define TAO_EC_NULL_FACTORY_H
+#include "ace/pre.h"
 
 #include "EC_Factory.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 116fa964019..c11b579776b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_NULL_SCHEDULING_H
-#include "ace/pre.h"
 #define TAO_EC_NULL_SCHEDULING_H
+#include "ace/pre.h"
 
 #include "EC_Scheduling_Strategy.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 4608ee42a37..254fdbeaf9c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_OBSERVERSTRATEGY_H
-#include "ace/pre.h"
 #define TAO_EC_OBSERVERSTRATEGY_H
+#include "ace/pre.h"
 
 #include "EC_Worker.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index e9e6becfc6c..73a21552344 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PER_SUPPLIER_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_PER_SUPPLIER_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Supplier_Filter.h"
 #include "EC_Supplier_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index dbea1c1e14d..5e20ce61d3f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PREFIX_FILTER_BUILDER_H
-#include "ace/pre.h"
 #define TAO_EC_PREFIX_FILTER_BUILDER_H
+#include "ace/pre.h"
 
 #include "EC_Filter_Builder.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 189e281ca0f..1c246d9c8e4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PRIORITY_DISPATCHING_H
-#include "ace/pre.h"
 #define TAO_EC_PRIORITY_DISPATCHING_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecSchedulerC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index bbb237794b2..7c698dda626 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PRIORITY_SCHEDULING_H
-#include "ace/pre.h"
 #define TAO_EC_PRIORITY_SCHEDULING_H
+#include "ace/pre.h"
 
 #include "EC_Scheduling_Strategy.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 1d6d3cd8dae..0798ab3cc15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PROXYCONSUMER_H
-#include "ace/pre.h"
 #define TAO_EC_PROXYCONSUMER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event/EC_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index db0e3093a3c..d42e958b040 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PROXYSUPPLIER_H
-#include "ace/pre.h"
 #define TAO_EC_PROXYSUPPLIER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event/EC_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
index 6809311b516..3ca9c10df9c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_PROXY_COLLECTION_H
-#include "ace/pre.h"
 #define TAO_EC_PROXY_COLLECTION_H
+#include "ace/pre.h"
 
 #include "EC_Busy_Lock.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 945dbbbd895..9380a58586c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -22,8 +22,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_QOS_INFO_H
-#include "ace/pre.h"
 #define TAO_EC_QOS_INFO_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecSchedulerC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 22ae408d103..391a64175e0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_REACTIVE_CONSUMERCONTROL_H
-#include "ace/pre.h"
 #define TAO_EC_REACTIVE_CONSUMERCONTROL_H
+#include "ace/pre.h"
 
 #include "EC_ConsumerControl.h"
 #include "EC_Worker.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index bc5b417df1e..9e3d7850a24 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_REACTIVE_SUPPLIERCONTROL_H
-#include "ace/pre.h"
 #define TAO_EC_REACTIVE_SUPPLIERCONTROL_H
+#include "ace/pre.h"
 
 #include "EC_SupplierControl.h"
 #include "EC_Worker.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
index 4afbf5b7adc..404cdd2533c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -24,8 +24,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H
-#include "ace/pre.h"
 #define TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H
+#include "ace/pre.h"
 
 #include "EC_Timeout_Generator.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 958732541f6..15ea75b835a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SCHED_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_SCHED_FILTER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecSchedulerC.h"
 #include "EC_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index e8aa8645d09..f887f1cc0a8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SCHED_FILTER_BUILDER_H
-#include "ace/pre.h"
 #define TAO_EC_SCHED_FILTER_BUILDER_H
+#include "ace/pre.h"
 
 #include "EC_Filter_Builder.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 8a78716d17f..b9a58887a41 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SCHEDULING_STRATEGY_H
-#include "ace/pre.h"
 #define TAO_EC_SCHEDULING_STRATEGY_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/RtecEventCommC.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index f63daf913fc..b0b6652789b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIERADMIN_H
-#include "ace/pre.h"
 #define TAO_EC_SUPPLIERADMIN_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 7eb3a8769d8..34200339341 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIERCONTROL_H
-#include "ace/pre.h"
 #define TAO_EC_SUPPLIERCONTROL_H
+#include "ace/pre.h"
 
 #include "orbsvcs/Event/event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 195c176e940..c57640cb409 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -27,8 +27,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIER_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_SUPPLIER_FILTER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventCommC.h"
 #include "EC_Worker.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 32e6f8643b9..a187d734dc9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_SUPPLIER_FILTER_BUILDER_H
-#include "ace/pre.h"
 #define TAO_EC_SUPPLIER_FILTER_BUILDER_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 1203d4d176a..cd49fc1f5c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_TIMEOUT_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_TIMEOUT_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 46a0751ceba..cb780f373f0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -24,8 +24,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_TIMEOUT_GENERATOR_H
-#include "ace/pre.h"
 #define TAO_EC_TIMEOUT_GENERATOR_H
+#include "ace/pre.h"
 
 #include "orbsvcs/Event/event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 45b08643a89..d84255cda4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_TRIVIAL_SUPPLIER_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_TRIVIAL_SUPPLIER_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Supplier_Filter.h"
 #include "EC_Supplier_Filter_Builder.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 78bde97cc41..9941e5627ba 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -23,8 +23,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_TYPE_FILTER_H
-#include "ace/pre.h"
 #define TAO_EC_TYPE_FILTER_H
+#include "ace/pre.h"
 
 #include "EC_Filter.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index fc148f450f1..e41cad55ead 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -32,8 +32,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_UDP_ADMIN_H
-#include "ace/pre.h"
 #define TAO_EC_UDP_ADMIN_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
 #include "orbsvcs/Event/event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
index 5351c5765c4..3735fc6f652 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Worker.h
@@ -18,8 +18,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_WORKER_H
-#include "ace/pre.h"
 #define TAO_EC_WORKER_H
+#include "ace/pre.h"
 
 #include "tao/corba.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 04964416f5c..2e244b0d54f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -28,8 +28,8 @@
 // ============================================================================
 
 #ifndef ACE_EVENT_CHANNEL_H
-#include "ace/pre.h"
 #define ACE_EVENT_CHANNEL_H
+#include "ace/pre.h"
 
 #include "ace/Containers.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index 3b1657c0d42..ee947851294 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -21,8 +21,8 @@
 // ============================================================================
 
 #ifndef TAO_EC_EVENT_MANIP_H
-#include "ace/pre.h"
 #define TAO_EC_EVENT_MANIP_H
+#include "ace/pre.h"
 
 #include "orbsvcs/RtecEventCommC.h"
 #include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
index d4ef3c680ec..aad3fae0a57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h
@@ -2,8 +2,8 @@
 // $Id$
 //
 #ifndef FAST_REACTOR_H
-#include "ace/pre.h"
 #define FAST_REACTOR_H
+#include "ace/pre.h"
 
 #if defined (ACE_OLD_STYLE_REACTOR)
 # if defined (ACE_WIN32)
diff --git a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
index 15ed792d36f..454fe0fdf44 100644
--- a/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
+++ b/TAO/orbsvcs/orbsvcs/Event/GPlot_File.h
@@ -11,8 +11,8 @@
 // ============================================================================
 
 #ifndef ACE_GPlot_File_H
-#include "ace/pre.h"
 #define ACE_GPlot_File_H
+#include "ace/pre.h"
 
 #include "ace/Map_Manager.h"
 #include "orbsvcs/Event/event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 474e55a6c8d..f17700b4295 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -21,8 +21,8 @@
 // ============================================================================
 
 #ifndef ACE_LOCAL_ESTYPES_H
-#include "ace/pre.h"
 #define ACE_LOCAL_ESTYPES_H
+#include "ace/pre.h"
 
 #include "tao/corba.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
index 26efd225932..6d68725793d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h
@@ -15,8 +15,8 @@
 // ============================================================================
 
 #ifndef ACE_MEMORY_POOLS_H
-#include "ace/pre.h"
 #define ACE_MEMORY_POOLS_H
+#include "ace/pre.h"
 
 #include "ace/Synch.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
index df2a642ac94..cb9afe7b408 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.h
@@ -25,8 +25,8 @@
 // ============================================================================
 
 #ifndef TAO_MODULE_FACTORY_H
-#include "ace/pre.h"
 #define TAO_MODULE_FACTORY_H
+#include "ace/pre.h"
 
 #include "orbsvcs/Event/event_export.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index 8d4c718a5e0..2cf4fbbeaf4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -19,8 +19,8 @@
 // ============================================================================
 
 #ifndef ACE_RT_TASK_H
-#include "ace/pre.h"
 #define ACE_RT_TASK_H
+#include "ace/pre.h"
 
 #include "ace/Task.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index b08f9c65955..ef50311ef2e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -4,8 +4,8 @@
 //
 
 #ifndef TAO_EC_TIMER_MODULE_H
-#include "ace/pre.h"
 #define TAO_EC_TIMER_MODULE_H
+#include "ace/pre.h"
 
 #include "ace/ACE.h"