From 360eb9cc38ab03b6b4a24136243be44e90212f7e Mon Sep 17 00:00:00 2001 From: jtc Date: Tue, 14 Mar 2006 06:14:35 +0000 Subject: ChangeLogTag: Tue Mar 14 06:02:15 UTC 2006 J.T. Conklin --- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 10 +++++----- TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 8 ++++---- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp | 6 +++--- TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h | 6 +++--- TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/Flows_T.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/MCast.cpp | 6 +++--- TAO/orbsvcs/orbsvcs/AV/MCast.h | 6 +++--- TAO/orbsvcs/orbsvcs/AV/Policy.cpp | 6 +++--- TAO/orbsvcs/orbsvcs/AV/Policy.h | 2 +- TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h | 2 +- TAO/orbsvcs/orbsvcs/AV/RTCP.cpp | 12 ++++++------ TAO/orbsvcs/orbsvcs/AV/RTCP.h | 2 +- TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/RTP.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/RTP.h | 6 +++--- TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h | 2 +- TAO/orbsvcs/orbsvcs/AV/TCP.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/TCP.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/Transport.cpp | 22 +++++++++++----------- TAO/orbsvcs/orbsvcs/AV/Transport.h | 6 +++--- TAO/orbsvcs/orbsvcs/AV/UDP.cpp | 8 ++++---- TAO/orbsvcs/orbsvcs/AV/UDP.h | 4 ++-- TAO/orbsvcs/orbsvcs/AV/md5c.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/AV/media_timer.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/ntp-time.h | 2 +- TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 2 +- TAO/orbsvcs/orbsvcs/AV/sfp.h | 8 ++++---- 39 files changed, 95 insertions(+), 95 deletions(-) (limited to 'TAO/orbsvcs/orbsvcs/AV') diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 5af70a4c2aa..2b362905c3b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -14,10 +14,10 @@ // // ============================================================================ -#include "AVStreams_i.h" -#include "sfp.h" -#include "MCast.h" -#include "RTCP.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/sfp.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/RTCP.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -25,7 +25,7 @@ #include "ace/OS_NS_arpa_inet.h" #if !defined (__ACE_INLINE__) -#include "AVStreams_i.i" +#include "orbsvcs/AV/AVStreams_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (AV, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 29699f8e8d5..8e23294c9bc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -15,7 +15,7 @@ #define AVSTREAMS_I_H #include /**/ "ace/pre.h" -#include "AV_Core.h" +#include "orbsvcs/AV/AV_Core.h" #include "orbsvcs/AV/AV_export.h" #include "orbsvcs/CosPropertyS.h" @@ -1523,14 +1523,14 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#include "Transport.h" +#include "orbsvcs/AV/Transport.h" #if defined (__ACE_INLINE__) #include "tao/debug.h" -#include "AVStreams_i.i" +#include "orbsvcs/AV/AVStreams_i.i" #endif /* __ACE_INLINE__ */ -#include "Flows_T.h" +#include "orbsvcs/AV/Flows_T.h" #include /**/ "ace/post.h" #endif /* AVSTREAMS_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index e2eaa8cbb1d..4d15bdd853a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -14,7 +14,7 @@ // // ============================================================================ -#include "Endpoint_Strategy.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index ac3e46a7031..2cc9158853b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -15,7 +15,7 @@ #define TAO_AV_ENDPOINT_STRATEGY_H #include /**/ "ace/pre.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "ace/os_include/os_netdb.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -180,7 +180,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL // Include the templates here. -#include "Endpoint_Strategy_T.h" +#include "orbsvcs/AV/Endpoint_Strategy_T.h" #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 2eb84552879..b52287ef621 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP #define TAO_AV_ENDPOINT_STRATEGY_T_CPP -#include "Endpoint_Strategy_T.h" +#include "orbsvcs/AV/Endpoint_Strategy_T.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index e6b5dcebcd0..45210da5406 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -15,7 +15,7 @@ #define TAO_AV_ENDPOINT_STRATEGY_T_H #include /**/ "ace/pre.h" -#include "Endpoint_Strategy.h" +#include "orbsvcs/AV/Endpoint_Strategy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -282,7 +282,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Endpoint_Strategy_T.cpp" +#include "orbsvcs/AV/Endpoint_Strategy_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index f7d714c3b52..e7cca074af3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Fill_ACE_QoS.h" +#include "orbsvcs/AV/Fill_ACE_QoS.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 4cda527280e..496288ac71e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -4,15 +4,15 @@ // TAO_FlowSpec_Entry //------------------------------------------------------------ -#include "FlowSpec_Entry.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "FlowSpec_Entry.i" +#include "orbsvcs/AV/FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index 9dc7bc5b7ed..61ed7f1b03d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "orbsvcs/AV/AV_export.h" -#include "AV_Core.h" +#include "orbsvcs/AV/AV_Core.h" #include "ace/Addr.h" #include "ace/Containers.h" #include "ace/SString.h" @@ -350,10 +350,10 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#include "Transport.h" +#include "orbsvcs/AV/Transport.h" #if defined (__ACE_INLINE__) -#include "FlowSpec_Entry.i" +#include "orbsvcs/AV/FlowSpec_Entry.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index bfc0e147f35..c2e6683d223 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_AV_FLOWS_T_CPP #define TAO_AV_FLOWS_T_CPP -#include "Flows_T.h" +#include "orbsvcs/AV/Flows_T.h" #include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index f1381e07a50..d0810ab65e1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -15,7 +15,7 @@ #define TAO_AV_FLOWS_T_H #include /**/ "ace/pre.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -119,7 +119,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Flows_T.cpp" +#include "orbsvcs/AV/Flows_T.cpp" #endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 2de91dd1be5..5ccb9148c4f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "MCast.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "tao/debug.h" #if !defined (__ACE_INLINE__) -#include "MCast.i" +#include "orbsvcs/AV/MCast.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 1cbc12ce33c..fde288896ed 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -15,8 +15,8 @@ #define TAO_AV_MCAST_H #include /**/ "ace/pre.h" -#include "FlowSpec_Entry.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Dgram_Mcast.h" @@ -110,7 +110,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "MCast.i" +#include "orbsvcs/AV/MCast.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index 04bb9086548..0fa94820c07 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "FlowSpec_Entry.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #include "tao/debug.h" -#include "Policy.h" +#include "orbsvcs/AV/Policy.h" #if !defined(__ACE_INLINE__) -#include "Policy.i" +#include "orbsvcs/AV/Policy.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 837d6a0cf91..8380ed2a51f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -168,7 +168,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "Policy.i" +#include "orbsvcs/AV/Policy.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 26a7fa37ce9..55f5767c9ca 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index c08edb33d47..f18774d3006 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -15,8 +15,8 @@ #define TAO_AV_PROTOCOL_FACTORY_T_H #include /**/ "ace/pre.h" -#include "FlowSpec_Entry.h" -#include "Policy.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/Policy.h" #include "ace/Service_Object.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 534cc8d1ea3..19aba484619 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "QoS_UDP.h" +#include "orbsvcs/AV/QoS_UDP.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "UDP.h" +#include "orbsvcs/AV/UDP.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/MCast.h" #include "orbsvcs/AV/Fill_ACE_QoS.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index a8175a4663d..7100217f263 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -297,7 +297,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory) #if defined(__ACE_INLINE__) -#include "QoS_UDP.i" +#include "orbsvcs/AV/QoS_UDP.i" #endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index cdfb1eb1715..e0466db3a3c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -33,14 +33,14 @@ */ // $Id$ -#include "ntp-time.h" -#include "RTCP.h" -#include "media_timer.h" +#include "orbsvcs/AV/ntp-time.h" +#include "orbsvcs/AV/RTCP.h" +#include "orbsvcs/AV/media_timer.h" #include "tao/debug.h" -#include "global.h" -#include "md5.h" +#include "orbsvcs/AV/global.h" +#include "orbsvcs/AV/md5.h" -#include "RTCP_Packet.h" +#include "orbsvcs/AV/RTCP_Packet.h" #include "ace/OS_NS_time.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 931de992db6..58688376837 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -49,7 +49,7 @@ #define TAO_AV_RTCP_H #include /**/ "ace/pre.h" -#include "RTCP_Channel.h" +#include "orbsvcs/AV/RTCP_Channel.h" // FUZZ: disable check_for_math_include diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 0282f7b9abb..7011dab5371 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "RTCP_Channel.h" -#include "RTP.h" +#include "orbsvcs/AV/RTCP_Channel.h" +#include "orbsvcs/AV/RTP.h" #include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index 88e2b4c2feb..a9d717a33b0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -5,8 +5,8 @@ #include /**/ "ace/pre.h" -#include "RTP.h" -#include "RTCP_Packet.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTCP_Packet.h" #include "ace/Message_Block.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index f13410c8394..60c82eed689 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RTCP_Packet.h" -#include "RTP.h" +#include "orbsvcs/AV/RTCP_Packet.h" +#include "orbsvcs/AV/RTP.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index e12f49d0811..af251192955 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -34,8 +34,8 @@ // $Id$ -#include "RTP.h" -#include "RTCP.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/RTCP.h" #include "tao/debug.h" #include "ace/OS_NS_arpa_inet.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index e4ca31ad127..8cc883386a4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -137,9 +137,9 @@ #define MAXHDR 24 -#include "Policy.h" -#include "FlowSpec_Entry.h" -#include "MCast.h" +#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/MCast.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index f8fc425baa1..1197d709257 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "SCTP_SEQ.h" +#include "orbsvcs/AV/SCTP_SEQ.h" #if defined (ACE_HAS_SCTP) -#include "AVStreams_i.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "ace/Multihomed_INET_Addr.h" #include "tao/debug.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index a759762d0f2..4e3ec871b71 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -20,7 +20,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Service_Config.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "ace/SOCK_SEQPACK_Association.h" #include "ace/SOCK_SEQPACK_Acceptor.h" #include "ace/SOCK_SEQPACK_Connector.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index d015d42791e..24eeb1f0930 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "TCP.h" -#include "AVStreams_i.h" +#include "orbsvcs/AV/TCP.h" +#include "orbsvcs/AV/AVStreams_i.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index f83d46d175b..1f51a7329be 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -15,8 +15,8 @@ #define TAO_AV_TCP_H #include /**/ "ace/pre.h" -#include "Protocol_Factory.h" -#include "FlowSpec_Entry.h" +#include "orbsvcs/AV/Protocol_Factory.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" #include "ace/Service_Config.h" #include "ace/Svc_Handler.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 12272a5bc85..03047ef23e6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "AVStreams_i.h" -#include "sfp.h" -#include "MCast.h" -#include "RTCP.h" -#include "RTP.h" -#include "UDP.h" -#include "TCP.h" -#include "FlowSpec_Entry.h" -#include "AV_Core.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/sfp.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/RTCP.h" +#include "orbsvcs/AV/RTP.h" +#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/TCP.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/AV_Core.h" #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) -#include "QoS_UDP.h" +#include "orbsvcs/AV/QoS_UDP.h" #endif /* defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) */ #include "tao/debug.h" @@ -19,7 +19,7 @@ #include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) -#include "Transport.i" +#include "orbsvcs/AV/Transport.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 5c91622d65b..e494a20b9d4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -16,8 +16,8 @@ #include /**/ "ace/pre.h" -#include "FlowSpec_Entry.h" -#include "AV_Core.h" +#include "orbsvcs/AV/FlowSpec_Entry.h" +#include "orbsvcs/AV/AV_Core.h" #include "orbsvcs/AV/AV_export.h" @@ -338,7 +338,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Transport.i" +#include "orbsvcs/AV/Transport.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 0dde7040cf8..827079c3c90 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "UDP.h" -#include "AVStreams_i.h" -#include "MCast.h" +#include "orbsvcs/AV/UDP.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/MCast.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) -#include "UDP.i" +#include "orbsvcs/AV/UDP.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (AV, diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index 350c6b47931..f582af25ec7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "Protocol_Factory.h" +#include "orbsvcs/AV/Protocol_Factory.h" #include "ace/Service_Config.h" @@ -288,7 +288,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory) #if defined(__ACE_INLINE__) -#include "UDP.i" +#include "orbsvcs/AV/UDP.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp index ad1865f947e..aa4a99f8fb3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp @@ -25,8 +25,8 @@ documentation and/or software. /* $Id$ */ -#include "global.h" -#include "md5.h" +#include "orbsvcs/AV/global.h" +#include "orbsvcs/AV/md5.h" /* Constants for MD5Transform routine. */ diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp index b38142c2534..1a5b9cd1e42 100644 --- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp @@ -37,7 +37,7 @@ static const char rcsid[] = "@(#) $Header$"; */ -#include "media_timer.h" +#include "orbsvcs/AV/media_timer.h" #include "ace/Time_Value.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdlib.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h index f740a19ab8f..11dcd720911 100644 --- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h +++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h @@ -38,7 +38,7 @@ #define TAO_AV_NTP_TIME_H #include /**/ "ace/pre.h" -#include "RTCP.h" +#include "orbsvcs/AV/RTCP.h" /* * convert microseconds to fraction of second * 2^32 (i.e., the lsw of diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 9eb0e079d42..5a8e5318843 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "sfp.h" +#include "orbsvcs/AV/sfp.h" #include "tao/debug.h" #include "ace/ARGV.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 473d7d98580..35ab492f34f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -16,10 +16,10 @@ #include "orbsvcs/AV/AV_export.h" -#include "Policy.h" -#include "MCast.h" -#include "AVStreams_i.h" -#include "UDP.h" +#include "orbsvcs/AV/Policy.h" +#include "orbsvcs/AV/MCast.h" +#include "orbsvcs/AV/AVStreams_i.h" +#include "orbsvcs/AV/UDP.h" #include "orbsvcs/sfpC.h" -- cgit v1.2.1