diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event')
74 files changed, 182 insertions, 152 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 0e781c19364..6c49661a2b5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ace/Sched_Params.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "Memory_Pools.h" #include "Dispatching_Modules.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index 03869de539b..459feed2c99 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -23,9 +23,9 @@ #include "ace/Reactor_Notification_Strategy.h" #include "tao/Timeprobe.h" -#include "orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index 6a3a4298e83..cc1ae3e6bd7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/RtecUDPAdminC.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 533e6ba7391..eb356e86e3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include "EC_Lifetime_Utils.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index f8441511cf4..ee28910bbf3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -16,7 +16,7 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/INET_Addr.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 66c1779773b..46a9a658c0c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/ECG_Mcast_EH.h" -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/EC_Lifetime_Utils_T.h" +#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h" #include "ace/Unbounded_Set.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 25f55f68033..f62de40073a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -26,7 +26,7 @@ #include "ace/Array_Base.h" #include "ace/SOCK_Dgram_Mcast.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 502b3a555d9..b71c9fbe8bf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -12,7 +12,7 @@ #define TAO_ECG_SIMPLE_ADDRESS_SERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include "EC_Lifetime_Utils_T.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index d48156a0dab..205d7301521 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,14 +1,16 @@ // $Id$ -#include "orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #include "ace/SString.h" #if !defined(__ACE_INLINE__) #include "ECG_UDP_Receiver.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, ECG_UDP_Receiver, "$Id$") +ACE_RCSID (Event, + ECG_UDP_Receiver, + "$Id$") // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 3e055f083e6..bc50426ae70 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -37,13 +37,13 @@ #define TAO_ECG_UDP_RECEIVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 166a8ee00fc..cdbf6908e32 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,14 +9,16 @@ * */ -#include "orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" #if !defined(__ACE_INLINE__) #include "ECG_UDP_Sender.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, ECG_UDP_Sender, "$Id$") +ACE_RCSID (Event, + ECG_UDP_Sender, + "$Id$") // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 00b1a6181b2..ee872d01530 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -38,14 +38,14 @@ #define TAO_ECG_UDP_SENDER_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "EC_Lifetime_Utils.h" #include "EC_Lifetime_Utils_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 7eb7b9fac4f..6bfc17ea60f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -15,8 +15,8 @@ #include "EC_Reactive_SupplierControl.h" #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index b1b7b1ca222..193b672ec46 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Basic_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index d026218286d..1b846220c81 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -4,15 +4,17 @@ #include "EC_ProxySupplier.h" #include "EC_ProxyConsumer.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_ConsumerAdmin, "$Id$") +ACE_RCSID (Event, + EC_ConsumerAdmin, + "$Id$") TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) : TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 60b5edadb24..909dad88229 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 61adaf515d7..9d33bbecd68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -19,13 +19,13 @@ #include "EC_Reactive_ConsumerControl.h" #include "EC_Reactive_SupplierControl.h" -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" -#include "orbsvcs/ESF/ESF_Immediate_Changes.h" -#include "orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/ESF/ESF_Copy_On_Write.h" -#include "orbsvcs/ESF/ESF_Delayed_Changes.h" -#include "orbsvcs/ESF/ESF_Delayed_Command.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 853b7e04a93..a14c68925e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index dfbe23bfd05..d028e06a00d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 54ea96405e4..bae7d4eb094 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/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 113c5a7b1ad..067e33340cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include /**/ "event_export.h" #include "ace/Task.h" #include "ace/Message_Block.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 44d548e8693..dd0799e5752 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -27,7 +27,7 @@ #include "EC_Defaults.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" template<class> class TAO_ESF_Worker; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index ac2f8c4988c..123a78382a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/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 33c8c9cfb7a..be40d293ce0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 0a7b44ea438..a97cd55b4ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -1,8 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" -ACE_RCSID(Event, EC_Gateway, "$Id$") +ACE_RCSID (Event, + EC_Gateway, + "$Id$") TAO_EC_Gateway::TAO_EC_Gateway (void) : handle_ (0) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index ff55b4ca46f..a8863961edb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -19,8 +19,8 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" /** * @class TAO_EC_Gateway diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 91e25f95e96..6202e72db2c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_IIOP.h" -#include "orbsvcs/Event/ECG_Defaults.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "EC_Gateway_IIOP_Factory.h" #include "ECG_ConsumerEC_Control.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 06f2d805dfa..058fc1b4696 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -22,9 +22,9 @@ #include /**/ "event_export.h" #include "EC_Gateway.h" -#include "orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/Channel_Clients.h" #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index eb368de2dbb..8e4347a7bc7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" -#include "orbsvcs/Event/ECG_Defaults.h" -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 0817bfcfa33..80835d4dde4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,9 +1,11 @@ // $Id$ #include "EC_Gateway_Sched.h" -#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" -ACE_RCSID(Event, EC_Gateway_sched, "$Id$") +ACE_RCSID (Event, + EC_Gateway_sched, + "$Id$") TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void) : TAO_EC_Gateway_IIOP () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 3ab5e935271..c207596ae00 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "EC_Gateway_IIOP.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 7894eba09c9..b1a36867648 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -5,8 +5,8 @@ #include "EC_ProxySupplier.h" #include "EC_QOS_Info.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "tao/ORB_Constants.h" #include "ace/Sched_Params.h" @@ -18,7 +18,9 @@ #include "EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Kokyu_Dispatching, "$Id$") +ACE_RCSID (Event, + EC_Kokyu_Dispatching, + "$Id$") TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) :allocator_ (0), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index ec54bc03226..abd145b2b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 62d433eb367..0dc7d4e18a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -5,7 +5,7 @@ #include "EC_Kokyu_Scheduling.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" @@ -15,7 +15,9 @@ #include "EC_Kokyu_Factory.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Kokyu_Factory, "$Id$") +ACE_RCSID (Event, + EC_Kokyu_Factory, + "$Id$") TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 55d64cdb2c9..5c1cd2b04d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index c0490f4cf17..fd9ebe4715b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Kokyu_Filter.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" @@ -14,7 +14,9 @@ #include "EC_Kokyu_Filter_Builder.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Kokyu_Filter_Builder, "$Id$") +ACE_RCSID (Event, + EC_Kokyu_Filter_Builder, + "$Id$") const char* designator (long dsgn) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index 5eb6ef5dc35..f07a37c374c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index e9df4b4298e..841bd6656c7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -14,8 +14,8 @@ #include "EC_ConsumerControl.h" #include "EC_SupplierControl.h" #include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug -#include "orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 3149420a6f1..6b0af4e85dd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -6,7 +6,7 @@ #include "EC_ProxyConsumer.h" #include "EC_ConsumerAdmin.h" #include "EC_SupplierAdmin.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 5bca0bf2172..6d33cfea8c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ #include "ace/RB_Tree.h" #include "ace/Map_Manager.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 1eb2794a909..e0add81915f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -7,9 +7,9 @@ #include "EC_Scheduling_Strategy.h" #include "EC_QOS_Info.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Per_Supplier_Filter.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index ed97744f809..8a3879662f4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Prefix_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 53f7634ce00..ade0f194676 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -5,8 +5,8 @@ #include "EC_Event_Channel_Base.h" #include "EC_QOS_Info.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index 717fad35865..b8156a664e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" #include "ace/Thread_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index a8a1fee8960..45bed1bbf9c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 75718ee9895..82a0162f440 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -19,7 +19,7 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index ea22992bf90..00d0b81e4a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -8,8 +8,8 @@ #include "EC_Scheduling_Strategy.h" #include "EC_ConsumerControl.h" #include "EC_SupplierAdmin.h" -#include "orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "ace/Reverse_Lock_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 552383c96d9..590d5c61190 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #include "EC_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 0fbc4fe9290..25a37802392 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecBaseC.h" +#include "orbsvcs/orbsvcs/RtecBaseC.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 a470864444f..06929bcf071 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index c08e3d05705..f1885974944 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -19,7 +19,7 @@ #include "EC_SupplierControl.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 0199dec1957..92a0da41ec3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -5,7 +5,7 @@ #include "EC_Priority_Scheduling.h" #include "EC_Sched_Filter_Builder.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index c1093401be5..f556b0f1d8b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "sched_event_export.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 6b2815e4897..5e153f1bcb1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Sched_Filter.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #include "EC_Sched_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 29c94f4f892..b89992dcba1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -19,8 +19,8 @@ #include /**/ "event_export.h" -#include "orbsvcs/RtecBaseC.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecBaseC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 39d04fec297..585fd0076e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -4,9 +4,9 @@ #include "EC_ProxyConsumer.h" #include "EC_ProxySupplier.h" #include "EC_Event_Channel_Base.h" -#include "orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_SupplierAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 91572785bc2..47956d2f32c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index b4318075078..0d80ad03c9e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -17,8 +17,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" -#include "orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h index 88a25804797..534752a9eaf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" #include /**/ "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index faf3f9e13c5..dba117af1c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -4,14 +4,16 @@ #include "EC_Timeout_Generator.h" #include "EC_Event_Channel_Base.h" #include "EC_ProxySupplier.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Filter.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Timeout_Filter, "$Id$") +ACE_RCSID (Event, + EC_Timeout_Filter, + "$Id$") TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( TAO_EC_Event_Channel_Base *event_channel, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 40552d214d2..fdbe46377ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -2,13 +2,15 @@ #include "EC_Timeout_Generator.h" #include "EC_Timeout_Filter.h" -#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Generator.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Timeout_Generator, "$Id$") +ACE_RCSID (Event, + EC_Timeout_Generator, + "$Id$") TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index ad193b971af..f037d3df588 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -1,8 +1,10 @@ // $Id$ -#include "orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" -ACE_RCSID(Event, EC_UDP_Admin, "$Id$") +ACE_RCSID (Event, + EC_UDP_Admin, + "$Id$") TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port) : port_ (port) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 5cccfec538c..89588a49864 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -16,7 +16,7 @@ #define TAO_EC_UDP_ADMIN_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/orbsvcs/RtecUDPAdminS.h" #include /**/ "event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 65bbe15ddd5..9360d98f57e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -2,15 +2,15 @@ #include "ace/Service_Config.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Event_Utilities.h" - -#include "orbsvcs/Event/Dispatching_Modules.h" -#include "orbsvcs/Event/Memory_Pools.h" -#include "orbsvcs/Event/EC_Gateway.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Event_Utilities.h" + +#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/orbsvcs/Event/Memory_Pools.h" +#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" #if !defined (__ACE_INLINE__) #include "Event_Channel.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 9be9bd0ef25..c6812a94ff2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -40,11 +40,11 @@ #include "tao/Timeprobe.h" -#include "orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/Event/Local_ESTypes.h" -#include "orbsvcs/Event/Timer_Module.h" -#include "orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Event/Local_ESTypes.h" +#include "orbsvcs/orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp index 0d8e97cb479..de495fe73e4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp @@ -8,7 +8,7 @@ // // ============================================================================ -#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/orbsvcs/Event/Event_Manip.h" #if !defined (__ACE_INLINE__) #include "Event_Manip.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h index b78511867b5..b087dc2ce4a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h @@ -21,7 +21,7 @@ #define TAO_EC_EVENT_MANIP_H #include /**/ "ace/pre.h" -#include "orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" #include "old_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h index 46252134318..a7490392d68 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h +++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h @@ -22,15 +22,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Event_Service_Constants.h" - -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/RtecEventCommC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" + +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" #define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0 diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp index 961f11a3074..b35af5eb52f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp @@ -1,13 +1,15 @@ // $Id$ -#include "orbsvcs/Event/Dispatching_Modules.h" -#include "orbsvcs/Event/Timer_Module.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/orbsvcs/Event/Module_Factory.h" #include "tao/ORB_Core.h" -ACE_RCSID(Event, Module_Factory, "$Id$") +ACE_RCSID (Event, + Module_Factory, + "$Id$") TAO_Module_Factory::~TAO_Module_Factory (void) { diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index f08038fa0a8..cc9677c430c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Sched_Params.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "RT_Task.h" #include "Debug_Macros.h" #include "Event_Channel.h" @@ -15,7 +15,9 @@ #include "tao/Timeprobe.h" #include "ace/OS_NS_errno.h" -ACE_RCSID(Event, RT_Task, "$Id$") +ACE_RCSID (Event, + RT_Task, + "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h index 6bb34db4910..9cbf1d10a7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/orbsvcs/RtecSchedulerC.h" #include "old_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index 8ea1e243627..ca449ff4800 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -2,11 +2,13 @@ #include "ace/High_Res_Timer.h" #include "tao/Timeprobe.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" -ACE_RCSID(Event, ReactorTask, "$Id$") +ACE_RCSID (Event, + ReactorTask, + "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp index 05c3f23f6d3..de8d73e8625 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp @@ -2,7 +2,7 @@ #include "ace/Functor.h" -#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" #include "Timer_Module.h" @@ -10,7 +10,9 @@ #include "Timer_Module.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, Timer_Module, "$Id$") +ACE_RCSID (Event, + Timer_Module, + "$Id$") #include "tao/Timeprobe.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h index 2b93e920c66..e28f0cc74ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h @@ -13,8 +13,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Event/RT_Task.h" +#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/orbsvcs/Event/RT_Task.h" class ACE_Command_Base; |