diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-16 23:53:17 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-16 23:53:17 +0000 |
| commit | c56378bb24b3a57e4b5ec2b12e3a8c53c205d82a (patch) | |
| tree | ff76bbc229031c5e3220b8a4402de3c66c5936a7 /TAO/orbsvcs/orbsvcs | |
| parent | e5bef6a10e6d2170b691876b25698cd929a2170c (diff) | |
| download | ATCD-c56378bb24b3a57e4b5ec2b12e3a8c53c205d82a.tar.gz | |
ChangeLogTag: Mon Aug 16 16:45:06 2004 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
416 files changed, 809 insertions, 809 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index b5b79a52ae4..f53b3ddba1d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -29,20 +29,20 @@ #include "ace/SOCK_Acceptor.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" -#include "orbsvcs/orbsvcs/CosPropertyServiceS.h" -#include "orbsvcs/orbsvcs/AVStreamsS.h" -#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/AV/AV_Core.h" -#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h" -#include "orbsvcs/orbsvcs/Null_MediaCtrlS.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/CosPropertyServiceS.h" +#include "orbsvcs/AVStreamsS.h" +#include "orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/AV/AV_Core.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" +#include "orbsvcs/Null_MediaCtrlS.h" #if defined (TAO_ORBSVCS_HAS_Trader) -#include "orbsvcs/orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Trader.h" #endif /* TAO_ORBSVCS_HAS_Trader */ -#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index f97ad1cb0aa..08597e73734 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1,22 +1,22 @@ // $Id$ -#include "orbsvcs/orbsvcs/AV/AV_Core.h" -#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h" -#include "orbsvcs/orbsvcs/AV/Transport.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" -#include "orbsvcs/orbsvcs/AV/UDP.h" -#include "orbsvcs/orbsvcs/AV/TCP.h" -#include "orbsvcs/orbsvcs/AV/RTP.h" -#include "orbsvcs/orbsvcs/AV/RTCP.h" -#include "orbsvcs/orbsvcs/AV/sfp.h" -#include "orbsvcs/orbsvcs/AV/default_resource.h" +#include "orbsvcs/AV/AV_Core.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Transport.h" +#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/TCP.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTCP.h" +#include "orbsvcs/AV/sfp.h" +#include "orbsvcs/AV/default_resource.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "orbsvcs/orbsvcs/AV/QoS_UDP.h" +#include "orbsvcs/AV/QoS_UDP.h" #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ #if defined (ACE_HAS_SCTP) -#include "orbsvcs/orbsvcs/AV/SCTP_SEQ.h" +#include "orbsvcs/AV/SCTP_SEQ.h" #endif // ACE_HAS_SCTP #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 1cc2e78de16..d6ac2037153 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/AVStreamsC.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AVStreamsC.h" +#include "orbsvcs/AV/AV_export.h" #include "ace/Singleton.h" #include "ace/Unbounded_Set.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 8abf7e851f4..e171286341a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -16,7 +16,7 @@ #define TAO_AV_FLOWSPEC_ENTRY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/AV_export.h" #include "AV_Core.h" #include "ace/Addr.h" #include "ace/Containers.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index b26ef80acfb..24fd3082914 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -18,7 +18,7 @@ #include "ace/Addr.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/AV_export.h" struct TAO_AV_frame_info { diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index cdc48d2316a..b4420b21ee5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -6,12 +6,12 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) #include "UDP.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/MCast.h" -#include "orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/Fill_ACE_QoS.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/AV/QoS_UDP.i" +#include "orbsvcs/AV/QoS_UDP.i" #endif /* __ACE_INLINE__ */ //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 702fc27aa90..ebc49bc6147 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -29,7 +29,7 @@ #include "ace/QoS/QoS_Decorator.h" #include "ace/QoS/SOCK_Dgram_Mcast_QoS.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 4465ae7cf25..38555b63efd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -51,11 +51,11 @@ // FUZZ: disable check_for_math_include #include "ace/OS.h" #include "ace/Hash_Map_Manager.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/UDP.h" #include <math.h> #include <stdlib.h> -#include "orbsvcs/orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTP.h" #include "RTCP_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index a6ef7fef8ed..1af28588edd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -50,8 +50,8 @@ #define TAO_AV_RTP_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" -#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/Protocol_Factory.h" #define RTP_PT_BVC 22 /* Berkeley video codec */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index d38e975de83..aa50d43203d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -12,7 +12,7 @@ #define TAO_AV_DEFAULT_RESOURCE_FCATORY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 8ca19263633..8de06427317 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -22,7 +22,7 @@ #include "ace/Connector.h" #include "ace/Addr.h" #include "ace/SOCK_Dgram.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" +#include "orbsvcs/AV/AV_export.h" #include "FlowSpec_Entry.h" #include "AV_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 4c8b45256dc..e29c8e154ce 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/AV/default_resource.h" +#include "orbsvcs/AV/default_resource.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 2867e024e28..01420bb907f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -13,8 +13,8 @@ #define TAO_AV_DEFAULT_RESOURCE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AVStreams_i.h" -#include "orbsvcs/orbsvcs/AV/Resource_Factory.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/Resource_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 70bba33f830..1885a633231 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -14,8 +14,8 @@ #define TAO_AV_SFP_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/AV/AV_export.h" -#include "orbsvcs/orbsvcs/sfpC.h" +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/sfpC.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h index 16b0c45c420..51ee8c8e9ac 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h @@ -18,7 +18,7 @@ #define ACE_CHANNEL_CLIENTS_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/Channel_Clients_T.h" #include /**/ "ace/post.h" #endif /* ACE_CHANNEL_CLIENTS_H */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index 695611bf0c5..a8a79821a67 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -3,14 +3,14 @@ #ifndef ACE_CHANNEL_CLIENTS_T_C #define ACE_CHANNEL_CLIENTS_T_C -#include "orbsvcs/orbsvcs/Channel_Clients_T.h" +#include "orbsvcs/Channel_Clients_T.h" ACE_RCSID (orbsvcs, Channel_Clients_T, "$Id$") #if !defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Channel_Clients_T.i" +#include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ template<class TARGET> void diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 472a73753f9..f81af14d074 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -25,7 +25,7 @@ #define ACE_CHANNEL_CLIENTS_T_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventCommS.h" // @@ TODO: Add throw specs to this classes. @@ -83,11 +83,11 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Channel_Clients_T.i" +#include "orbsvcs/Channel_Clients_T.i" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/orbsvcs/Channel_Clients_T.cpp" +#include "orbsvcs/Channel_Clients_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index f84ffd871dd..668ee73708b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "concurrency_export.h" /// This constant defines the number of lock modes. There is really no diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 12da31cc6df..75bb4e1a88f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -44,7 +44,7 @@ #include "ace/Token.h" #include "ace/Unbounded_Queue.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h" +#include "orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" #if defined (lock_held) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 8e052406c9f..b49944528d8 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h" +#include "orbsvcs/CosConcurrencyControlS.h" #include "concurrency_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index bdeee1f5775..30f680393cb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h" +#include "orbsvcs/Concurrency/Concurrency_Utils.h" class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 88f46386065..5aaa4d8d70b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -11,7 +11,7 @@ #include "ace/streams.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "tao/debug.h" #include "Concurrency_Utils.h" diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h index b343cd6f61c..ac92e019ecb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h @@ -22,7 +22,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h" +#include "orbsvcs/CosConcurrencyControlC.h" #include "CC_LockSetFactory.h" #include "concurrency_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index c1044726527..faa5d2b9ac0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -6,7 +6,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "CEC_ConsumerAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index a56cbbed72f..0df20092960 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_ProxyPullSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 07293872b3f..3757c04a6f6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 58f079b3cd9..87fff75616e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -13,12 +13,12 @@ #include "CEC_Reactive_ConsumerControl.h" #include "CEC_Reactive_SupplierControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h" +#include "orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/ESF/ESF_Copy_On_Read.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index b121b22e54d..1efbdfb9695 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventCommC.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 ac24df18469..138e22d052f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -28,7 +28,7 @@ #include "tao/Basic_Types.h" #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" #include "CEC_ProxyPushSupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 90c4e9cd216..bf876824fc0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "CEC_Defaults.h" #include "event_export.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index a7f8408d45f..1e6e01dc679 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -18,9 +18,9 @@ #include "CEC_Event_Loader.h" #include "ace/Dynamic_Service.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 4d4ca86a992..9c5e6aae45a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -23,7 +23,7 @@ #include "CEC_TypedEventChannel.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 415ae07b47e..30e6d89e8f1 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "event_export.h" class TAO_CEC_EventChannel; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 85922eb8922..e2e399a2aa4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index aee97b6f167..fbe592a3bc4 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "event_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_EventChannel; class TAO_CEC_Dispatching; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 2deb6110383..7e93085cc0d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -10,8 +10,8 @@ #include "CEC_Dispatching.h" #include "CEC_EventChannel.h" #include "CEC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" #include "tao/debug.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) #include "CEC_TypedEvent.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index d87dd7977dd..48357020537 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -16,10 +16,10 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ #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 f1811d51f40..9668fb7418a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -23,7 +23,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" /** * @class TAO_CEC_Pulling_Strategy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index 164e7588496..8570cfd141e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -21,7 +21,7 @@ #include "CEC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index cf38a4aa8b9..5698aa484ef 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index 1aefc64bb71..89c1c38b0ab 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index 1335ad5b02e..a2837a9b7eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -4,7 +4,7 @@ #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" #include "CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "CEC_SupplierAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 2fdab582804..e78cd342550 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -19,13 +19,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushConsumer.h" #include "CEC_ProxyPullConsumer.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index b65cfc52350..aeea63ca208 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -28,7 +28,7 @@ #include "tao/Objref_VarOut_T.h" -#include "orbsvcs/orbsvcs/CosEvent/event_export.h" +#include "orbsvcs/CosEvent/event_export.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index 9dce04452c9..aaa087d19a9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_ProxyPushSupplier.h" #include "CEC_TypedEvent.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h index 6db51475183..64bcbbb9c6b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h @@ -25,7 +25,7 @@ #include "CEC_Defaults.h" #include "event_export.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/NVList.h" diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h index 3ae216f6a4b..4ee4b165b65 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h @@ -16,13 +16,13 @@ #define TAO_CEC_TYPEDPROXYPUSHCONSUMER_H_ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" class TAO_CEC_TypedEvent; class TAO_CEC_TypedEventChannel; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h index 7f0d3002bc8..9d55ac7dd1c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h @@ -19,13 +19,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h" +#include "orbsvcs/CosTypedEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h" +#include "orbsvcs/ESF/ESF_Proxy_Admin.h" #include "CEC_TypedProxyPushConsumer.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 6c49661a2b5..0e781c19364 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/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "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 459feed2c99..03869de539b 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/orbsvcs/Event/ReactorTask.h" -#include "orbsvcs/orbsvcs/Event/Event_Manip.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/ReactorTask.h" +#include "orbsvcs/Event/Event_Manip.h" +#include "orbsvcs/Event/Event_Channel.h" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index cc1ae3e6bd7..6a3a4298e83 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/orbsvcs/RtecUDPAdminC.h" +#include "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 eb356e86e3c..533e6ba7391 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/orbsvcs/RtecUDPAdminS.h" +#include "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 ee28910bbf3..f8441511cf4 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/orbsvcs/RtecUDPAdminS.h" +#include "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 80f6a1cd40f..5c52c8e7b3c 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/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 "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 "ace/Unbounded_Set.h" #include "ace/OS_NS_string.h" #include "ace/Reactor.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index f62de40073a..25f55f68033 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/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #include /**/ "event_export.h" #include "ECG_Adapters.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index d76f722ade2..773e41b0041 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -9,7 +9,7 @@ #include "ECG_Mcast_EH.h" #include "ECG_UDP_EH.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index b71c9fbe8bf..502b3a555d9 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/orbsvcs/RtecUDPAdminS.h" +#include "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 075682e983e..0fdccc40c53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/ECG_UDP_Receiver.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/SString.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 8e142825d7a..68090d4b7aa 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/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "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 d25efcb56ca..d111b4d8470 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,8 +9,8 @@ * */ -#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/ECG_UDP_Sender.h" +#include "orbsvcs/Event_Utilities.h" #include "tao/CDR.h" #if !defined(__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index ee872d01530..00b1a6181b2 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/orbsvcs/RtecUDPAdminS.h" +#include "orbsvcs/RtecUDPAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "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 6bfc17ea60f..7eb7b9fac4f 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/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "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 193b672ec46..b1b7b1ca222 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/orbsvcs/Event_Service_Constants.h" +#include "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 1b846220c81..d27e7203e8a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -4,9 +4,9 @@ #include "EC_ProxySupplier.h" #include "EC_ProxyConsumer.h" #include "EC_Event_Channel_Base.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" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "EC_ConsumerAdmin.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 909dad88229..60b5edadb24 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/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "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 9d33bbecd68..61adaf515d7 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/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 "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 "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 a14c68925e1..853b7e04a93 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/orbsvcs/RtecEventChannelAdminS.h" +#include "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 d028e06a00d..dfbe23bfd05 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/orbsvcs/RtecEventChannelAdminS.h" +#include "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 bae7d4eb094..54ea96405e4 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/orbsvcs/RtecEventCommC.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 067e33340cf..113c5a7b1ad 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/orbsvcs/RtecEventCommC.h" +#include "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 dd0799e5752..44d548e8693 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/orbsvcs/RtecEventChannelAdminS.h" +#include "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 123a78382a0..ac2f8c4988c 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/orbsvcs/RtecEventCommC.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 be40d293ce0..33c8c9cfb7a 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/orbsvcs/RtecEventChannelAdminC.h" +#include "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 a97cd55b4ce..8ef8d8c7ef0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Gateway.h" +#include "orbsvcs/Event/EC_Gateway.h" ACE_RCSID (Event, EC_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index a8863961edb..ff55b4ca46f 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/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "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 6202e72db2c..91e25f95e96 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/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 "orbsvcs/Event/EC_Gateway_IIOP.h" +#include "orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/Event_Utilities.h" +#include "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 058fc1b4696..06f2d805dfa 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/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/Channel_Clients.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventCommS.h" +#include "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 8e4347a7bc7..eb368de2dbb 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/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 "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" +#include "orbsvcs/Event/ECG_Defaults.h" +#include "orbsvcs/Event_Utilities.h" +#include "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 80835d4dde4..cb8453bdef8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -1,7 +1,7 @@ // $Id$ #include "EC_Gateway_Sched.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" ACE_RCSID (Event, EC_Gateway_sched, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index c207596ae00..3ab5e935271 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/orbsvcs/RtecSchedulerC.h" +#include "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 b1a36867648..2ad2a374996 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/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" #include "tao/ORB_Constants.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index abd145b2b3f..ec54bc03226 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/orbsvcs/RtecSchedulerC.h" +#include "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 0dc7d4e18a0..a40af3f6c2a 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/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "ace/Arg_Shifter.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h index 5c1cd2b04d7..55d64cdb2c9 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/orbsvcs/RtecSchedulerC.h" +#include "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 fd9ebe4715b..5fce1a7cab8 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/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #include "EC_Kokyu_Filter_Builder.h" #include "EC_Type_Filter.h" #include "EC_Conjunction_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h index f07a37c374c..5eb6ef5dc35 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/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #include "rtkokyu_event_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 39c2d42020b..8efb85c2d98 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServerC.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 841bd6656c7..e9df4b4298e 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/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "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 6b0af4e85dd..3149420a6f1 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/orbsvcs/Event_Service_Constants.h" +#include "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 6d33cfea8c6..5bca0bf2172 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/orbsvcs/ESF/ESF_Worker.h" +#include "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/orbsvcs/RtecEventChannelAdminC.h" +#include "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 e0add81915f..1eb2794a909 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/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "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 8a3879662f4..ed97744f809 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/orbsvcs/Event_Service_Constants.h" +#include "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 ade0f194676..53f7634ce00 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/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "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 b8156a664e1..717fad35865 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/orbsvcs/RtecSchedulerC.h" +#include "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 45bed1bbf9c..a8a1fee8960 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/orbsvcs/RtecSchedulerC.h" +#include "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 82a0162f440..75718ee9895 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/orbsvcs/RtecEventChannelAdminS.h" +#include "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 00d0b81e4a6..ea22992bf90 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/orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "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 590d5c61190..552383c96d9 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/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecEventChannelAdminS.h" #include "EC_Filter.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index 559b3497f8b..dce214ba29d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -9,7 +9,7 @@ #define EC_PROXY_DISCONNECTOR__H_ #include /**/ "event_export.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecEventCommC.h" #include "ace/Auto_Functor.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h index 25a37802392..0fbc4fe9290 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/orbsvcs/RtecBaseC.h" +#include "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 06929bcf071..a470864444f 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/orbsvcs/ESF/ESF_Worker.h" +#include "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 f1885974944..c08e3d05705 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/orbsvcs/ESF/ESF_Worker.h" +#include "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 92a0da41ec3..0199dec1957 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/orbsvcs/RtecSchedulerC.h" +#include "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 f556b0f1d8b..c1093401be5 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/orbsvcs/RtecSchedulerC.h" +#include "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 5e153f1bcb1..6b2815e4897 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/orbsvcs/Event_Service_Constants.h" +#include "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 b89992dcba1..29c94f4f892 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/orbsvcs/RtecBaseC.h" -#include "orbsvcs/orbsvcs/RtecEventCommC.h" +#include "orbsvcs/RtecBaseC.h" +#include "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 585fd0076e3..39d04fec297 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/orbsvcs/ESF/ESF_Peer_Workers.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "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 47956d2f32c..91572785bc2 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/orbsvcs/ESF/ESF_Peer_Admin.h" +#include "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 0d80ad03c9e..b4318075078 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/orbsvcs/RtecEventCommC.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/RtecEventCommC.h" +#include "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 534752a9eaf..88a25804797 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/orbsvcs/RtecEventChannelAdminC.h" +#include "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 dba117af1c6..e4e812f95b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -4,8 +4,8 @@ #include "EC_Timeout_Generator.h" #include "EC_Event_Channel_Base.h" #include "EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Filter.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index fdbe46377ab..4373aef1b62 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -2,7 +2,7 @@ #include "EC_Timeout_Generator.h" #include "EC_Timeout_Filter.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event_Service_Constants.h" #if ! defined (__ACE_INLINE__) #include "EC_Timeout_Generator.i" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index f037d3df588..37374a6f760 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h" +#include "orbsvcs/Event/EC_UDP_Admin.h" ACE_RCSID (Event, EC_UDP_Admin, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 89588a49864..5cccfec538c 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/orbsvcs/RtecUDPAdminS.h" +#include "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 9360d98f57e..65bbe15ddd5 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/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" +#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" #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 a6c4709a9c9..30e0d418536 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/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" +#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" // ************************************************************ diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp index de495fe73e4..0d8e97cb479 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp @@ -8,7 +8,7 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/Event/Event_Manip.h" +#include "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 b087dc2ce4a..b78511867b5 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/orbsvcs/RtecEventCommC.h" +#include "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 a7490392d68..46252134318 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/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" +#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" #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 b35af5eb52f..282d4786003 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#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 "orbsvcs/Event/Dispatching_Modules.h" +#include "orbsvcs/Event/Timer_Module.h" +#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/Module_Factory.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index cc9677c430c..951a933d70f 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/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" #include "RT_Task.h" #include "Debug_Macros.h" #include "Event_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h index 9cbf1d10a7e..6bb34db4910 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/orbsvcs/RtecSchedulerC.h" +#include "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 ca449ff4800..92451aa9c6e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -2,7 +2,7 @@ #include "ace/High_Res_Timer.h" #include "tao/Timeprobe.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp index de8d73e8625..6416bfa411e 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/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Scheduler_Factory.h" #include "ReactorTask.h" #include "Timer_Module.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h index e28f0cc74ea..2b93e920c66 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/orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/orbsvcs/Event/RT_Task.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/Event/RT_Task.h" class ACE_Command_Base; diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h index 2c97ce537d8..075adda129a 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h +++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" /// This is the number of events a consumer can subscribe to. const int ACE_ES_MAX_SUBSCRIPTIONS = 32; diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 29b41b32d45..3d45c411eaf 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event_Utilities.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Event_Utilities.i" +#include "orbsvcs/Event_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h index 30d432cbdf9..9bc493d5ea3 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "Event/event_export.h" @@ -244,7 +244,7 @@ private: #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Event_Utilities.i" +#include "orbsvcs/Event_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl index fd253ce9fec..3290d1f2225 100644 --- a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl +++ b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl @@ -13,9 +13,9 @@ #ifndef TAO_FTRT_GROUPMANAGER_IDL #define TAO_FTRT_GROUPMANAGER_IDL -#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl" +#include "orbsvcs/RtecEventChannelAdmin.idl" #include "orb.idl" -#include "orbsvcs/orbsvcs/CosNaming.idl" +#include "orbsvcs/CosNaming.idl" #include "FTRT.idl" module FTRT diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl index 64c0009937c..e9529e48959 100644 --- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl +++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl @@ -11,18 +11,18 @@ // FT_Replica.idl // The next include is TAO specific. -#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl" +#include "orbsvcs/FT_CORBA_ORB.idl" #define FT_USES_PORTABLE_GROUP #ifdef FT_USES_PORTABLE_GROUP # include "orbsvcs/orbsvcs/PortableGroup.idl" #else // FT_USES_PORTABLE_GROUP -#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl +#include "orbsvcs/CosNaming.idl" // 98-10-19.idl #endif // FT_USES_PORTABLE_GROUP -#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl -#include "orbsvcs/orbsvcs/CosNotifyFilter.idl" +#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl +#include "orbsvcs/CosNotifyFilter.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl index 194b6183e5f..b783eb46ace 100644 --- a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl +++ b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl @@ -22,9 +22,9 @@ #pragma prefix "omg.org" -#include "orbsvcs/orbsvcs/FT_CORBA.idl" -#include "orbsvcs/orbsvcs/FT_Replica.idl" -#include "orbsvcs/orbsvcs/PortableGroup.idl" +#include "orbsvcs/FT_CORBA.idl" +#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/PortableGroup.idl" module FT { diff --git a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl index de0e071b58a..bb1d839f388 100644 --- a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl +++ b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl @@ -17,16 +17,16 @@ /////////////////////////////// // TAO specific includes -#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl" -#include "orbsvcs/orbsvcs/FT_Replica.idl" +#include "orbsvcs/FT_CORBA_ORB.idl" +#include "orbsvcs/FT_Replica.idl" // end of TAO specific includes /////////////////////////////// -#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl -#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl +#include "orbsvcs/CosNaming.idl" // 98-10-19.idl +#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl // added to OMG version: -#include "orbsvcs/orbsvcs/CosNotifyFilter.idl" +#include "orbsvcs/CosNotifyFilter.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl index 73d47a48b52..8f36d6b135a 100644 --- a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl +++ b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl @@ -15,10 +15,10 @@ #ifndef _FT_REPLICATION_MANAGER_IDL_ #define _FT_REPLICATION_MANAGER_IDL_ -#include "orbsvcs/orbsvcs/PortableGroup.idl" -#include "orbsvcs/orbsvcs/FT_CORBA.idl" -#include "orbsvcs/orbsvcs/FT_Replica.idl" -#include "orbsvcs/orbsvcs/FT_Notifier.idl" +#include "orbsvcs/PortableGroup.idl" +#include "orbsvcs/FT_CORBA.idl" +#include "orbsvcs/FT_Replica.idl" +#include "orbsvcs/FT_Notifier.idl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index a02b8ba4a14..c59cd08d228 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -5,7 +5,7 @@ #include "FT_ClientORBInitializer.h" #include "FT_ClientPolicyFactory.h" #include "FT_ClientRequest_Interceptor.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 1f86d5f03dc..7da3391fdd8 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -4,7 +4,7 @@ #include "FT_ClientPolicyFactory.h" #include "FT_ClientPolicy_i.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 48a3e1bdea8..f9e93824f1c 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -14,7 +14,7 @@ #define TAO_FT_CLIENTPOLICY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index e61ed2037e8..719ae0c489d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "FT_ClientRequest_Interceptor.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/CORBA_String.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index a80b43b1978..94d4b522b89 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/IORManipulation/IORManip_Loader.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/IOPC.h" #include "FT_ORB_Utils_export.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index fd8e7e29908..728f608a449 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -6,7 +6,7 @@ #include "FT_ServerPolicyFactory.h" #include "FT_ServerRequest_Interceptor.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/Exception.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 126a9b4d1b0..e06536ee5f6 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -4,7 +4,7 @@ #include "FT_ServerPolicyFactory.h" #include "FT_ServerPolicy_i.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 5441291f6fc..c2fcc4cab2a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -14,7 +14,7 @@ #define TAO_FT_SERVERPOLICY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 95703574f92..07785dbf0f1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -6,7 +6,7 @@ #include "tao/DynamicC.h" #include "tao/Typecode.h" #include "tao/CDR.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 8d6d3873e53..b4f496ea24f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Service_Callbacks.h" -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" class TAO_Profile; class TAO_MProfile; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index d385490ef76..07caec84c43 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -15,7 +15,7 @@ #include "UpdateableHandler.h" #include "Replication_Strategy.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 055b3ea22cc..5cb5792d3c1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -15,7 +15,7 @@ #include "ace/Task.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h" +#include "orbsvcs/FTRT_GroupManagerC.h" #include "Replication_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index bc27837b85d..fa2c3cf0dbd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "FTEC_ConsumerAdmin.h" #include "FTEC_ProxySupplier.h" #include "ProxySupplierStateWorker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h index 78cd609596a..267162a8b4b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" #include "FT_ProxyAdmin_T.h" #include "ProxySupplierStateWorker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 961289f2e6e..ff7d20f47ff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -13,7 +13,7 @@ #define FTEC_EVENT_CHANNEL_H #include "ftrtec_export.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminS.h" +#include "orbsvcs/FtRtecEventChannelAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index d452581b1bd..5c9c7f79053 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -11,7 +11,7 @@ #include "IOGR_Maker.h" #include "Replication_Service.h" #include "../Utils/Safe_InputCDR.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/FtRtecEventCommC.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h index 2f021715f21..4ddb93d6450 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h @@ -13,8 +13,8 @@ #define TAO_FTEC_EVENT_CHANNEL_H #include "ace/Synch_T.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Factory.h" #include "FTEC_Group_Manager.h" #include "IOGR_Maker.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index f49851fc591..b46188a9458 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "FTEC_Event_Channel.h" #include "FTEC_Factory.h" #include "FTEC_ProxySupplier.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h index f66743e06b8..d253716dba1 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h @@ -12,7 +12,7 @@ #ifndef FTEC_FACTORY_H #define FTEC_FACTORY_H -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Default_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h index e41fc061fe2..f2720fa1393 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h @@ -13,7 +13,7 @@ #ifndef TAO_FTEC_GROUP_MANAGER_H #define TAO_FTEC_GROUP_MANAGER_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Fault_Listener.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h index 71555d8e463..0522671688a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h @@ -12,9 +12,9 @@ #ifndef TAO_FTEC_PROXYCONSUMER_H #define TAO_FTEC_PROXYCONSUMER_H -#include "orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Default_ProxyConsumer.h" #include "ace/SString.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h index 00214efb221..a1ca15aeaff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h @@ -12,9 +12,9 @@ #ifndef TAO_FTEC_PROXYSUPPLIER_H #define TAO_FTEC_PROXYSUPPLIER_H -#include "orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h" +#include "orbsvcs/Event/EC_Default_ProxySupplier.h" #include "ace/SString.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "Request_Context_Repository.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index c78245ef4d0..b67a0fe6a3a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" #include "FTEC_SupplierAdmin.h" #include "FTEC_ProxyConsumer.h" #include "tao/Stub.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h index 86cabee49b7..9bbdca262ed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" class TAO_FTEC_Event_Channel_Impl; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index a3b2cb066fd..01d02f86e00 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include "tao/corba.h" #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/FtRtecEventCommC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index bdee43cd7a7..10d93e3705d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -16,7 +16,7 @@ #include "ace/Task.h" #include "ace/Reactor.h" -#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h" +#include "orbsvcs/FTRT_GroupManagerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index b0fcba2ef7c..f228a360c5f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -11,7 +11,7 @@ #include "tao/Object_KeyC.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/orbsvcs/FTRTC.h" +#include "orbsvcs/FTRTC.h" ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 3b3a0efc522..ce5ea538e26 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "FtEventServiceInterceptor.h" #include "Request_Context_Repository.h" #include "../Utils/Safe_InputCDR.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h index 2c58dcad192..4607ee70075 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h @@ -16,7 +16,7 @@ #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" #include "tao/ORB.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index f7eddb4ff98..574a89bf1c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -13,7 +13,7 @@ #ifndef GROUPINFOPUBLISHER_H #define GROUPINFOPUBLISHER_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableServer/PortableServerC.h" #include "ace/Vector_T.h" #include "ace/Singleton.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index 2b474626ac6..03ff6faf180 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -10,7 +10,7 @@ #include <algorithm> #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" -#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "GroupInfoPublisher.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h index a34c696e523..99619a369d3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h @@ -13,7 +13,7 @@ #ifndef IOGR_MAKER_H #define IOGR_MAKER_H -#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h" +#include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/IORManipulation/IORManipulation.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h index d5c4578016e..0fb06766859 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h @@ -14,9 +14,9 @@ #define IDENTIFICATION_SERVICE_H #include "ace/Service_Object.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/FTRTC.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommC.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/FTRTC.h" +#include "orbsvcs/FtRtecEventCommC.h" #include "ftrtec_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h index fce0d28a993..8b5b14f8acd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h @@ -12,7 +12,7 @@ #ifndef OBJECTGROUPMANAGERHANDLER_H #define OBJECTGROUPMANAGERHANDLER_H -#include "orbsvcs/orbsvcs/FTRT_GroupManagerS.h" +#include "orbsvcs/FTRT_GroupManagerS.h" #include "ace/Auto_Event.h" class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp index a9c60538ae2..7869ab38378 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp @@ -1,8 +1,8 @@ // $Id$ #include "ProxyConsumerStateWorker.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" ACE_RCSID (EventChannel, ProxyConsumerStateWorker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h index 1de276bb2c6..772fd16538e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h @@ -13,8 +13,8 @@ #ifndef PROXYCONSUMERSTATEWORKER_H #define PROXYCONSUMERSTATEWORKER_H -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "FTEC_ProxyConsumer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp index 0a0e2d732a0..cb455699293 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "ProxySupplierStateWorker.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel_Base.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" ACE_RCSID (EventChannel, ProxySupplierStateWorker, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h index 01158edeb08..aa6681719de 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h @@ -13,8 +13,8 @@ #ifndef PROXYSUPPLIERSTATEWORKER_H #define PROXYSUPPLIERSTATEWORKER_H -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "FTEC_ProxySupplier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h index cc204aca9a3..24615e80cc4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h @@ -13,7 +13,7 @@ #ifndef REPLCATION_SERVICE_H #define REPLCATION_SERVICE_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "FTEC_Become_Primary_Listener.h" #include "tao/PortableInterceptorC.h" #include "ace/Service_Object.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index 40a4eee3bc5..7ed955e2d11 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -12,7 +12,7 @@ #ifndef REPLICATION_STRATEGY_H #define REPLICATION_STRATEGY_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableInterceptorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index f8aa835afa9..158b43ea297 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -13,7 +13,7 @@ #ifndef REQUEST_CONTEXT_REPOSITORY_H #define REQUEST_CONTEXT_REPOSITORY_H -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" #include "tao/PortableInterceptorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 0fd88f14e61..1a890399027 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -2,7 +2,7 @@ #include "tao/CDR.h" #include "Set_Update_Interceptor.h" -#include "orbsvcs/orbsvcs/FTRTC.h" +#include "orbsvcs/FTRTC.h" #include "Request_Context_Repository.h" ACE_RCSID (EventChannel, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 07f61e9e461..a1ba493264f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -12,7 +12,7 @@ #ifndef UPDATEABLEHANDLER_H #define UPDATEABLEHANDLER_H -#include "orbsvcs/orbsvcs/FTRTS.h" +#include "orbsvcs/FTRTS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 38c23229766..f68d1cdcde8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -2,7 +2,7 @@ #include "activate_with_id.h" #include "UUID.h" #include "resolve_init.h" -#include "orbsvcs/orbsvcs/FtRtecEventCommS.h" +#include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" ACE_RCSID (Utils, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h index bc4a9139dfc..9cafa79f8f8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h @@ -13,8 +13,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/FtRtecEventChannelAdminC.h" +#include "orbsvcs/RtecEventChannelAdminS.h" namespace TAO_FTRTEC { diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl index 234f59d2480..866640ef114 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl @@ -13,7 +13,7 @@ #ifndef TAO_FTRTEC_EVENTCHANNELADMIN_IDL #define TAO_FTRTEC_EVENTCHANNELADMIN_IDL -#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl" +#include "orbsvcs/RtecEventChannelAdmin.idl" #include "FTRT.idl" #include "FTRT_GroupManager.idl" #include "FtRtecEventComm.idl" diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl index 6d44c9ba90b..a1406158952 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl @@ -13,7 +13,7 @@ #ifndef FTRTECEVNETCOMM_H #define FTRTECEVNETCOMM_H -#include "orbsvcs/orbsvcs/RtecEventComm.idl" +#include "orbsvcs/RtecEventComm.idl" module FtRtecEventComm { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index f4aa04e4953..9d87b2abbd3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -4,10 +4,10 @@ #include "IDLType_i.h" #include "Container_i.h" #include "Contained_i.h" -#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h" -#include "orbsvcs/orbsvcs/IFRService/Options.h" -#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/IFRService/Options.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IOR_Multicast.h" #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h index 9d26c3665cb..863106d7487 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h @@ -23,7 +23,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/svc_utils_export.h" +#include "orbsvcs/svc_utils_export.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index d680e65932a..ce0e3b6e62c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index fab93d1af5f..6ad66ee8ada 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 224294591bc..4d960d74884 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/LB_ORTC.h" +#include "orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index 374198c8aac..fd3240d0bcd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,6 +1,6 @@ #include "LB_ClientRequestInterceptor.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 166d3037734..0f290d8412b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/LB_ORTC.h" +#include "orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index 537a3dcbdaf..7252318027a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "tao/LocalObject.h" #include "tao/IORInterceptor/IORInterceptorC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 97b11bfb4df..11c0c402b90 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 0ae1886cd3b..478b6d22b63 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -22,7 +22,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index bec59e2725f..5c356ef3b41 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" class TAO_LoadBalancing_Export TAO_LB_LoadAlert diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 8b4effbc06d..78eeeb187f6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,5 +1,5 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (LoadBalancing, LB_LoadAlertInfo, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 069c924c021..6736448e92c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index de57de3dc2a..620ec2d3acb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -24,8 +24,8 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 00ca3154c3d..0768f411ac2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -13,7 +13,7 @@ #ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H #define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index d6da83152c8..a9865acf8b7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index 8f50a617e19..fc69de65e4a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h index 1ca35de22bf..ebfbb3b6cb7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index e70d2ef5c7c..32d63b54f0f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -8,8 +8,8 @@ #include "LB_LeastLoaded.h" #include "LB_conf.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/Messaging/Messaging.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index fc9477c0cb2..06b190c4e4b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -28,11 +28,11 @@ #include "LB_LoadListMap.h" #include "LB_Pull_Handler.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/PortableGroup/PG_PropertyManager.h" +#include "orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" class TAO_LoadBalancing_Export TAO_LB_LoadManager diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h index 1ff00d58bc6..6e5778f4a55 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index a247293b071..8f0cc83f219 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -3,7 +3,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 1587d889b3f..522d574ea3c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h index 9bda59cc806..b99c5437779 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h index 46dd23539e5..02b8f12adeb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h @@ -16,14 +16,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 9f59c099b0f..245fc0552b1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "LB_IORInterceptor.h" #include "LB_ServerRequestInterceptor.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index 6ca2b5b8597..d7bab7a8e98 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/LB_ORTC.h" +#include "orbsvcs/LB_ORTC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/CosLoadBalancingC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 7eb9eb88c72..2f03027c78a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 82e408654ff..6e8c1db4288 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -2,7 +2,7 @@ #include "LB_RoundRobin.h" -#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index 934e92a7d1c..c244a697157 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -22,9 +22,9 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h" +#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h" -#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/CosLoadBalancingS.h" /** * @class TAO_LB_RoundRobin_Strategy diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index 4a7d114122e..a03a561f291 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -18,7 +18,7 @@ #include "ace/config-all.h" -#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 9d6f39e6fb5..2a96caf9700 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/orbsvcs/Log/BasicLogFactory_i.h" +#include "orbsvcs/Log/BasicLogFactory_i.h" ACE_RCSID (Log, BasicLogFactory_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index bc0f66de571..ddc42d07cdb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -19,14 +19,14 @@ #define TAO_TLS_BASICLOGFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/BasicLog_i.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index 17499a8b671..dfcb7dbc492 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/BasicLog_i.h" +#include "orbsvcs/Log/BasicLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogMgr_i.h" ACE_RCSID (Log, BasicLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index b6f837e2de6..79ad3c33366 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -21,13 +21,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/Log_i.h" #include "log_export.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index f00ce56edef..04187810399 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/EventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, EventLogConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index 933bcc1c2e4..ccff8564687 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -19,16 +19,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "eventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index 08550f254e5..800174ac1e9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/EventLogFactory_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/EventLogNotification.h" +#include "orbsvcs/Log/EventLogFactory_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLogNotification.h" #include "ace/Auto_Ptr.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index 8c708aeefed..37e9f9fb39c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -20,17 +20,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/DsEventLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "EventLog_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 9dfb1fa5c5a..7efe128c8b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/EventLogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLogNotification.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index 582b9eaa533..ae29afa6b24 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -20,16 +20,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h" -#include "orbsvcs/orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/CosEvent/CEC_Default_Factory.h" +#include "orbsvcs/CosEventCommS.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 76e5f3afd74..a76aeb0ada8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/EventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/EventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, EventLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index f4fb4b15618..5f1329741ee 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -20,17 +20,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h" -#include "orbsvcs/orbsvcs/Log/EventLogConsumer.h" +#include "orbsvcs/DsEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/CosEvent/CEC_EventChannel.h" +#include "orbsvcs/Log/EventLogConsumer.h" #include "eventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index ac4780e1dcc..fcbf59d24e0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -1,8 +1,8 @@ #include "Iterator_i.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/DsLogAdminC.h" ACE_RCSID (Log, Iterator_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index e192849618c..d4bfe613ca9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -19,13 +19,13 @@ #define TAO_TLS_ITERATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/Log/LogRecordStore.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index 6dd3aeceed2..618fa0ba5b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -18,13 +18,13 @@ #define TAO_TLS_LOGMGR_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/Log_i.h" #include "log_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 697e70aa687..0a99e274bcf 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 763ddace35c..99f08b0e7a6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -18,13 +18,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogNotificationS.h" +#include "orbsvcs/DsLogNotificationS.h" #include "log_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 74038ad3d20..ddbb9953e8b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -1,8 +1,8 @@ -#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/Log/LogRecordStore.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index c016786c432..14fb7f5c398 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -19,13 +19,13 @@ #define TAO_LOG_RECORD_STORE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/DsLogAdminC.h" #include "ace/Containers.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index e365b351982..9d077d162e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -19,14 +19,14 @@ #define TAO_LOG_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/DsLogAdminC.h" #include "log_export.h" class TAO_Log_Constraint_Visitor; diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 66c6fc561f9..59f18a7d98f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1,7 +1,7 @@ #include "Log_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_y.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index 4a4866e222f..2cb65f58b6f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -26,8 +26,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/DsLogAdminC.h" #include "tao/Typecode.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index c98877f9f8e..0e1f1242ced 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1,9 +1,9 @@ -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Log/Iterator_i.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h" -#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/Iterator_i.h" +#include "orbsvcs/Log/Log_Constraint_Interpreter.h" +#include "orbsvcs/Log/Log_Constraint_Visitors.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 2181e2d7e72..9024075a59b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -20,14 +20,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Log/LogRecordStore.h" +#include "orbsvcs/Log/LogRecordStore.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/DsLogAdminS.h" #include "ace/Reactor.h" #include "log_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 7a79e1680f7..97c9bc2d6b2 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, NotifyLogConsumer, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index d20ae88f2dd..d7f8a0086ee 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -18,14 +18,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" +#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 8bdfefc87ec..c170bfc266a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h" +#include "orbsvcs/Log/NotifyLogFactory_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLogNotification.h" ACE_RCSID (Log, NotifyLogFactory_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index f887c674f94..a6ad82cca03 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -18,14 +18,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/DsNotifyLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogMgr_i.h" #include "NotifyLog_i.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 8c161bff3ff..53434e73a9b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLogNotification.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 0dc5d4997e5..c9b47b2f773 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -20,16 +20,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/DsNotifyLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventCommS.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNamingC.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 20bc3f9ea0a..88e58478c13 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -1,6 +1,6 @@ -#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/NotifyLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" ACE_RCSID (Log, NotifyLog_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 63fbb632bd0..39d6d275cab 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -19,15 +19,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Log/NotifyLogConsumer.h" +#include "orbsvcs/DsNotifyLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/Log/NotifyLogConsumer.h" #include "notifylog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp index bf08953799a..89e7127cfa0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp @@ -3,7 +3,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h index 883b65d21a9..1d84b0bb64d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h @@ -17,14 +17,14 @@ #define TAO_PERSIST_STORE_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #include "tao/Typecode.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminC.h" +#include "orbsvcs/DsLogAdminC.h" #include "ace/Mutex.h" #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250 diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 69a8009f059..018bc2388e4 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -1,16 +1,16 @@ -#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 1fd91e51bca..76e3dc1583f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -19,17 +19,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Defaults.h" +#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Factory.h" +#include "orbsvcs/Event/EC_Defaults.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 12d794c9a4f..022ff15dfb6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -1,25 +1,25 @@ -#include "orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.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" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Log/RTEventLogFactory_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/RTEventLogNotification.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Sched/Config_Scheduler.h" +#include "orbsvcs/Event/Module_Factory.h" +#include "orbsvcs/Event/Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Auto_Ptr.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i" +#include "orbsvcs/Event/EC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index 5be76ec71b9..42b25823cbb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -18,17 +18,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/RTEventLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/DsLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/DsLogAdminS.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/RtecEventChannelAdminS.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/CosNamingC.h" #include "RTEventLog_i.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 5d4a3788101..50bf6175c89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -1,22 +1,22 @@ -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Log/RTEventLogNotification.h" +#include "orbsvcs/Time_Utilities.h" #include "tao/debug.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.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" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/orbsvcs/Event/EC_Filter_Builder.h" -#include "orbsvcs/orbsvcs/Event/EC_QOS_Info.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/RtecEventChannelAdminC.h" +#include "orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/ESF/ESF_Peer_Workers.h" +#include "orbsvcs/ESF/ESF_Peer_Admin.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_Filter_Builder.h" +#include "orbsvcs/Event/EC_QOS_Info.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Scheduling_Strategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/ESF/ESF_RefCount_Guard.h" +#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h" ACE_RCSID (Log, RTEventLogNotification, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index 2ae3fd2ad6c..b6f1718cbce 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -20,18 +20,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/RtecEventCommS.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h" -#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/RtecEventCommS.h" +#include "orbsvcs/Event/EC_ProxySupplier.h" +#include "orbsvcs/Event/EC_ProxyConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 68d87cd2f20..84fc071fcc6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -1,16 +1,16 @@ -#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h" -#include "orbsvcs/orbsvcs/Log/LogMgr_i.h" -#include "orbsvcs/orbsvcs/Log/LogNotification.h" -#include "orbsvcs/orbsvcs/Event_Utilities.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h" -#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h" -#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h" -#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h" -#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h" +#include "orbsvcs/Log/RTEventLog_i.h" +#include "orbsvcs/Log/LogMgr_i.h" +#include "orbsvcs/Log/LogNotification.h" +#include "orbsvcs/Event_Utilities.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Default_Factory.h" +#include "orbsvcs/Event/EC_Dispatching.h" +#include "orbsvcs/Event/EC_ConsumerAdmin.h" +#include "orbsvcs/Event/EC_SupplierAdmin.h" +#include "orbsvcs/Event/EC_Timeout_Generator.h" +#include "orbsvcs/Event/EC_ObserverStrategy.h" +#include "orbsvcs/Event/EC_ConsumerControl.h" +#include "orbsvcs/Event/EC_SupplierControl.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Log, diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 622b25ff925..3601e347781 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -18,18 +18,18 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/DsLogAdminS.h" +#include "orbsvcs/DsLogAdminS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RTEventLogAdminS.h" -#include "orbsvcs/orbsvcs/Log/Log_i.h" -#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h" -#include "orbsvcs/orbsvcs/Event/EC_Factory.h" -#include "orbsvcs/orbsvcs/Event/EC_Defaults.h" -#include "orbsvcs/orbsvcs/Log/RTEventLogConsumer.h" +#include "orbsvcs/RTEventLogAdminS.h" +#include "orbsvcs/Log/Log_i.h" +#include "orbsvcs/Event/EC_Event_Channel.h" +#include "orbsvcs/Event/EC_Factory.h" +#include "orbsvcs/Event/EC_Defaults.h" +#include "orbsvcs/Log/RTEventLogConsumer.h" #include "rteventlog_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h index 68cfe397c9a..4fc1f6b85ef 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h @@ -23,7 +23,7 @@ #include "ace/SString.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.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 e500888109e..f113da90784 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosNamingS.h" +#include "orbsvcs/CosNamingS.h" #include "naming_export.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 624b0a15949..601ad73e463 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index 29c50161624..39ca0e87014 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -6,7 +6,7 @@ #include "Storable_Naming_Context.h" #include "Storable_Naming_Context_Activator.h" #include "Flat_File_Persistence.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "tao/debug.h" #include "tao/default_ports.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h index e4d0d92e235..ff2daa322c5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "tao/ORB.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/IOR_Multicast.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/IOR_Multicast.h" #include "Naming_Context_Interface.h" #include "nsconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index bc4d9f22dad..91a5aa17e10 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/Hash_Map_With_Allocator_T.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" #include "naming_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 92d8788807f..c01902fea7e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Notify, TAO_Notify_Admin, "$Id$") -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" #include "Container_T.h" #include "Proxy.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 74b0ec9f268..1d373b8eac8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Notify, TAO_Notify_AdminProperties, "$Id$") -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index 69e19fce382..6ca5f07e18c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -23,7 +23,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_Consumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index d1bfcce96ae..0d115c82f31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "../ProxyConsumer_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h index a03473c6ca1..b84edf1d5ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/CosEventChannelAdminS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 06267731c7a..5df73af9779 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h index 4402cb21ad4..b4f18be42f9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index fd1ee695630..d26302a2cee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/orbsvcs/CosEventCommC.h" +#include "orbsvcs/CosEventCommC.h" #include "../Event.h" TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index 5186338831e..98e48b52381 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index 9beba8f8d00..8cdf891d598 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 01eb6d0b631..55acfa6f5dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Notify, #include "ace/Message_Queue.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" #include "Method_Request.h" #include "Notify_Extensions.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index d9159c14863..b60ed0ce9b0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -23,7 +23,7 @@ #include "ace/Null_Condition.h" #include "ace/Message_Queue.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" +#include "orbsvcs/TimeBaseC.h" #include "Property.h" #include "Property_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index d5c959508d3..e42cc2ad59f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -22,8 +22,8 @@ #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/CosNotifyChannelAdminC.h" +#include "orbsvcs/NotifyExtC.h" #include "AdminProperties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index f7ff532b790..9b18e9335e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotificationC.h" #include "Peer.h" #include "Event.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 3f9a5f08608..5552b0df58b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -11,7 +11,7 @@ ACE_RCSID (RT_Notify, "$Id$") #include "ace/Auto_Ptr.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Subscription_Change_Worker.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index 394f43568b0..0f41aaa9f68 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/NotifyExtS.h" +#include "orbsvcs/NotifyExtS.h" #include "Admin.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp index e469099bfa1..f3dddbcffe4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp @@ -9,8 +9,8 @@ #include "Factory.h" #include "POA_Helper.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" #if ! defined (__ACE_INLINE__) #include "Container_T.inl" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 59a953d6a46..23604de6421 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" /** * @class TAO_Notify_Container_T diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 5e97efabfa8..42d441b8513 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -8,7 +8,7 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index 4dc6a1be779..71bf67b948f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -10,8 +10,8 @@ ACE_RCSID (Notify, TAO_Notify_Default_Factory, "$Id$") -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "orbsvcs/ESF/ESF_Proxy_List.h" +#include "orbsvcs/ESF/ESF_Copy_On_Write.h" #include "EventChannelFactory.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 8f7f4c667bf..d3056151c25 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -22,7 +22,7 @@ #include "ace/Containers_T.h" #include "ace/Hash_Map_Manager.h" #include "ace/Atomic_Op.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/CosNotifyFilterS.h" #include "Notify_Constraint_Interpreter.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 290d305d385..6a51767c8a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/CosNotifyFilterS.h" #include "FilterFactory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 60fbdcbec72..b731ccf5f4d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Notify, "$Id$") #include "tao/debug.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" TAO_Notify_Event::TAO_Notify_Event (void) :priority_ (CosNotification::Priority, CosNotification::DefaultPriority), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 595e666c059..d931edf6a9a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -23,9 +23,9 @@ #include "ace/Copy_Disabled.h" #include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/orbsvcs/Event_ForwarderS.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/CosNotificationC.h" #include "Property.h" #include "Property_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index b2fcdf3618c..eaac0a7ce8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index 21db8d744e0..3f5c1745c4f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/NotifyExtS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/NotifyExtS.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index c4a43ef34b4..c607c4dec95 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_EventType diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index 05bd7babae0..317891d5dde 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "tao/orbconf.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp index a9b78c54179..089a32adca0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Notify, TAO_Notify_Event_Map_Entry_T, "$Id$") -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index bad6e640cac..77de698806d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -4,7 +4,7 @@ #define TAO_Notify_EVENT_MAP_T_C #include "Event_Map_T.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Event_Map_Entry_T.h" #include "Properties.h" #include "Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 7f7eb146061..1ac91e18473 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterS.h" +#include "orbsvcs/CosNotifyFilterS.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index 9fcf4aa8c7f..a5123bdbd1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" #include "Object.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index e2c29af3b0d..4668713446d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "Method_Request.h" #include "ProxyConsumer.h" #include "Consumer_Map.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h index 9f99375103e..2b7d34f2044 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "ProxySupplier.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 6d38a1e3013..d580f0533bb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -15,14 +15,14 @@ #define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h" +#include "orbsvcs/ETCL/ETCL_Interpreter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/CosNotifyFilterC.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/CosNotifyFilterC.h" #include "notify_export.h" class TAO_Notify_Constraint_Visitor; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 2b47025061a..55fe28b9c8b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1,8 +1,8 @@ /* $Id$ */ #include "Notify_Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h" -#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h" +#include "orbsvcs/ETCL/ETCL_Constraint.h" +#include "orbsvcs/ETCL/ETCL_y.h" #include "tao/Any_Unknown_IDL_Type.h" #include "tao/DynamicAny/DynArray_i.h" #include "tao/DynamicAny/DynSequence_i.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index c97c326b4ed..bea7eb79521 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" +#include "orbsvcs/CosNotificationC.h" #include "tao/Typecode.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 21fdb8359bc..c26c63b15f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -13,7 +13,7 @@ #define NOTIFY_EVENTCHANNELFACTORY_I_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "notify_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 216dcb9cd8c..f13e1fc8999 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -22,7 +22,7 @@ #include "tao/PortableServer/Servant_Base.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "QoSProperties.h" #include "AdminProperties.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index 710dd3e1202..345d8878c1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" #include "EventTypeSeq.h" class TAO_Notify_Proxy; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index ecdfac34c9b..f9f7f9d567f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Properties.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 5d938efd4dc..98bd425dfd3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -24,7 +24,7 @@ #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_Factory; class TAO_Notify_Builder; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h index f551b53c1a7..a9243b79afa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h @@ -23,7 +23,7 @@ #include "tao/orbconf.h" #include "tao/TimeBaseC.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" template <class LOCK, class TYPE> class ACE_Atomic_Op; template <class TYPE> class TAO_Notify_Property_T; diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h index 72554b0170d..4b5a4011f9d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h index 71cf25ad690..f2423d6a7a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 88362f193b4..5ad9b2b0654 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -22,7 +22,7 @@ #include "ace/SString.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" class TAO_Notify_PropertySeq; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index 523c572b0a7..489d5cbe077 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" #include "Refcountable_Guard_T.h" #include "Event.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h index 641aab7f7b1..8b772111525 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h @@ -22,7 +22,7 @@ #include "Event.h" #include "Proxy.h" #include "Refcountable_Guard_T.h" -#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h" +#include "orbsvcs/CosEventChannelAdminC.h" class TAO_Notify_Consumer; class TAO_Notify_ConsumerAdmin; diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 3850565c129..ecbcb9a205d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -7,7 +7,7 @@ #include "ETCL_FilterFactory.h" #include "RT_POA_Helper.h" #include "Properties.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "Object.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp index 6c049c0713e..4a507f456f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp @@ -3,7 +3,7 @@ #include "RT_POA_Helper.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/debug.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" #include "RT_Properties.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h index 85bcdecd998..24b3491f52c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h @@ -20,7 +20,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "POA_Helper.h" -#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/NotifyExtC.h" /** * @class TAO_Notify_RT_POA_Helper diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 356bbde952f..408564117f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Worker.h" #include "Container_T.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index 21e6c057798..321e2b9878d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h index 640e8a0f1b4..923138c2d39 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index ef22534d68a..b5680908d22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h index 06536f80d13..cd615f00b6e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h @@ -22,7 +22,7 @@ #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/Service_Object.h" -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "tao/PortableServer/PortableServer.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h index c964fdc8937..7a7922b960c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h @@ -20,7 +20,7 @@ #include "../Event.h" #include "../EventType.h" -#include "orbsvcs/orbsvcs/CosNotificationC.h" +#include "orbsvcs/CosNotificationC.h" /** * @class TAO_Notify_StructuredEvent_No_Copy diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 143f1d5bd03..d979d1bacf6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" #include "../ProxyConsumer_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index d71db430726..026c155b3e0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -20,8 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/orbsvcs/Event_ForwarderS.h" +#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/Event_ForwarderS.h" #include "../ProxySupplier_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 36f6f7f8096..98257c8c2bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Consumer.h" class TAO_Notify_ProxySupplier; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index 65e95c3d175..8d7cd70a311 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" #include "../Supplier.h" class TAO_Notify_ProxyConsumer; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h index 5763746a3c0..8a377d1a06a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h @@ -19,8 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNotificationC.h" -#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h" +#include "orbsvcs/CosNotificationC.h" +#include "orbsvcs/ESF/ESF_Worker.h" class TAO_Notify_Proxy; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 8494f431b98..64fea3a6bd4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -21,7 +21,7 @@ #include "Peer.h" -#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/CosNotifyCommC.h" class TAO_Notify_ProxyConsumer; /** diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 5df0e4487eb..37823207801 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -10,7 +10,7 @@ ACE_RCSID (RT_Notify, TAO_Notify_SupplierAdmin, "$Id$") -#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h" +#include "orbsvcs/ESF/ESF_Proxy_Collection.h" #include "Builder.h" #include "Proxy.h" #include "EventChannel.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index c9ae1a3ff5d..0b58745597c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/NotifyExtS.h" +#include "orbsvcs/NotifyExtS.h" #include "Admin.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index eaa82e6fa23..da03189be1b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index ec531c6db41..3f9ae599e2b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -31,7 +31,7 @@ namespace TAO ///////////////////////////////// // Includes needed by this header #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h index 383c2d212eb..ff2033929ff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h @@ -24,7 +24,7 @@ #include "PG_Factory_Set.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index f02e4ef24d7..3bca619031f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index 2f9cd627c70..8123d3d3828 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -25,7 +25,7 @@ #include "PG_Factory_Map.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index a4ed36858b7..810f444574a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -13,7 +13,7 @@ #include "PG_Group_Factory.h" #include "PG_Property_Utils.h" #include "PG_conf.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "PG_Object_Group.h" #include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index 5ee17c6fe25..e5b47d0434c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -24,7 +24,7 @@ #include "ace/Hash_Map_Manager.h" #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "PG_Object_Group_Manipulator.h" ////////////////// diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index afeb6b0f0e3..224daf9c011 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -24,7 +24,7 @@ #include "PG_Operators.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index e79eee61713..105ef25e6db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/ACE.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h index 803c91fef12..6786897aa0f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h @@ -25,7 +25,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index b0946aee165..919c58f7ca5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "ace/Unbounded_Set.h" /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index ca507057adb..573430ccf66 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 8a3610bf7b4..962a9a1232a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index 0f43e24cfb6..b754df541a2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -24,7 +24,7 @@ #include "PG_MemberInfo.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/Key_Adapters.h" #include "tao/PortableServer/PortableServerC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index fd15c9ed07a..1dd180acf08 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -33,7 +33,7 @@ #include "PG_Location_Hash.h" #include "PG_Location_Equal_To.h" #include "PG_Object_Group_Manipulator.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/ACE.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 3efa0733b9b..0dcd056438c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -15,7 +15,7 @@ #define TAO_PG_OBJECT_GROUP_MANIPULATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h index 955edabcb44..881c5330403 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h @@ -23,7 +23,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/CosNamingC.h" /// Global CosNaming::Name equality operator. /** diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index a44f8f08cf3..d171ec5590a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -19,8 +19,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/CosNamingC.h" #include "portablegroup_export.h" #include "ace/Vector_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index bcb172e10ed..3d49398a974 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -24,7 +24,7 @@ #include "PG_Default_Property_Validator.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" +#include "orbsvcs/PortableGroupS.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index df3ef19c8bd..ebfdf10f3d1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -21,8 +21,8 @@ #include /**/ "ace/pre.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupS.h" -#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/PortableGroupS.h" +#include "orbsvcs/CosNamingC.h" #include "ace/Hash_Map_Manager.h" #include "ace/SString.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index f92ee4608d3..ca02b71a413 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" namespace TAO_PG diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index e06cb37338a..f919cbbbba6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -14,7 +14,7 @@ #define TAO_PORTABLEGROUP_UTILS_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h index cb517a5b7fb..dcb0e3d5a5e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h @@ -22,7 +22,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits? /// The maximum number of object groups to be managed by the diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h index a5468f224ab..f1bb0a0dadf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h @@ -23,7 +23,7 @@ #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" // Forward references class PortableGroup_Request_Dispatcher; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index 53defa5a3b8..e98a74c367d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager_T.h" #include "portablegroup_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "tao/Object_KeyC.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index e86dd663778..ecd5b159eff 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -12,8 +12,8 @@ #include "tao/target_specification.h" #include "ace/os_include/os_ctype.h" -#include "orbsvcs/orbsvcs/miopC.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/miopC.h" +#include "orbsvcs/PortableGroupC.h" ACE_RCSID (PortableGroup, UIPMC_Profile, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index 718e2189352..d36affa5d6a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -26,7 +26,7 @@ #include "tao/Object_KeyC.h" #include "tao/target_specification.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "UIPMC_Endpoint.h" #include "portablegroup_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 660ff9e4a0a..c8345528754 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -13,7 +13,7 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h" +#include "orbsvcs/Property/CosPropertyService_i.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index b1b8db89c92..0c9b289bb2b 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Property/property_export.h" +#include "orbsvcs/Property/property_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosPropertyServiceS.h" +#include "orbsvcs/CosPropertyServiceS.h" #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 5f6507cdb91..1d8f66b8315 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Runtime_Scheduler.h" #include "ace/OS_NS_string.h" #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Runtime_Scheduler.i" +#include "orbsvcs/Runtime_Scheduler.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 6c2430af091..18243c7d367 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -18,9 +18,9 @@ #define ACE_RUNTIME_SCHEDULER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/Sched/sched_export.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler { @@ -280,7 +280,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Runtime_Scheduler.i" +#include "orbsvcs/Runtime_Scheduler.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 5ea0b77669f..d4da8a87a43 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -24,7 +24,7 @@ #include "SSLIOP_Current.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #include "tao/IIOP_Connection_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index b0868330068..35c7786ddc8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -30,8 +30,8 @@ #include "SSLIOP_Connection_Handler.h" #include "SSLIOP_Accept_Strategy.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" /* CSIv1 */ -#include "orbsvcs/orbsvcs/CSIIOPC.h" /* CSIv2 */ +#include "orbsvcs/SSLIOPC.h" /* CSIv1 */ +#include "orbsvcs/CSIIOPC.h" /* CSIv2 */ namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h index aacb3c5a950..647a42edd0b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h" +#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h" +#include "orbsvcs/SSLIOP/SSLIOP_SSL.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 816b8829f44..ba933c34608 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -4,7 +4,7 @@ #include "SSLIOP_Util.h" #include "SSLIOP_X509.h" -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 1480674ab2b..89b27c15a62 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -23,7 +23,7 @@ #include "SSLIOP_X509.h" #include "SSLIOP_EVP_PKEY.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index 4a391c83497..e1d1e5778bf 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -15,16 +15,16 @@ #define TAO_SSLIOP_CREDENTIALS_ACQUIRER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h index 791dcde0da5..6918b068b0d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Export.h" +#include "orbsvcs/SSLIOP/SSLIOP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" +#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 1a201756b10..1921057cfc4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -23,7 +23,7 @@ #include "SSLIOP_Current_Impl.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #include "tao/ORB_Core.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 6ba6569f23b..5502393a62b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h" #include "tao/ORB_Core.h" #include <openssl/ssl.h> diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index 05456cc7c54..fdd3490f063 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -26,8 +26,8 @@ #include "SSLIOP_OwnCredentials.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/SecurityC.h" #include "tao/IIOP_Endpoint.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 48e4343961d..fbb32f89f96 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -4,7 +4,7 @@ #include "SSLIOP_ORBInitializer.h" #include "ace/OS_NS_strings.h" -#include "orbsvcs/orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away +#include "orbsvcs/Security/Security_ORBInitializer.h" /// @todo should go away //#include "orbsvcs/CSIIOPC.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index a80578eb718..73a16174959 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -25,8 +25,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityC.h" -#include "orbsvcs/orbsvcs/CSIIOPC.h" +#include "orbsvcs/SecurityC.h" +#include "orbsvcs/CSIIOPC.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index 45740ab8cd0..9e47848971a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index d7fe7e70c57..efa08eeb608 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -11,11 +11,11 @@ ACE_RCSID (SSLIOP, //#include "SSLIOP_IORInterceptor.h" #include "SSLIOP_CredentialsAcquirerFactory.h" -#include "orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h" -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_SecurityCurrent.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" -#include "orbsvcs/orbsvcs/CSIIOPC.h" +#include "orbsvcs/SSLIOPC.h" +#include "orbsvcs/CSIIOPC.h" #include "tao/Exception.h" #include "tao/ORBInitInfo.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 01f626a049d..544208d40b7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -22,8 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CSIIOPC.h" -#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/CSIIOPC.h" +#include "orbsvcs/SecurityC.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h index a4a7fc21cb0..e19b6659bf6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.h @@ -45,7 +45,7 @@ #include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" -#include "orbsvcs/orbsvcs/SSLIOPC.h" +#include "orbsvcs/SSLIOPC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl index 64feb29fa16..969aaad85f6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl @@ -35,7 +35,7 @@ #ifndef _SSL_ENDPOINTS_IDL_ #define _SSL_ENDPOINTS_IDL_ -#include "orbsvcs/orbsvcs/SSLIOP.idl" +#include "orbsvcs/SSLIOP.idl" // Stores information for a collection of SSLIOP endpoints. typedef sequence <SSLIOP::SSL> TAO_SSLEndpointSequence; diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 57be42611e4..a1bd57f1ae8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -4,8 +4,8 @@ // // ============================================================================ -#include "orbsvcs/orbsvcs/Time_Utilities.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Time_Utilities.h" +#include "orbsvcs/Scheduler_Factory.h" #include "Config_Scheduler.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 42500375d5b..abf9af35069 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -11,15 +11,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Event_Service_Constants.h" #include "sched_export.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) -#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h" +#include "orbsvcs/Sched/Strategy_Scheduler.h" #else -#include "orbsvcs/orbsvcs/Sched/Scheduler_Generic.h" +#include "orbsvcs/Sched/Scheduler_Generic.h" #endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */ class TAO_RTSched_Export ACE_Config_Scheduler diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index 9f2597df83f..f5e75f3118e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -22,7 +22,7 @@ #include "Reconfig_Sched_Utils.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index b407bfaf1db..225fa09960e 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -24,8 +24,8 @@ #include "ace/config-all.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/RtecSchedulerS.h" #include "sched_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h index 98b1e11baa8..4e46f2f8a63 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h @@ -23,8 +23,8 @@ #include "ace/Hash_Map_Manager.h" #include "ace/RB_Tree.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" -#include "orbsvcs/orbsvcs/RtecSchedulerS.h" +#include "orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/RtecSchedulerS.h" #include "Reconfig_Sched_Utils.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index debe5809f00..a6a16be05f2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -19,7 +19,7 @@ #define TAO_RECONFIG_SCHEDULER_T_C #include "Reconfig_Scheduler_T.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 0e0a6e2074f..87cf62c1668 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -22,8 +22,8 @@ #include /**/ "ace/pre.h" #include "sched_export.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "ace/Containers.h" ////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 26d5d0cfba0..9619eceb420 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -17,7 +17,7 @@ // ============================================================================ #include "ace/Sched_Params.h" -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #include "Scheduler.h" #include "ace/OS_NS_stdio.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index 5403d9013c6..abb37fc6cee 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -33,8 +33,8 @@ #include "ace/SString.h" #include "ace/Unbounded_Set.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/Event_Service_Constants.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Event_Service_Constants.h" #include "sched_export.h" class TAO_RTSched_Export ACE_Scheduler diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index fef9bfd0158..9b169d85ff7 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -4,13 +4,13 @@ #include "ace/Singleton.h" #include "ace/Null_Mutex.h" -#include "orbsvcs/orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h" -#include "orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h" -#include "orbsvcs/orbsvcs/Scheduler_Factory.h" +#include "orbsvcs/Runtime_Scheduler.h" +#include "orbsvcs/Sched/Reconfig_Scheduler.h" +#include "orbsvcs/Sched/Reconfig_Sched_Utils.h" +#include "orbsvcs/Scheduler_Factory.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Factory.i" +#include "orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 2cd56b8f60b..aa43e530553 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -24,9 +24,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/CosNamingC.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" -#include "orbsvcs/orbsvcs/Sched/sched_export.h" +#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_Reconfig_Scheduler_Entry; struct TAO_RT_Info_Tuple; @@ -268,7 +268,7 @@ private: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Factory.i" +#include "orbsvcs/Scheduler_Factory.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp index 5ae71bb106e..c21018bf426 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp @@ -2,10 +2,10 @@ #include "ace/OS.h" -#include "orbsvcs/orbsvcs/Scheduler_Utilities.h" +#include "orbsvcs/Scheduler_Utilities.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Utilities.i" +#include "orbsvcs/Scheduler_Utilities.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (orbsvcs, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index 745247b2ed1..beda9ed5551 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -18,13 +18,13 @@ #define ACE_SCHEDULER_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/RtecSchedulerC.h" +#include "orbsvcs/RtecSchedulerC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Sched/sched_export.h" +#include "orbsvcs/Sched/sched_export.h" class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info { @@ -61,7 +61,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Scheduler_Utilities.i" +#include "orbsvcs/Scheduler_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp index 8ae4f3bef13..c600d1c71c9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp @@ -1,7 +1,7 @@ // $Id$ #include "CSI_Utils.h" -#include "orbsvcs/orbsvcs/CSIC.h" +#include "orbsvcs/CSIC.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 7818fa3504f..eeb4bc7ddc9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index 6cf09884257..a349ef444a1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 946ec411ae2..3be591bcd38 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -15,13 +15,13 @@ #define TAO_SL3_CONTEXT_ESTABLISHMENT_POLICY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 9c77db90c02..6e593d6345d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -16,15 +16,15 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h" +#include "orbsvcs/Security/SL3_CredentialsCurator.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index b6b95a2c21a..712588d7548 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -15,13 +15,13 @@ #define TAO_SL3_CREDENTIALS_CURATOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index d35f2d51b0c..b2f7d901b26 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -16,13 +16,13 @@ #define TAO_SL3_OBJECT_CREDENTIALS_POLICY_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 9c915f90d73..2cc6f6650f1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #include "SL3_SecurityCurrent_Impl.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index fcaaa0f629c..5b0b97162ad 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "security_export.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index a7efd8cb1a1..61b615e9cbb 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -15,13 +15,13 @@ #define TAO_SL3_SECURITY_MANAGER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Security/security_export.h" +#include "orbsvcs/Security/security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index c1be7b22e78..673a5a2c952 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" #include "tao/ORB_Core.h" #include "tao/LocalObject.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index 7ffe96e6d1b..a297564e3fd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "security_export.h" -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel2C.h" namespace TAO { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index df9b15396a6..673c4debebc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Security, #include "SL3_CredentialsCurator.h" #include "SL3_SecurityManager.h" -#include "orbsvcs/orbsvcs/SecurityC.h" +#include "orbsvcs/SecurityC.h" #include "tao/ORBInitInfo.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index be257f8089c..87f0d172965 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -12,8 +12,8 @@ ACE_RCSID (Security, #include "SL3_ContextEstablishmentPolicy.h" #include "SL3_ObjectCredentialsPolicy.h" -#include "orbsvcs/orbsvcs/SecurityLevel2C.h" -#include "orbsvcs/orbsvcs/SecurityLevel3C.h" +#include "orbsvcs/SecurityLevel2C.h" +#include "orbsvcs/SecurityLevel3C.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl index 29cc213313d..c7beeefd060 100644 --- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl +++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl @@ -5,7 +5,7 @@ #ifndef _SECURITY_REPLACEABLE_IDL_ #define _SECURITY_REPLACEABLE_IDL_ -#include "orbsvcs/orbsvcs/SecurityLevel2.idl" +#include "orbsvcs/SecurityLevel2.idl" #include "tao/IOP.pidl" #pragma prefix "omg.org" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index 3e2146b3b4f..eef1f946440 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/ORB_Manager.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "TAO_UTO.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 4a5da1e566d..9b4d444b128 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -19,9 +19,9 @@ #include /**/ "ace/pre.h" #include "ace/Reactor.h" -#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h" +#include "orbsvcs/Naming/Naming_Utils.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "Timer_Helper.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index f7436e726a6..f83b3cb5701 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -18,7 +18,7 @@ #define TAO_TIME_SERVICE_SERVER_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/TimeServiceS.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 9614194039a..b705d2244d8 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -18,7 +18,7 @@ #define TAO_UTO_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #include "time_export.h" /** diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h index b38dd4eae8b..5e89f43785d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h @@ -27,7 +27,7 @@ #include "ace/Containers.h" #include "time_export.h" -#include "orbsvcs/orbsvcs/TimeServiceS.h" +#include "orbsvcs/TimeServiceS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index 8525b8d0d87..0018ea15cf2 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "orbsvcs/orbsvcs/Time_Utilities.h" +#include "orbsvcs/Time_Utilities.h" #if !defined (__ACE_INLINE__) # include "orbsvcs/orbsvcs/Time_Utilities.i" diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h index dd2f5f01793..86759d4ae66 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h @@ -18,8 +18,8 @@ #define ORBSVCS_TIME_UTILITIES_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/TimeBaseC.h" -#include "orbsvcs/orbsvcs/svc_utils_export.h" +#include "orbsvcs/TimeBaseC.h" +#include "orbsvcs/svc_utils_export.h" #include "ace/OS_NS_time.h" class TAO_Svc_Utils_Export ORBSVCS_Time @@ -69,7 +69,7 @@ public: }; #if defined (__ACE_INLINE__) -#include "orbsvcs/orbsvcs/Time_Utilities.i" +#include "orbsvcs/Time_Utilities.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 0a5d53706ef..71cb7398e55 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -19,8 +19,8 @@ #include "Constraint_Visitors.h" #include "Interpreter.h" -#include "orbsvcs/orbsvcs/CosTradingS.h" -#include "orbsvcs/orbsvcs/CosTradingReposS.h" +#include "orbsvcs/CosTradingS.h" +#include "orbsvcs/CosTradingReposS.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h index 02fbfcb48c2..6cfea41fac4 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h @@ -19,7 +19,7 @@ #include "tao/Basic_Types.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 0484d4330b5..0add8a6dc7e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -15,8 +15,8 @@ #define TAO_CONSTRAINT_VISITOR_H #include /**/ "ace/pre.h" -#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/Interpreter_Utils.h" +#include "orbsvcs/Trader/trading_export.h" #include "ace/Containers.h" class TAO_DynSequence_i; @@ -85,7 +85,7 @@ public: virtual int visit_property (TAO_Property_Constraint* literal) = 0; }; -#include "orbsvcs/orbsvcs/Trader/Constraint_Nodes.h" +#include "orbsvcs/Trader/Constraint_Nodes.h" /** * @class TAO_Constraint_Validator diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index b667227be47..ed3a4589d16 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -17,7 +17,7 @@ #include "Constraint_Nodes.h" #include "Constraint_Visitors.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_export.h" class TAO_Constraint_Evaluator; class TAO_Constraint_Validator; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index 7a8f4dcefc6..dcb1225ffa7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -21,7 +21,7 @@ #include "tao/Typecode.h" #include "tao/CORBA_String.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/Trader/trading_export.h" // = Classes to deal with the ACE_Hash_Map_Manager. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index d907b2c4850..f621f592ea9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -3,8 +3,8 @@ #ifndef TAO_INTERPRETER_UTILS_CPP #define TAO_INTERPRETER_UTILS_CPP -#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h" -#include "orbsvcs/orbsvcs/Trader/Constraint_Visitors.h" +#include "orbsvcs/Trader/Interpreter_Utils_T.h" +#include "orbsvcs/Trader/Constraint_Visitors.h" #include "tao/DynamicAny/DynSequence_i.h" template <class OPERAND_TYPE> CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index f2d907306df..bd021fc0d11 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -25,10 +25,10 @@ #include "ace/Containers.h" -#include "orbsvcs/orbsvcs/CosTradingS.h" -#include "orbsvcs/orbsvcs/CosTradingReposS.h" -#include "orbsvcs/orbsvcs/CosTradingDynamicS.h" -#include "orbsvcs/orbsvcs/Trader/trading_export.h" +#include "orbsvcs/CosTradingS.h" +#include "orbsvcs/CosTradingReposS.h" +#include "orbsvcs/CosTradingDynamicS.h" +#include "orbsvcs/Trader/trading_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index ff646edb63f..cb27e1c038f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -17,7 +17,7 @@ #include "Constraint_Visitors.h" #include "Trader.h" #include "Trader_Utils.h" -#include "orbsvcs/orbsvcs/CosTradingC.h" +#include "orbsvcs/CosTradingC.h" class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index fb86bce35f1..ff59d355062 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -24,9 +24,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/orbsvcs/IOR_Multicast.h" -#include "orbsvcs/orbsvcs/Trader/Trader.h" -#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h" +#include "orbsvcs/IOR_Multicast.h" +#include "orbsvcs/Trader/Trader.h" +#include "orbsvcs/Trader/Service_Type_Repository.h" class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader { |