diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index c40d26c3e1e..29699f8e8d5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -15,6 +15,18 @@ #define AVSTREAMS_I_H #include /**/ "ace/pre.h" +#include "AV_Core.h" + +#include "orbsvcs/AV/AV_export.h" +#include "orbsvcs/CosPropertyS.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" +#include "orbsvcs/AV/FlowSpec_Entry.h" + #include "ace/OS.h" #include "ace/SOCK_Dgram_Mcast.h" #include "ace/ATM_Addr.h" @@ -28,19 +40,11 @@ #include "ace/Svc_Handler.h" #include "ace/SOCK_Acceptor.h" -#include "orbsvcs/AV/AV_export.h" -#include "orbsvcs/CosPropertyS.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" -#include "orbsvcs/AV/FlowSpec_Entry.h" - #define FLOWSPEC_MAX 5 // for the Hash_Map helper classes. +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + typedef ACE_Hash_Map_Manager <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map; typedef ACE_Hash_Map_Entry <ACE_CString,AVStreams::FlowEndPoint_var> FlowEndPoint_Map_Entry; typedef ACE_Hash_Map_Iterator <ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> FlowEndPoint_Map_Iterator; @@ -50,7 +54,6 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> Flow_Handler_Map_Iterator; -#include "AV_Core.h" class TAO_AV_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl @@ -1518,6 +1521,7 @@ public: }; +TAO_END_VERSIONED_NAMESPACE_DECL #include "Transport.h" |