From fb7b4947295d9ef957687513fa4c72c67d01f2cb Mon Sep 17 00:00:00 2001 From: nanbor Date: Thu, 23 Mar 2000 20:52:46 +0000 Subject: ChangeLogTag:Thu Mar 23 14:48:12 2000 Nanbor Wang --- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 2 +- TAO/orbsvcs/orbsvcs/AV/AV_Core.h | 2 +- TAO/orbsvcs/orbsvcs/AV/AV_export.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h | 2 +- TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Flows_T.h | 2 +- TAO/orbsvcs/orbsvcs/AV/MCast.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Nil.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Policy.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/AV/RTCP.h | 2 +- TAO/orbsvcs/orbsvcs/AV/RTP.h | 2 +- TAO/orbsvcs/orbsvcs/AV/TCP.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Transport.h | 2 +- TAO/orbsvcs/orbsvcs/AV/UDP.h | 2 +- TAO/orbsvcs/orbsvcs/AV/media-timer.h | 2 +- TAO/orbsvcs/orbsvcs/AV/ntp-time.h | 2 +- TAO/orbsvcs/orbsvcs/AV/sfp.h | 2 +- TAO/orbsvcs/orbsvcs/AV/source.h | 2 +- TAO/orbsvcs/orbsvcs/Channel_Clients.h | 2 +- TAO/orbsvcs/orbsvcs/Channel_Clients_T.h | 2 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h | 2 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h | 2 +- TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h | 2 +- TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h | 2 +- TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h | 2 +- TAO/orbsvcs/orbsvcs/Event/BCU.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Command.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Concrete_Proxy_Set.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Defaults.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Collection.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h | 2 +- TAO/orbsvcs/orbsvcs/Event/EC_Worker.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Event_Channel.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Event_Manip.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Fast_Reactor.h | 2 +- TAO/orbsvcs/orbsvcs/Event/GPlot_File.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Memory_Pools.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Module_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/Event/RT_Task.h | 2 +- TAO/orbsvcs/orbsvcs/Event/Timer_Module.h | 2 +- TAO/orbsvcs/orbsvcs/Event_Service_Constants.h | 2 +- TAO/orbsvcs/orbsvcs/Event_Utilities.h | 2 +- TAO/orbsvcs/orbsvcs/IOR_Multicast.h | 2 +- TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h | 2 +- TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h | 2 +- TAO/orbsvcs/orbsvcs/Log/Iterator_i.h | 2 +- TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h | 2 +- TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h | 2 +- TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h | 2 +- TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h | 2 +- TAO/orbsvcs/orbsvcs/Log/Log_i.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Entries.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h | 2 +- TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h | 2 +- TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h | 2 +- TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h | 2 +- TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/DynSched.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Scheduler.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h | 2 +- TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h | 2 +- TAO/orbsvcs/orbsvcs/Scheduler_Factory.h | 2 +- TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h | 2 +- TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h | 2 +- TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h | 2 +- TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h | 2 +- TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h | 2 +- TAO/orbsvcs/orbsvcs/Time_Utilities.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Locking.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Trader.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Trader_T.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h | 2 +- TAO/orbsvcs/orbsvcs/orbsvcs_export.h | 2 +- 199 files changed, 199 insertions(+), 199 deletions(-) (limited to 'TAO/orbsvcs/orbsvcs') diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 5225f043866..57497de0725 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef AVSTREAMS_I_H -#include "ace/pre.h" #define AVSTREAMS_I_H +#include "ace/pre.h" #include "ace/OS.h" #include "ace/SOCK_Dgram_Mcast.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index b80bed676c8..e5415419c5c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_AV_CORE_H -#include "ace/pre.h" #define TAO_AV_CORE_H +#include "ace/pre.h" #include "tao/TAO.h" #include "orbsvcs/AVStreamsC.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_export.h b/TAO/orbsvcs/orbsvcs/AV/AV_export.h index 5b27b4f61b5..b71b6420895 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_export.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_export.h @@ -5,8 +5,8 @@ // ${ACE_ROOT}/GenExportH.BAT // ------------------------------ #ifndef TAO_AV_EXPORT_H -#include "ace/pre.h" #define TAO_AV_EXPORT_H +#include "ace/pre.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index bc4f0497796..deab04f8115 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_AV_ENDPOINT_STRATEGY_H -#include "ace/pre.h" #define TAO_AV_ENDPOINT_STRATEGY_H +#include "ace/pre.h" #include "AVStreams_i.h" #include "tao/TAO.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index d500407f542..94a29d6ea98 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -19,8 +19,8 @@ #ifndef TAO_AV_ENDPOINT_STRATEGY_T_H -#include "ace/pre.h" #define TAO_AV_ENDPOINT_STRATEGY_T_H +#include "ace/pre.h" #include "Endpoint_Strategy.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index c8363273c1a..37151ea734a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_AV_FLOWSPEC_ENTRY_H -#include "ace/pre.h" #define TAO_AV_FLOWSPEC_ENTRY_H +#include "ace/pre.h" #include "orbsvcs/AV/AV_export.h" #include "AV_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index dd3df0c769e..ff5debd734c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_AV_FLOWS_T_H -#include "ace/pre.h" #define TAO_AV_FLOWS_T_H +#include "ace/pre.h" #include "AVStreams_i.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index a23c2a2f5e0..dd43b45c7d0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_AV_MCAST_H -#include "ace/pre.h" #define TAO_AV_MCAST_H +#include "ace/pre.h" #include "FlowSpec_Entry.h" #include "Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Nil.h b/TAO/orbsvcs/orbsvcs/AV/Nil.h index e362c0a99bb..da51425f804 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Nil.h +++ b/TAO/orbsvcs/orbsvcs/AV/Nil.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_AV_NIL_H -#include "ace/pre.h" #define TAO_AV_NIL_H +#include "ace/pre.h" #include "Policy.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 1f89d187fab..23785e9309f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TAO_AV_POLICY_H -#include "ace/pre.h" #define TAO_AV_POLICY_H +#include "ace/pre.h" #include "ace/Addr.h" #include "tao/TAO.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index 6ae0c744fc7..3e919b8fb15 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TAO_AV_PROTOCOL_FACTORY_T_H -#include "ace/pre.h" #define TAO_AV_PROTOCOL_FACTORY_T_H +#include "ace/pre.h" #include "ace/Service_Object.h" #include "Policy.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 08149a7423c..586f290a4f2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -49,8 +49,8 @@ // ============================================================================ #ifndef TAO_AV_RTCP_H -#include "ace/pre.h" #define TAO_AV_RTCP_H +#include "ace/pre.h" #include "ace/OS.h" #include "source.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index 9542aa0a95e..46cecbff24a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -51,8 +51,8 @@ // ============================================================================ #ifndef TAO_AV_RTP_H -#include "ace/pre.h" #define TAO_AV_RTP_H +#include "ace/pre.h" #include "Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 64a58faa3fb..421b01f8254 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TAO_AV_TCP_H -#include "ace/pre.h" #define TAO_AV_TCP_H +#include "ace/pre.h" #include "ace/OS.h" #include "Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index f5282eb8eb9..5a01f366f36 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TAO_AV_TRANSPORT_H -#include "ace/pre.h" #define TAO_AV_TRANSPORT_H +#include "ace/pre.h" #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index f02103c660e..3d4f25278d4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TAO_AV_UDP_H -#include "ace/pre.h" #define TAO_AV_UDP_H +#include "ace/pre.h" #include "ace/OS.h" #include "Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/media-timer.h b/TAO/orbsvcs/orbsvcs/AV/media-timer.h index 1eaedd0fad5..c49126a9431 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media-timer.h +++ b/TAO/orbsvcs/orbsvcs/AV/media-timer.h @@ -36,8 +36,8 @@ */ #ifndef TAO_AV_MEDIA_TIMER_H -#include "ace/pre.h" #define TAO_AV_MEDIA_TIMER_H +#include "ace/pre.h" #include "ace/OS.h" //long random (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h index 5b61c34d605..173f453d49a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h +++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h @@ -35,8 +35,8 @@ * @(#) $Header$ */ #ifndef TAO_AV_NTP_TIME_H -#include "ace/pre.h" #define TAO_AV_NTP_TIME_H +#include "ace/pre.h" #include "ace/OS.h" #include "RTCP.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 64e23edb7d8..c78e9e5a3ca 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_AV_SFP_H -#include "ace/pre.h" #define TAO_AV_SFP_H +#include "ace/pre.h" #include "orbsvcs/AV/AV_export.h" #include "orbsvcs/sfpC.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/source.h b/TAO/orbsvcs/orbsvcs/AV/source.h index 6578daff37a..27305d144fb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/source.h +++ b/TAO/orbsvcs/orbsvcs/AV/source.h @@ -37,8 +37,8 @@ */ #ifndef TAO_AV_SOURCE_H -#include "ace/pre.h" #define TAO_AV_SOURCE_H +#include "ace/pre.h" #define RTCP_SDES_MAX 7 diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h index 45c0e128839..124742caf69 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef ACE_CHANNEL_CLIENTS_H -#include "ace/pre.h" #define ACE_CHANNEL_CLIENTS_H +#include "ace/pre.h" #include "orbsvcs/Channel_Clients_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index a8f087a706f..2c5e0760dbd 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -22,8 +22,8 @@ // ============================================================================ #ifndef ACE_CHANNEL_CLIENTS_T_H -#include "ace/pre.h" #define ACE_CHANNEL_CLIENTS_T_H +#include "ace/pre.h" #include "orbsvcs/RtecEventCommS.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index c38a0053a02..8dcc9442005 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef _CC_LOCK_H -#include "ace/pre.h" #define _CC_LOCK_H +#include "ace/pre.h" #include "ace/Synch.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 31ef7bd8cb2..309fb762f60 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -33,8 +33,8 @@ // ============================================================================ #ifndef _CC_LOCKSET_H -#include "ace/pre.h" #define _CC_LOCKSET_H +#include "ace/pre.h" #include "ace/Synch.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index dac4b453a7f..133cbe25e7b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef _CC_LOCKSETFACTORY_H -#include "ace/pre.h" #define _CC_LOCKSETFACTORY_H +#include "ace/pre.h" // #include "tao/corba.h" #include "orbsvcs/CosConcurrencyControlS.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index 443c6a7a1e9..ec59e84fc56 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -21,8 +21,8 @@ // ============================================================================ #ifndef _CONCURRENCY_SERVER_H -#include "ace/pre.h" #define _CONCURRENCY_SERVER_H +#include "ace/pre.h" #include "tao/corba.h" #include "orbsvcs/CosConcurrencyControlC.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 86422975890..ebd19ca751d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_CONSUMERADMIN_H -#include "ace/pre.h" #define TAO_CEC_CONSUMERADMIN_H +#include "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 4a38396dcfd..1da31f831f1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_CEC_CONSUMERCONTROL_H -#include "ace/pre.h" #define TAO_CEC_CONSUMERCONTROL_H +#include "ace/pre.h" #include "orbsvcs/CosEvent/event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index 7f7eab09e23..8783b560eea 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_DEFAULT_FACTORY_H -#include "ace/pre.h" #define TAO_CEC_DEFAULT_FACTORY_H +#include "ace/pre.h" #include "CEC_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h index 47f76cf2fa3..5583a5325ff 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef TAO_CEC_DEFAULTS_H -#include "ace/pre.h" #define TAO_CEC_DEFAULTS_H +#include "ace/pre.h" #ifndef TAO_CEC_ENABLE_DEBUG_MESSAGES #define TAO_CEC_ENABLE_DEBUG_MESSAGES 0 diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 6784ad892ed..9f1b0ba2a25 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_CEC_DISPATCHING_H -#include "ace/pre.h" #define TAO_CEC_DISPATCHING_H +#include "ace/pre.h" #include "orbsvcs/CosEventCommC.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 312535827ca..6acb7ea5260 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_DISPATCHING_TASK_H -#include "ace/pre.h" #define TAO_CEC_DISPATCHING_TASK_H +#include "ace/pre.h" #include "ace/Task.h" #include "ace/Message_Block.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index a2f40ca897e..4779c12f11b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef TAO_CEC_EVENTCHANNEL_H -#include "ace/pre.h" #define TAO_CEC_EVENTCHANNEL_H +#include "ace/pre.h" #include "CEC_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index a0e249de1a2..00d5dfde525 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_FACTORY_H -#include "ace/pre.h" #define TAO_CEC_FACTORY_H +#include "ace/pre.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 49a59ecd8b6..b5c2d86e0ff 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_MT_DISPATCHING_H -#include "ace/pre.h" #define TAO_CEC_MT_DISPATCHING_H +#include "ace/pre.h" #include "CEC_Dispatching.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index ec05d64eedb..f16f4045ee6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_PROXYPULLCONSUMER_H -#include "ace/pre.h" #define TAO_CEC_PROXYPULLCONSUMER_H +#include "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 39073ac700f..eee7039749c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_PROXYPULLSUPPLIER_H -#include "ace/pre.h" #define TAO_CEC_PROXYPULLSUPPLIER_H +#include "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 617f5b2f8bf..6c00d6621bc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_PROXYPUSHCONSUMER_H -#include "ace/pre.h" #define TAO_CEC_PROXYPUSHCONSUMER_H +#include "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 96012be7539..17d9ec60efb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_CEC_PROXYPUSHSUPPLIER_H -#include "ace/pre.h" #define TAO_CEC_PROXYPUSHSUPPLIER_H +#include "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index f9c54423bbc..44f2719c6d2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_CEC_PULLING_STRATEGY_H -#include "ace/pre.h" #define TAO_CEC_PULLING_STRATEGY_H +#include "ace/pre.h" #include "orbsvcs/CosEvent/event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 7b470ae9055..04c29b1e0a3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_CEC_REACTIVE_CONSUMERCONTROL_H -#include "ace/pre.h" #define TAO_CEC_REACTIVE_CONSUMERCONTROL_H +#include "ace/pre.h" #include "CEC_ConsumerControl.h" #include "orbsvcs/Event/EC_Worker.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index 9ea758a289e..e3aa7774504 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TAO_CEC_REACTIVE_PULLING_STRATEGY_H -#include "ace/pre.h" #define TAO_CEC_REACTIVE_PULLING_STRATEGY_H +#include "ace/pre.h" #include "CEC_Pulling_Strategy.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index a7164dd06b0..1c7f00eaa9b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_CEC_REACTIVE_SUPPLIERCONTROL_H -#include "ace/pre.h" #define TAO_CEC_REACTIVE_SUPPLIERCONTROL_H +#include "ace/pre.h" #include "CEC_SupplierControl.h" #include "orbsvcs/Event/EC_Worker.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index fc08c7a1ce0..059510de7a5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -23,8 +23,8 @@ // ============================================================================ #ifndef TAO_CEC_SUPPLIERADMIN_H -#include "ace/pre.h" #define TAO_CEC_SUPPLIERADMIN_H +#include "ace/pre.h" #include "orbsvcs/CosEventChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 98b8ea46c10..1eacf7ab519 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_CEC_SUPPLIERCONTROL_H -#include "ace/pre.h" #define TAO_CEC_SUPPLIERCONTROL_H +#include "ace/pre.h" #include "orbsvcs/CosEvent/event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h index 632153d0b53..d827b3d42af 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef CONSUMERADMIN_I_H -#include "ace/pre.h" #define CONSUMERADMIN_I_H +#include "ace/pre.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/CosEventChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h index 7c52eba0bbf..72407eae98e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef EVENTCHANNEL_I_H -#include "ace/pre.h" #define EVENTCHANNEL_I_H +#include "ace/pre.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/CosEventChannelAdminC.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h index 0d61072cef8..6ba85ed185a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h @@ -19,8 +19,8 @@ // ================================================================ #ifndef _PROXYPUSHCONSUMER_I_H -#include "ace/pre.h" #define _PROXYPUSHCONSUMER_I_H +#include "ace/pre.h" #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/CosEventChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h index 63336740099..276b72d3d8a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h @@ -19,8 +19,8 @@ // ================================================================ #ifndef _PROXYPUSHSUPPLIER_H -#include "ace/pre.h" #define _PROXYPUSHSUPPLIER_H +#include "ace/pre.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/CosEventChannelAdminC.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h index 83586596172..3c9fb46b1c4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef SUPPLIER_ADMIN_I_H -#include "ace/pre.h" #define SUPPLIER_ADMIN_I_H +#include "ace/pre.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/CosEventChannelAdminC.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h index 4f53735cc12..d2863e38371 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_COSEVENT_UTILITIES_H -#include "ace/pre.h" #define TAO_COSEVENT_UTILITIES_H +#include "ace/pre.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/RtecEventChannelAdminS.h" 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" diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 756e99a03e9..7f6c445b5b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -6,8 +6,8 @@ // #ifndef ACE_ES_CONSTANTS_H -#include "ace/pre.h" #define ACE_ES_CONSTANTS_H +#include "ace/pre.h" #include "ace/Message_Block.h" diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 879bc7fa7ca..5d159309723 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef ACE_EVENT_UTILITIES_H -#include "ace/pre.h" #define ACE_EVENT_UTILITIES_H +#include "ace/pre.h" #include "orbsvcs/RtecEventChannelAdminC.h" #include "orbsvcs/Event_Service_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index a211d0585a6..bed5e24ed3d 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef TAO_IOR_MULTICAST_H -#include "ace/pre.h" #define TAO_IOR_MULTICAST_H +#include "ace/pre.h" #include "tao/corba.h" #include "orbsvcs/svc_utils_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index b620ee6e6e2..e291baa60e2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TLS_BASICLOGFACTORY_I_H -#include "ace/pre.h" #define TLS_BASICLOGFACTORY_I_H +#include "ace/pre.h" #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/Log/LogMgr_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 9f26b5c081b..aca57dc79ed 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TLS_BASICLOG_I_H -#include "ace/pre.h" #define TLS_BASICLOG_I_H +#include "ace/pre.h" #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/Log/Log_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 19985c6f908..7b4ff48eb1f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TLS_ITERATOR_H -#include "ace/pre.h" #define TLS_ITERATOR_H +#include "ace/pre.h" #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/Log/LogRecordStore.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 2afd8285307..dbc6b31db9b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TLS_LOGMGR_I_H -#include "ace/pre.h" #define TLS_LOGMGR_I_H +#include "ace/pre.h" #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/Log/BasicLog_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 21f0249a06f..ff8ffd3fa89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef LOG_RECORD_STORE_H -#include "ace/pre.h" #define LOG_RECORD_STORE_H +#include "ace/pre.h" #include "orbsvcs/DsLogAdminS.h" #include "orbsvcs/DsLogAdminC.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index c70a202bf98..07cfca1fd89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -15,8 +15,8 @@ // ======================================================================== #ifndef TAO_LOG_CONSTRAINT_INTERPRETER_H -#include "ace/pre.h" #define TAO_LOG_CONSTRAINT_INTERPRETER_H +#include "ace/pre.h" #include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h" #include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index 20a1ea043cf..00677bfb9d5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -14,8 +14,8 @@ // ======================================================================== #ifndef TAO_LOG_CONSTRAINT_VISITOR_H -#include "ace/pre.h" #define TAO_LOG_CONSTRAINT_VISITOR_H +#include "ace/pre.h" #include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" #include "orbsvcs/DsLogAdminC.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 1414fe979da..8d9b3e37ed7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -17,8 +17,8 @@ // ============================================================================ #ifndef TLS_LOG_I_H -#include "ace/pre.h" #define TLS_LOG_I_H +#include "ace/pre.h" #include "orbsvcs/Log/LogRecordStore.h" #include "orbsvcs/DsLogAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index d8858b50dda..7dce456a5b4 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -14,8 +14,8 @@ // ============================================================================ #ifndef TAO_BINDINGS_ITERATOR_T_H -#include "ace/pre.h" #define TAO_BINDINGS_ITERATOR_T_H +#include "ace/pre.h" #include "Hash_Naming_Context.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index b4d128d8ce2..958eb7a62a7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_ENTRIES_H -#include "ace/pre.h" #define TAO_ENTRIES_H +#include "ace/pre.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 0eeed905ad0..62826d54c09 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -14,8 +14,8 @@ // ============================================================================ #ifndef TAO_HASH_NAMING_CONTEXT_H -#include "ace/pre.h" #define TAO_HASH_NAMING_CONTEXT_H +#include "ace/pre.h" #include "Naming_Context_Interface.h" #include "naming_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 60f7ce7276a..2b1382c0df2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -14,8 +14,8 @@ // ============================================================================ #ifndef TAO_NAMING_CONTEXT_INTERFACE_H -#include "ace/pre.h" #define TAO_NAMING_CONTEXT_INTERFACE_H +#include "ace/pre.h" #include "orbsvcs/CosNamingS.h" #include "naming_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index bbecdd2368d..bbcd6df6a03 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef TAO_NAMING_UTILS_H -#include "ace/pre.h" #define TAO_NAMING_UTILS_H +#include "ace/pre.h" #include "tao/corba.h" #include "orbsvcs/CosNamingC.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index f36da534f41..325d4920116 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_PERSISTENT_CONTEXT_INDEX_H -#include "ace/pre.h" #define TAO_PERSISTENT_CONTEXT_INDEX_H +#include "ace/pre.h" #include "Persistent_Entries.h" #include "naming_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index c7d0127ee18..643c20db0e3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_PERSISTENT_ENTRIES_H -#include "ace/pre.h" #define TAO_PERSISTENT_ENTRIES_H +#include "ace/pre.h" #include "ace/Hash_Map_With_Allocator_T.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index 9fc93eb20da..a9fbbf636d9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -14,8 +14,8 @@ // ============================================================================ #ifndef TAO_PERSISTENT_NAMING_CONTEXT_H -#include "ace/pre.h" #define TAO_PERSISTENT_NAMING_CONTEXT_H +#include "ace/pre.h" #include "Hash_Naming_Context.h" #include "Persistent_Entries.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index 62ac3664a30..d66265afdfe 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -14,8 +14,8 @@ // ============================================================================ #ifndef TAO_TRANSIENT_NAMING_CONTEXT_H -#include "ace/pre.h" #define TAO_TRANSIENT_NAMING_CONTEXT_H +#include "ace/pre.h" #include "Hash_Naming_Context.h" #include "Entries.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index f93d07f0823..6b26dda03ee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -17,8 +17,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_CONSTRAINT_INTERPRETER_H -#include "ace/pre.h" #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H +#include "ace/pre.h" #include "orbsvcs/Trader/Constraint_Nodes.h" #include "orbsvcs/Trader/Constraint_Visitors.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index bd30bf1035e..8a2eff65dad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -17,8 +17,8 @@ // ========================================================================== #ifndef NOTIFY_CONSTRAINT_VISITORS_H -#include "ace/pre.h" #define NOTIFY_CONSTRAINT_VISITORS_H +#include "ace/pre.h" #include "ace/Hash_Map_Manager.h" #include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h index ce12971e79c..4f007482770 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h @@ -15,8 +15,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_CONSUMERADMIN_I_H -#include "ace/pre.h" #define TAO_NOTIFY_CONSUMERADMIN_I_H +#include "ace/pre.h" #include "Notify_ID_Pool_T.h" #include "Notify_QoSAdmin_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 6c8d07a6daa..f1918e193ee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef NOTIFY_EVENTCHANNELFACTORY_I_H -#include "ace/pre.h" #define NOTIFY_EVENTCHANNELFACTORY_I_H +#include "ace/pre.h" #include "Notify_ID_Pool_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h index cf617dde710..0c6063299b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_EVENTCHANNEL_I_H_ -#include "ace/pre.h" #define TAO_NOTIFY_EVENTCHANNEL_I_H_ +#include "ace/pre.h" #include "Notify_ID_Pool_T.h" #include "Notify_QoSAdmin_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index 045fc21174f..3c03ca7c951 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_EVENT_MANAGER -#include "ace/pre.h" #define TAO_NOTIFY_EVENT_MANAGER +#include "ace/pre.h" #include "Notify_Listeners.h" #include "Notify_Types.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h index cc6d491f062..d064dc33785 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef NOTIFY_FILTERADMIN_H -#include "ace/pre.h" #define NOTIFY_FILTERADMIN_H +#include "ace/pre.h" #include "Notify_ID_Pool_T.h" #include "Notify_Types.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h index b6cf75458d3..c0f411a7b2d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h @@ -17,8 +17,8 @@ // ========================================================================== #ifndef NOTIFY_FILTER_FACTORY_I_H -#include "ace/pre.h" #define NOTIFY_FILTER_FACTORY_I_H +#include "ace/pre.h" #include "orbsvcs/orbsvcs/CosNotifyFilterS.h" #include "notify_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h index 82492e26d34..410f7eac2da 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_FILTER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_FILTER_I_H +#include "ace/pre.h" #include "Notify_Constraint_Interpreter.h" #include "Notify_ID_Pool_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h index b1801d1e7a2..21b11a482b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_ID_POOL_T_H -#include "ace/pre.h" #define TAO_NOTIFY_ID_POOL_T_H +#include "ace/pre.h" #include "ace/OS.h" #include "ace/Containers_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h index 533b55347fc..9cda9311b3c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_LISTENERS_H -#include "ace/pre.h" #define TAO_NOTIFY_LISTENERS_H +#include "ace/pre.h" #include "Notify_Types.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h index 7096dbf1791..7322e5539a8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_PROXYCONSUMER_T_H -#include "ace/pre.h" #define TAO_NOTIFY_PROXYCONSUMER_T_H +#include "ace/pre.h" #include "Notify_Proxy_T.h" class TAO_Notify_SupplierAdmin_i; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h index 8849ff9070f..2726c4e0f84 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h @@ -17,8 +17,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_PROXYPUSHCONSUMER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_PROXYPUSHCONSUMER_I_H +#include "ace/pre.h" #include "Notify_ProxyConsumer_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h index 3f105c0613c..9cbe3ae70ac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h @@ -16,8 +16,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_PROXYPUSHSUPPLIER_I_H +#include "ace/pre.h" #include "Notify_ProxySupplier_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h index d2ff53d2e28..4304c88e31f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h @@ -15,8 +15,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_PROXY_SUPPLIER_T_H -#include "ace/pre.h" #define TAO_NOTIFY_PROXY_SUPPLIER_T_H +#include "ace/pre.h" #include "Notify_Proxy_T.h" class TAO_Notify_ConsumerAdmin_i; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h index afee2bda0e1..02415a3ddd5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h @@ -15,8 +15,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_PROXY_T_H -#include "ace/pre.h" #define TAO_NOTIFY_PROXY_T_H +#include "ace/pre.h" #include "Notify_QoSAdmin_i.h" #include "Notify_FilterAdmin_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h index f1e19fbf8af..5d96e221026 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushConsumer.h @@ -25,8 +25,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_PUSHCONSUMER_H -#include "ace/pre.h" #define TAO_NOTIFY_PUSHCONSUMER_H +#include "ace/pre.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h index d98c11a565a..161abf25d67 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_PushSupplier.h @@ -1,7 +1,7 @@ // $Id$ #ifndef TAO_NOTIFY_PUSHSUPPLIER_H -#include "ace/pre.h" #define TAO_NOTIFY_PUSHSUPPLIER_H +#include "ace/pre.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h index e8f58023ab0..b4388336c73 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h @@ -16,8 +16,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_QOSADMIN_I_H -#include "ace/pre.h" #define TAO_NOTIFY_QOSADMIN_I_H +#include "ace/pre.h" #include "orbsvcs/CosNotificationS.h" #include "notify_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h index f24292edc53..9cacae48d2f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h @@ -15,8 +15,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_RESOURCE_MANAGER -#include "ace/pre.h" #define TAO_NOTIFY_RESOURCE_MANAGER +#include "ace/pre.h" #include "Notify_ID_Pool_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h index e08d23a6b59..fc130c50473 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h @@ -18,8 +18,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_SEQUENCEPROXYPUSHCONSUMER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_SEQUENCEPROXYPUSHCONSUMER_I_H +#include "ace/pre.h" #include "Notify_ProxyConsumer_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h index e441296e962..5d7a5cc0288 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h @@ -16,8 +16,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_SEQUENCEPROXYPUSHSUPPLIER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_SEQUENCEPROXYPUSHSUPPLIER_I_H +#include "ace/pre.h" #include "Notify_ProxySupplier_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h index 71708dcdff0..5a7d16ea94b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h @@ -18,8 +18,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_STRUCTUREDPROXYPUSHCONSUMER_I_H +#include "ace/pre.h" #include "Notify_ProxyConsumer_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h index aa3bface018..d3020436757 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h @@ -16,8 +16,8 @@ // // ========================================================================== #ifndef TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H -#include "ace/pre.h" #define TAO_NOTIFY_STRUCTUREDPROXYPUSHSUPPLIER_I_H +#include "ace/pre.h" #include "Notify_ProxySupplier_T.h" #include "orbsvcs/CosNotifyChannelAdminS.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h index 48d1749b41b..b4c86ed6dea 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushConsumer.h @@ -18,8 +18,8 @@ // ========================================================================== #ifndef NOTIFY_STRUCTUREDPUSHCONSUMER_H -#include "ace/pre.h" #define NOTIFY_STRUCTUREDPUSHCONSUMER_H +#include "ace/pre.h" #include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "notify_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h index fbe5a10d237..9bc4e81ebe6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredPushSupplier.h @@ -17,8 +17,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H -#include "ace/pre.h" #define TAO_NOTIFY_STRUCTUREDPUSHSUPPLIER_H +#include "ace/pre.h" #include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "notify_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h index 26ec9b5bfbe..12f45594113 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h @@ -17,8 +17,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_SUPPLIERADMIN_I_H -#include "ace/pre.h" #define TAO_NOTIFY_SUPPLIERADMIN_I_H +#include "ace/pre.h" #include "Notify_ID_Pool_T.h" #include "Notify_QoSAdmin_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h index 9e02aad2fbc..df62e4aeb51 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Types.h @@ -16,8 +16,8 @@ // ========================================================================== #ifndef TAO_NOTIFY_TYPES_H -#include "ace/pre.h" #define TAO_NOTIFY_TYPES_H +#include "ace/pre.h" #include "orbsvcs/CosNotifyFilterC.h" #include "orbsvcs/CosNotifyCommC.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 76f3e4dc6d4..aac976aa4bc 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef COSPROPERTYSERVICE_I_H -#include "ace/pre.h" #define COSPROPERTYSERVICE_I_H +#include "ace/pre.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index f8485d7afb6..411f6064363 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef ACE_RUNTIME_SCHEDULER_H -#include "ace/pre.h" #define ACE_RUNTIME_SCHEDULER_H +#include "ace/pre.h" #include "orbsvcs/Scheduler_Factory.h" #include "orbsvcs/RtecSchedulerS.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 6ba0726e8b6..2998cbc5e59 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -1,8 +1,8 @@ // $Id$ #ifndef ACE_CONFIG_SCHEDULER_H -#include "ace/pre.h" #define ACE_CONFIG_SCHEDULER_H +#include "ace/pre.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index ffed3d200e5..29220b1d687 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef DYNSCHED_H -#include "ace/pre.h" #define DYNSCHED_H +#include "ace/pre.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index 27cc744ced2..5b4a8a5dd4f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_RECONFIG_SCHED_UTILS_H -#include "ace/pre.h" #define TAO_RECONFIG_SCHED_UTILS_H +#include "ace/pre.h" #include "ace/inc_user_config.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 6121c2afac6..ca913bf9f1e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_RECONFIG_SCHED_UTILS_T_H -#include "ace/pre.h" #define TAO_RECONFIG_SCHED_UTILS_T_H +#include "ace/pre.h" #include "ace/inc_user_config.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h index 1fe0fca0f53..125abcdcdb4 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef TAO_RECONFIG_SCHEDULER_H -#include "ace/pre.h" #define TAO_RECONFIG_SCHEDULER_H +#include "ace/pre.h" #include "ace/inc_user_config.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 69db4254b0a..880aac93e00 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -14,8 +14,8 @@ // ============================================================================ #ifndef TAO_RECONFIG_SCHEDULER_T_H -#include "ace/pre.h" #define TAO_RECONFIG_SCHEDULER_T_H +#include "ace/pre.h" #include "ace/inc_user_config.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 977281b1ece..8dec34d4cac 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef SCHEDENTRY_H -#include "ace/pre.h" #define SCHEDENTRY_H +#include "ace/pre.h" #include "orbsvcs/RtecSchedulerC.h" #include "orbsvcs/Event_Service_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 7744ab0ff61..86ebf429fed 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -19,8 +19,8 @@ // ============================================================================ #ifndef SCHEDULER_H -#include "ace/pre.h" #define SCHEDULER_H +#include "ace/pre.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h index 9832f11f145..1ba089017a8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef SCHEDULER_INTERNAL_H -#include "ace/pre.h" #define SCHEDULER_INTERNAL_H +#include "ace/pre.h" #include "Scheduler.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index 31fc80ddfdc..d77b72ddae1 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef STRATEGY_SCHEDULER_H -#include "ace/pre.h" #define STRATEGY_SCHEDULER_H +#include "ace/pre.h" #include "DynSched.h" diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 0df53ab4d9d..13cf151994b 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef ACE_SCHEDULER_FACTORY_H -#include "ace/pre.h" #define ACE_SCHEDULER_FACTORY_H +#include "ace/pre.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index 55e57a6c208..04daf88fbb1 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef ACE_SCHEDULER_UTILITIES_H -#include "ace/pre.h" #define ACE_SCHEDULER_UTILITIES_H +#include "ace/pre.h" #include "ace/OS.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index beb36b72546..4defb483f5d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_TIO_H -#include "ace/pre.h" #define TAO_TIO_H +#include "ace/pre.h" #include "tao/TAO.h" #include "orbsvcs/TimeServiceS.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 5ba597d23e9..581ec0b2f7c 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_TIME_SERVICE_CLERK_H -#include "ace/pre.h" #define TAO_TIME_SERVICE_CLERK_H +#include "ace/pre.h" #include "ace/Reactor.h" #include "orbsvcs/Naming/Naming_Utils.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index b3f27ac0ad3..459a01e6315 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_TIME_SERVICE_SERVER_H -#include "ace/pre.h" #define TAO_TIME_SERVICE_SERVER_H +#include "ace/pre.h" #include "orbsvcs/TimeServiceS.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index 879088f8c30..a3523dd75bd 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -18,8 +18,8 @@ // ============================================================================ #ifndef TAO_UTO_H -#include "ace/pre.h" #define TAO_UTO_H +#include "ace/pre.h" #include "orbsvcs/TimeServiceS.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index 740dfb4344f..5fed9f67d81 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -15,8 +15,8 @@ // ============================================================================ #ifndef ORBSVCS_TIME_UTILITIES_H -#include "ace/pre.h" #define ORBSVCS_TIME_UTILITIES_H +#include "ace/pre.h" #include "orbsvcs/TimeBaseC.h" #include "orbsvcs/svc_utils_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 3d3c70f4d02..5810f2fec64 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -15,8 +15,8 @@ // ======================================================================== #ifndef TAO_CONSTRAINT_INTERPRETER_H -#include "ace/pre.h" #define TAO_CONSTRAINT_INTERPRETER_H +#include "ace/pre.h" #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index a6ee6ddc92a..f8226a995f9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -15,8 +15,8 @@ // ===================================================================== #ifndef TAO_CONSTRAINT_NODES_H -#include "ace/pre.h" #define TAO_CONSTRAINT_NODES_H +#include "ace/pre.h" #include "Constraint_Tokens.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h index 6ef96c79d78..74b78e58b44 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h @@ -1,8 +1,8 @@ // $Id$ #ifndef CONSTRAINT_TOKEN_H -#include "ace/pre.h" #define CONSTRAINT_TOKEN_H +#include "ace/pre.h" # define TAO_GT 257 # define TAO_GE 258 diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 88075b800d1..f182e463e83 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -15,8 +15,8 @@ // ======================================================================== #ifndef TAO_CONSTRAINT_VISITOR_H -#include "ace/pre.h" #define TAO_CONSTRAINT_VISITOR_H +#include "ace/pre.h" #include "orbsvcs/Trader/Interpreter_Utils.h" #include "orbsvcs/Trader/trading_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index f47eb19acb7..db806cfd225 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -15,8 +15,8 @@ // ======================================================================== #ifndef TAO_TCL_INTERPRETER_H -#include "ace/pre.h" #define TAO_TCL_INTERPRETER_H +#include "ace/pre.h" #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index 054a315a76d..7e4dce4b9ff 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -1,8 +1,8 @@ // $Id$ #ifndef TAO_INTERPRETER_UTILS_H -#include "ace/pre.h" #define TAO_INTERPRETER_UTILS_H +#include "ace/pre.h" #include "ace/Hash_Map_Manager.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h index dd7b47ed0f2..2057dd81500 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h @@ -1,8 +1,8 @@ // $Id$ #ifndef TAO_INTERPRETER_UTILS_T_H -#include "ace/pre.h" #define TAO_INTERPRETER_UTILS_T_H +#include "ace/pre.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h index b043bcf55dd..22d5c41e93b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h @@ -16,8 +16,8 @@ // // ========================================================================== #ifndef TAO_LOCKING_H -#include "ace/pre.h" #define TAO_LOCKING_H +#include "ace/pre.h" #include "tao/corba.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index a4fba3a9c17..cd3f10808dc 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -15,8 +15,8 @@ // ======================================================================== #ifndef TAO_OFFER_DATABASE_H -#include "ace/pre.h" #define TAO_OFFER_DATABASE_H +#include "ace/pre.h" #include "Trader.h" #include "Offer_Iterators.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index ac9eb77db9c..611828503e2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -16,8 +16,8 @@ // ============================================================================ #ifndef TAO_OFFER_ITERATORS_H -#include "ace/pre.h" #define TAO_OFFER_ITERATORS_H +#include "ace/pre.h" #include "Trader_Utils.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 6aa94f0de27..477737113f1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -16,8 +16,8 @@ // ======================================================================== #ifndef TAO_REGISTER_OFFER_ITERATOR_H -#include "ace/pre.h" #define TAO_REGISTER_OFFER_ITERATOR_H +#include "ace/pre.h" #include "Offer_Iterators.h" #include "Offer_Database.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index 97b6ed41c4a..a7889dba4fd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -16,8 +16,8 @@ // ======================================================================== #ifndef TAO_SERVICE_TYPE_REPOSITORY_H -#include "ace/pre.h" #define TAO_SERVICE_TYPE_REPOSITORY_H +#include "ace/pre.h" #include "Trader.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 8609d3f82ea..35ddb1b4b94 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -27,8 +27,8 @@ // ============================================================================ #ifndef TAO_TRADER_BASE_H -#include "ace/pre.h" #define TAO_TRADER_BASE_H +#include "ace/pre.h" #include "Interpreter_Utils.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index aee93b310ba..d8712a72802 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -14,8 +14,8 @@ // ======================================================================== #ifndef TAO_TRADER_CONSTRAINT_VISITOR_H -#include "ace/pre.h" #define TAO_TRADER_CONSTRAINT_VISITOR_H +#include "ace/pre.h" #include "Constraint_Visitors.h" #include "Trader.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 2608eb947c1..bf7c9e1e85c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -17,8 +17,8 @@ // ======================================================================== #ifndef TAO_TRADER_INTERFACES_H -#include "ace/pre.h" #define TAO_TRADER_INTERFACES_H +#include "ace/pre.h" #include "Trader_Utils.h" #include "Constraint_Interpreter.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index e03a353937c..bd95dc85461 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -17,8 +17,8 @@ // ======================================================================== #ifndef TAO_TRADER_H -#include "ace/pre.h" #define TAO_TRADER_H +#include "ace/pre.h" #include "Trader.h" #include "Offer_Database.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 42d7721419d..e5db59b78ba 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -29,8 +29,8 @@ // ======================================================================== #ifndef TAO_TRADER_UTILS_H -#include "ace/pre.h" #define TAO_TRADER_UTILS_H +#include "ace/pre.h" #include "Trader.h" diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h index 10855aee4c2..26fe74a50a1 100644 --- a/TAO/orbsvcs/orbsvcs/orbsvcs_export.h +++ b/TAO/orbsvcs/orbsvcs/orbsvcs_export.h @@ -5,8 +5,8 @@ // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT // ------------------------------ #ifndef TAO_ORBSVCS_EXPORT_H -#include "ace/pre.h" #define TAO_ORBSVCS_EXPORT_H +#include "ace/pre.h" #include "ace/OS.h" -- cgit v1.2.1