summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/AV
diff options
context:
space:
mode:
authorokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
committerokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
commit56681ffa90714cf82c32e907c0f80cea75166740 (patch)
treefd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/orbsvcs/orbsvcs/AV
parent6b5e98c78a7f66029147fad41e2e75cea35854aa (diff)
downloadATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV')
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp632
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h234
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp42
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h18
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp116
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h26
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp26
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Flows_T.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp10
11 files changed, 565 insertions, 565 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index efbedd11025..4b2ef6a487e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -73,7 +73,7 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
// Empty the_spec means apply operation to all flows
void
TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
@@ -92,7 +92,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
if (this->flow_connection_map_.find (flow_name_key,
flow_connection_entry) == 0)
{
- flow_connection_entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+ flow_connection_entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -103,7 +103,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
FlowConnection_Map_Entry *entry = 0;
for (;iterator.next (entry) != 0;iterator.advance ())
{
- entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+ entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -122,7 +122,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
// Empty the_spec means apply operation to all flows
void
TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
@@ -142,7 +142,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
if (this->flow_connection_map_.find (flow_name_key,
flow_connection_entry) == 0)
{
- flow_connection_entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+ flow_connection_entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -153,7 +153,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
FlowConnection_Map_Entry *entry = 0;
for (;iterator.next (entry) != 0;iterator.advance ())
{
- entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+ entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -174,7 +174,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
void
TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
@@ -192,7 +192,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
FlowConnection_Map::ENTRY *flow_connection_entry = 0;
if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0)
{
- flow_connection_entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ flow_connection_entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -204,7 +204,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
FlowConnection_Map_Entry *entry = 0;
for (;iterator.next (entry) != 0;iterator.advance ())
{
- entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -225,7 +225,7 @@ CORBA::Boolean
TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
const AVStreams::flowSpec &/*flowspec*/
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed))
@@ -237,7 +237,7 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
// E.g., loss of flow, reestablishment of flow, etc..
void
TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (TAO_debug_level > 0)
@@ -249,7 +249,7 @@ void
TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
const char *fp_name,
const CORBA::Any &fp_settings
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::FPError))
@@ -257,7 +257,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
{
if (!CORBA::is_nil (this->sep_a_.in ()))
{
- this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
+ this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
}
@@ -265,7 +265,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
// Gets the flow connection.
CORBA::Object_ptr
TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::notSupported))
@@ -282,7 +282,7 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
void
TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
CORBA::Object_ptr flow_connection_obj
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::notSupported))
@@ -290,7 +290,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
AVStreams::FlowConnection_ptr flow_connection = AVStreams::FlowConnection::_nil ();
ACE_TRY
{
- flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj TAO_ENV_ARG_PARAMETER);
+ flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -323,7 +323,7 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
CORBA::Boolean
TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
const AVStreams::streamQoS &/* qos_spec */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -365,11 +365,11 @@ int
MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
{
CORBA::Boolean result = 0;
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
result =
- this->mmdevice_->_is_equivalent (hash_key.mmdevice_ TAO_ENV_ARG_PARAMETER);
+ this->mmdevice_->_is_equivalent (hash_key.mmdevice_ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -387,14 +387,14 @@ operator < (const MMDevice_Map_Hash_Key &left,
const MMDevice_Map_Hash_Key &right)
{
int result = 0;
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
result = left_hash < right_hash;
}
@@ -412,11 +412,11 @@ u_long
MMDevice_Map_Hash_Key::hash (void) const
{
u_long result = 0;
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
result = this->mmdevice_->_hash (this->hash_maximum_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -436,10 +436,10 @@ MMDevice_Map_Hash_Key::hash (void) const
TAO_StreamCtrl::TAO_StreamCtrl (void)
:mcastconfigif_ (0)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->streamctrl_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->streamctrl_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
char buf [BUFSIZ];
int result = ACE_OS::hostname (buf, BUFSIZ);
@@ -477,13 +477,13 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void)
// Empty the_spec means apply operation to all flows
void
TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
ACE_TRY
{
- TAO_Basic_StreamCtrl::stop (flow_spec TAO_ENV_ARG_PARAMETER);
+ TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (this->flow_connection_map_.current_size () > 0)
return;
@@ -491,13 +491,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
MMDevice_Map::ENTRY *entry = 0;
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
- entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
{
- entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -514,13 +514,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
// Empty the_spec means apply operation to all flows
void
TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
ACE_TRY
{
- TAO_Basic_StreamCtrl::start (flow_spec TAO_ENV_ARG_PARAMETER);
+ TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (this->flow_connection_map_.current_size () > 0)
return;
@@ -529,13 +529,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
MMDevice_Map::ENTRY *entry = 0;
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
- entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
{
- entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -553,13 +553,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
// Empty the_spec means apply operation to all flows
void
TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
ACE_TRY
{
- TAO_Basic_StreamCtrl::destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+ TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (this->flow_connection_map_.current_size () > 0)
return;
@@ -568,13 +568,13 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
MMDevice_Map::ENTRY *entry = 0;
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
- entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
{
- entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -600,7 +600,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
AVStreams::MMDevice_ptr b_party,
AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -649,7 +649,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
met_qos,
named_vdev.inout (),
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0)
@@ -659,21 +659,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
streamctrl_any <<= this->streamctrl_.in ();
this->sep_a_->define_property ("Related_StreamCtrl",
streamctrl_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Any vdev_a_any;
vdev_a_any <<= this->vdev_a_.in ();
this->sep_a_->define_property ("Related_VDev",
vdev_a_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Any streamendpoint_a_any;
streamendpoint_a_any <<= this->sep_a_.in ();
this->vdev_a_->define_property ("Related_StreamEndpoint",
streamendpoint_a_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -681,7 +681,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
mmdevice_a_any <<= a_party;
this->vdev_a_->define_property ("Related_MMDevice",
mmdevice_a_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// add the mmdevice, sep and vdev to the map.
@@ -720,7 +720,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
met_qos,
named_vdev.inout (),
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
@@ -728,28 +728,28 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
"\n(%P|%t)stream_endpoint_b_ = %s",
TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()
- TAO_ENV_ARG_PARAMETER)));
+ ACE_ENV_ARG_PARAMETER)));
ACE_TRY_CHECK;
// Define ourselves as the related_streamctrl property of the sep.
CORBA::Any streamctrl_any;
streamctrl_any <<= this->streamctrl_.in ();
this->sep_b_->define_property ("Related_StreamCtrl",
streamctrl_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Any vdev_b_any;
vdev_b_any <<= this->vdev_b_.in ();
this->sep_b_->define_property ("Related_VDev",
vdev_b_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Any streamendpoint_b_any;
streamendpoint_b_any <<= this->sep_b_.in ();
this->vdev_b_->define_property ("Related_StreamEndpoint",
streamendpoint_b_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -757,7 +757,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
mmdevice_b_any <<= b_party;
this->vdev_b_->define_property ("Related_MMDevice",
mmdevice_b_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// add the mmdevice, sep and vdev to the map.
MMDevice_Map_Entry map_entry;
@@ -783,12 +783,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
sep_b_peer_any <<= this->sep_a_.in();
this->sep_a_->define_property ("PeerAdapter",
sep_a_peer_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->sep_b_->define_property ("PeerAdapter",
sep_b_peer_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -801,20 +801,20 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
ACE_TRY_EX (set_source_id)
{
CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (set_source_id);
AVStreams::flowSpec_var flows;
*flows_any >>= flows.out ();
for (u_int i=0; i< flows->length ();i++)
{
CORBA::Object_var fep_obj =
- this->sep_a_->get_fep (flows [i] TAO_ENV_ARG_PARAMETER);
+ this->sep_a_->get_fep (flows [i] ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (set_source_id);
ACE_TRY_EX (producer_check)
{
AVStreams::FlowProducer_var producer =
AVStreams::FlowProducer::_narrow (fep_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (producer_check);
producer->set_source_id (this->source_id_++);
}
@@ -839,7 +839,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
// the streamctrl has to give an array of source ids to
// the sep.
this->sep_a_->set_source_id (this->source_id_++
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_ENDTRY;
@@ -850,7 +850,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
TAO_MCastConfigIf,
0);
// @@: Deactivating the object thru poa means calling remove_ref after _this.
- this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
// Multicast source being added.
@@ -858,7 +858,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->mcastconfigif_ptr_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
if (!result)
ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0);
}
@@ -873,7 +873,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->mcastconfigif_->set_peer (this->vdev_b_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -885,7 +885,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (connect_leaf);
connect_leaf_success = 1;
}
@@ -905,9 +905,9 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n"));
AVStreams::flowSpec connect_flows = the_flows;
- this->sep_a_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER);
+ this->sep_a_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- this->sep_b_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER);
+ this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -921,14 +921,14 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->vdev_b_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->vdev_b_->set_peer (this->streamctrl_.in (),
this->vdev_a_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -938,7 +938,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->sep_a_->connect (this->sep_b_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0);
@@ -951,7 +951,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->sep_b_.in (),
the_qos,
the_flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -973,7 +973,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
AVStreams::StreamEndPoint_B_ptr sep_b,
AVStreams::streamQoS &stream_qos,
const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -997,24 +997,24 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
sep_any <<= sep_b;
sep_a->define_property ("PeerAdapter",
sep_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
sep_any <<= sep_a;
sep_b->define_property ("PeerAdapter",
sep_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// since its full profile we do the viable stream setup algorithm.
// get the flows for the A streamendpoint.
// the flows spec is empty and hence we do a exhaustive match.
AVStreams::flowSpec a_flows, b_flows;
CORBA::Any_var flows_any;
- flows_any = sep_a->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER);
+ flows_any = sep_a->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::flowSpec *temp_flows;
flows_any.in () >>= temp_flows;
a_flows = *temp_flows;
- flows_any = sep_b->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER);
+ flows_any = sep_b->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
flows_any.in () >>= temp_flows;
b_flows = *temp_flows;
@@ -1033,11 +1033,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
// get the flowendpoint references.
CORBA::Object_var fep_obj =
sep_a->get_fep (flowname
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::FlowEndPoint_ptr fep =
AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_CString fep_key (flowname);
result = a_fep_map->bind (fep_key, fep);
@@ -1051,11 +1051,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
// get the flowendpoint references.
CORBA::Object_var fep_obj =
sep_b->get_fep (flowname
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::FlowEndPoint_ptr fep =
AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_CString fep_key (flowname);
result = b_fep_map->bind (fep_key, fep);
@@ -1119,7 +1119,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
{
AVStreams::FlowEndPoint_ptr fep_a = a_feps_entry->int_id_;
AVStreams::FlowEndPoint_var connected_to =
- fep_a->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER);
+ fep_a->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connect);
if (!CORBA::is_nil (connected_to.in ()))
@@ -1136,7 +1136,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
AVStreams::FlowConnection_var flow_connection;
AVStreams::FlowEndPoint_var connected_to =
- fep_b->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER);
+ fep_b->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connect);
if (!CORBA::is_nil (connected_to.in ()))
@@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
}
if (fep_a->is_fep_compatible (fep_b
- TAO_ENV_ARG_PARAMETER) == 1)
+ ACE_ENV_ARG_PARAMETER) == 1)
{
ACE_TRY_CHECK_EX (flow_connect);
// assume that flow names are same so that we
@@ -1154,7 +1154,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
CORBA::Object_var flow_connection_obj;
CORBA::Any_var flowname_any =
fep_a->get_property_value ("Flow"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connect);
const char *flowname = 0;
flowname_any.in () >>= flowname;
@@ -1162,11 +1162,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
{
flow_connection_obj =
this->get_flow_connection (flowname
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connection);
flow_connection =
AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connection);
}
ACE_CATCHANY
@@ -1175,11 +1175,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
ACE_NEW_RETURN (flowConnection,
TAO_FlowConnection,
0);
- flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connect);
this->set_flow_connection (flowname,
flow_connection.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connect);
}
ACE_ENDTRY;
@@ -1198,11 +1198,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
{
producer =
AVStreams::FlowProducer::_narrow (fep_a
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (producer_check);
consumer =
AVStreams::FlowConsumer::_narrow (fep_b
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (producer_check);
// If the types don't match then try in
@@ -1211,11 +1211,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
{
producer =
AVStreams::FlowProducer::_narrow (fep_b
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (producer_check);
consumer =
AVStreams::FlowConsumer::_narrow (fep_a
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (producer_check);
}
// At this point they should both be
@@ -1234,12 +1234,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
ACE_CHECK_RETURN (0);
CORBA::String_var fep_a_name, fep_b_name;
flowname_any = fep_a->get_property_value ("FlowName"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
const char *temp_name;
flowname_any.in () >>= temp_name;
fep_a_name = CORBA::string_dup (temp_name);
flowname_any = fep_b->get_property_value ("FlowName"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
flowname_any.in () >>= temp_name;
fep_b_name = CORBA::string_dup (temp_name);
AVStreams::QoS flow_qos;
@@ -1258,7 +1258,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
flow_connection->connect (producer.in (),
consumer.in (),
flow_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connect);
}
}
@@ -1280,7 +1280,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
this->sep_a_->connect (this->sep_b_.in (),
stream_qos,
flow_spec
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_ENDTRY;
@@ -1289,7 +1289,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
}
void
-TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed))
{
@@ -1305,13 +1305,13 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
MMDevice_Map::ENTRY *entry = 0;
for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
{
- entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
{
- entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+ entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -1327,7 +1327,7 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
void
TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
const AVStreams::flowSpec &/* the_spec */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow))
@@ -1337,7 +1337,7 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
void
TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
const AVStreams::flowSpec & /* the_spec */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow))
@@ -1347,7 +1347,7 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
AVStreams::VDev_ptr
TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
AVStreams::StreamEndPoint_out sep
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed))
{
@@ -1369,7 +1369,7 @@ CORBA::Boolean
TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed))
@@ -1438,13 +1438,13 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
if (in_flowspec.length () != 0)
{
- this->vdev_a_->modify_QoS (new_qos, in_flowspec TAO_ENV_ARG_PARAMETER);
+ this->vdev_a_->modify_QoS (new_qos, in_flowspec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
if (out_flowspec.length () != 0)
{
- this->vdev_b_->modify_QoS (new_qos, out_flowspec TAO_ENV_ARG_PARAMETER);
+ this->vdev_b_->modify_QoS (new_qos, out_flowspec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -1479,7 +1479,7 @@ CORBA::Boolean
TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
AVStreams::streamQoS & qos,
const AVStreams::flowSpec & flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed,
AVStreams::streamOpFailed))
@@ -1490,7 +1490,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
ACE_NEW_RETURN (info,
Peer_Info,
0);
- info->peer_ = AVStreams::VDev::_narrow (peer TAO_ENV_ARG_PARAMETER);
+ info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
info->qos_ = qos;
info->flow_spec_ = flow_spec;
@@ -1509,7 +1509,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
// In future this should be a multicast message instead of point-to-point unicasts.
void
TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
Peer_Info *info;
@@ -1519,7 +1519,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
(info = this->peer_list_iterator_.next ()) != 0;
this->peer_list_iterator_.advance ())
{
- info->peer_->configure (a_configuration TAO_ENV_ARG_PARAMETER);
+ info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -1535,7 +1535,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
void
TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->initial_configuration_ = initial;
@@ -1545,7 +1545,7 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti
void
TAO_MCastConfigIf::set_format (const char * flowName,
const char * format_name
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported))
{
@@ -1558,7 +1558,7 @@ TAO_MCastConfigIf::set_format (const char * flowName,
{
if (this->in_flowSpec (info->flow_spec_, flowName))
{
- info->peer_->set_format (flowName, format_name TAO_ENV_ARG_PARAMETER);
+ info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -1576,7 +1576,7 @@ TAO_MCastConfigIf::set_format (const char * flowName,
void
TAO_MCastConfigIf::set_dev_params (const char * flowName,
const CosPropertyService::Properties & new_params
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed))
@@ -1591,7 +1591,7 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
{
if (this->in_flowSpec (info->flow_spec_, flowName))
{
- info->peer_->set_dev_params (flowName, new_params TAO_ENV_ARG_PARAMETER);
+ info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -1650,21 +1650,21 @@ TAO_Base_StreamEndPoint::handle_open (void)
int
TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
return 0;
}
int
TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
return 0;
}
int
TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
return 0;
}
@@ -1686,7 +1686,7 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &)
// The following function is for backward compatibility.
CORBA::Boolean
TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
return 1;
}
@@ -1758,7 +1758,7 @@ CORBA::Boolean
TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
AVStreams::streamQoS &qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -1784,7 +1784,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
CORBA::Boolean result =
this->negotiator_->negotiate (peer_negotiator,
qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (negotiate);
if (!result)
if (TAO_debug_level > 0)
@@ -1805,7 +1805,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
{
// choose protocols based on what the remote endpoint can support.
CORBA::Any_var protocols_any =
- responder->get_property_value ("AvailableProtocols" TAO_ENV_ARG_PARAMETER);
+ responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (available_protocols);
AVStreams::protocolSpec peer_protocols;
AVStreams::protocolSpec *temp_protocols;
@@ -1884,14 +1884,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0);
- AVStreams::StreamEndPoint_var streamendpoint = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
retv = responder->request_connection (streamendpoint.in (),
0,
network_qos,
flow_spec
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0)
@@ -1959,12 +1959,12 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos,
void
TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
// Make the upcall into the app
- this->handle_stop (flow_spec TAO_ENV_ARG_PARAMETER);
+ this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (flow_spec.length () > 0)
@@ -2007,13 +2007,13 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
// Empty the_spec --> apply to all flows
void
TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
// Make the upcall into the app
- this->handle_start (flow_spec TAO_ENV_ARG_PARAMETER);
+ this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (flow_spec.length () > 0)
@@ -2098,12 +2098,12 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
// Close the connection
void
TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow))
{
CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
CORBA::Any_var mc_str_any;
CORBA::Object_var mc_obj;
AVStreams::VDev_ptr vdev;
@@ -2112,10 +2112,10 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
const char *media_ctrl_str;
vdev_any.in() >>= vdev;
mc_str_any = vdev->get_property_value ("Related_MediaCtrl"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
mc_str_any.in() >>= media_ctrl_str;
mc_obj = TAO_AV_CORE::instance()->orb()->string_to_object (media_ctrl_str
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
media_ctrl = Null_MediaCtrl::_narrow (mc_obj.in());
// deactivate the associated vdev and media ctrl
@@ -2210,7 +2210,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
}
// Make the upcall into the app
- // this->handle_destroy (the_spec TAO_ENV_ARG_PARAMETER);
+ // this->handle_destroy (the_spec ACE_ENV_ARG_PARAMETER);
//
}
@@ -2221,7 +2221,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
CORBA::Boolean /*is_mcast*/,
AVStreams::streamQoS &qos,
AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpDenied,
AVStreams::noSuchFlow,
@@ -2293,7 +2293,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
return 0;
// Make the upcall to the app
- result = this->handle_connection_requested (flow_spec TAO_ENV_ARG_PARAMETER);
+ result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -2310,7 +2310,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
int
TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
@@ -2347,7 +2347,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
CORBA::Boolean
TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed))
@@ -2356,7 +2356,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
ACE_DEBUG ((LM_DEBUG,
"TAO_StreamEndPoint::modify_QoS\n"));
- int result = this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER);
+ int result = this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
if (result != 0)
@@ -2370,7 +2370,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
CORBA::Boolean
TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -2380,7 +2380,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
protocol_restriction_any <<= protocols;
this->define_property ("ProtocolRestriction",
protocol_restriction_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->protocols_ = protocols;
}
@@ -2397,7 +2397,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
void
TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::streamOpFailed))
@@ -2411,7 +2411,7 @@ void
TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
const char *fp_name,
const CORBA::Any &fp_settings
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::FPError))
@@ -2425,7 +2425,7 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
CORBA::Object_ptr
TAO_StreamEndPoint::get_fep (const char *flow_name
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::noSuchFlow))
@@ -2439,7 +2439,7 @@ TAO_StreamEndPoint::get_fep (const char *flow_name
char*
TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed))
@@ -2461,7 +2461,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
flowname_any <<= flow_name.in ();
fep->define_property ("Flow",
flowname_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -2476,7 +2476,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
char*
TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed))
@@ -2485,7 +2485,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
ACE_TRY
{
CORBA::Any_var flow_name_any =
- fep->get_property_value ("FlowName" TAO_ENV_ARG_PARAMETER);
+ fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
const char *tmp;
@@ -2495,7 +2495,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
ACE_CATCHANY
{
flow_name =
- this->add_fep_i_add_property (fep TAO_ENV_ARG_PARAMETER);
+ this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
ACE_ENDTRY;
@@ -2504,22 +2504,22 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
char *
TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed))
{
AVStreams::FlowEndPoint_var fep =
- AVStreams::FlowEndPoint::_narrow (fep_obj TAO_ENV_ARG_PARAMETER);
+ AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
CORBA::String_var flow_name =
- this->add_fep_i (fep.in () TAO_ENV_ARG_PARAMETER);
+ this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
ACE_TRY
{
- fep->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+ fep->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Add it to the sequence of flowNames supported.
// put the flowname and the flowendpoint in a hashtable.
@@ -2537,7 +2537,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
flows_any <<= this->flows_;
this->define_property ("Flows",
flows_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -2552,7 +2552,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
void
TAO_StreamEndPoint::remove_fep (const char *flow_name
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed))
@@ -2575,7 +2575,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
this->flows_ = new_flows;
this->define_property ("Flows",
flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -2589,7 +2589,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
// Sets the negotiator object.
void
TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -2598,7 +2598,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
negotiator <<= new_negotiator;
this->define_property ("Negotiator",
negotiator
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator);
}
@@ -2615,7 +2615,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
void
TAO_StreamEndPoint::set_key (const char *flow_name,
const AVStreams::key & the_key
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -2627,7 +2627,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name);
this->define_property (PublicKey_property,
PublicKey
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -2641,7 +2641,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
// Set the source id.
void
TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->source_id_ = source_id;
@@ -2650,7 +2650,7 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
CORBA::Boolean
TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
AVStreams::flowSpec &/*flow_spec*/
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
@@ -2701,7 +2701,7 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
CORBA::Boolean
TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -2738,7 +2738,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
if (result < 0)
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ()));
// Narrow it to FlowProducer.
- AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint TAO_ENV_ARG_PARAMETER);
+ AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (narrow);
// Else narrow succeeeded.
if (!CORBA::is_nil (producer.in ()))
@@ -2750,7 +2750,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
{
CORBA::Any_var streamctrl_any;
streamctrl_any = this->get_property_value ("Related_StreamCtrl"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
streamctrl_any.in () >>= streamctrl;
@@ -2759,10 +2759,10 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
CORBA::Object_var flow_connection_obj =
this->streamctrl_->get_flow_connection (forward_entry->flowname ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connection);
flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connection);
}
ACE_CATCHANY
@@ -2775,11 +2775,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
flowConnection->set_mcast_addr (this->mcast_addr_, this->mcast_port_);
this->mcast_port_++;
flowConnection->set_protocol (forward_entry->carrier_protocol_str ());
- flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
this->streamctrl_->set_flow_connection (forward_entry->flowname (),
flow_connection.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_ENDTRY;
@@ -2789,12 +2789,12 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
CORBA::Any fp_settings;
flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (),
fp_settings
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
result = flow_connection->add_producer (producer.in (),
flow_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0);
@@ -2894,7 +2894,7 @@ CORBA::Boolean
TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
AVStreams::streamQoS & /* the_qos */,
const AVStreams::flowSpec & /* the_flows */
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -2908,7 +2908,7 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */
void
TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
const AVStreams::flowSpec & /* theSpec */
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
@@ -2937,7 +2937,7 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
CORBA::Boolean
TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -2963,7 +2963,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
AVStreams::FlowConsumer_var consumer;
ACE_TRY_EX (narrow)
{
- consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () TAO_ENV_ARG_PARAMETER);
+ consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (narrow);
}
ACE_CATCHANY
@@ -2984,7 +2984,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
{
CORBA::Any_var streamctrl_any;
streamctrl_any = this->get_property_value ("Related_StreamCtrl"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::StreamCtrl_ptr streamctrl;
streamctrl_any.in () >>= streamctrl;
@@ -2992,10 +2992,10 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
}
CORBA::Object_var flow_connection_obj =
this->streamctrl_->get_flow_connection (forward_entry->flowname ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connection);
flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_connection);
}
ACE_CATCHANY
@@ -3007,7 +3007,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
ACE_CHECK_RETURN (0);
result = flow_connection->add_consumer (consumer.in (),
flow_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (result == 0)
ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0);
@@ -3089,7 +3089,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
AVStreams::VDev_ptr the_peer_dev,
AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -3105,7 +3105,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called"));
CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -3117,7 +3117,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
anyval <<= ior.in ();
this->define_property ("Related_VDev",
anyval
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -3127,7 +3127,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
CORBA::Any_var anyptr;
const char *media_ctrl_ior;
anyptr = this->peer_->get_property_value ("Related_MediaCtrl"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
anyptr.in () >>= media_ctrl_ior;
@@ -3136,10 +3136,10 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
media_ctrl_ior));
CORBA::Object_ptr media_ctrl_obj =
TAO_ORB_Core_instance ()->orb ()->string_to_object
- (media_ctrl_ior TAO_ENV_ARG_PARAMETER);
+ (media_ctrl_ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- result = this->set_media_ctrl (media_ctrl_obj TAO_ENV_ARG_PARAMETER);
+ result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3154,7 +3154,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
CORBA::Boolean
TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
// ACE_UNUSED_ARG (media_ctrl);
@@ -3175,7 +3175,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
AVStreams::MCastConfigIf_ptr mcast_peer,
AVStreams::streamQoS &/* the_qos */,
const AVStreams::flowSpec &/* the_spec */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -3188,7 +3188,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
// applications should override this to handle configuration changes.
void
TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed))
@@ -3199,7 +3199,7 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
void
TAO_VDev::set_format (const char *flowName,
const char *format_name
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported))
{
@@ -3213,7 +3213,7 @@ TAO_VDev::set_format (const char *flowName,
format <<= format_name;
this->define_property (format_property,
format
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3230,7 +3230,7 @@ TAO_VDev::set_format (const char *flowName,
void
TAO_VDev::set_dev_params (const char *flowName,
const CosPropertyService::Properties &new_params
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed))
@@ -3245,7 +3245,7 @@ TAO_VDev::set_dev_params (const char *flowName,
devParams <<= new_params;
this->define_property (devParams_property,
devParams
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3262,7 +3262,7 @@ TAO_VDev::set_dev_params (const char *flowName,
CORBA::Boolean
TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &flowspec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed))
@@ -3282,13 +3282,13 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
CORBA::Any_ptr streamendpoint_a_any =
this->get_property_value ("Related_StreamEndpoint"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
*streamendpoint_a_any >>= sep_a;
if (sep_a != 0)
{
- sep_a->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER);
+ sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
else ACE_DEBUG ((LM_DEBUG,
@@ -3300,10 +3300,10 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
CORBA::Any_ptr streamendpoint_b_any =
this->get_property_value ("Related_StreamEndpoint"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
*streamendpoint_b_any >>= sep_b;
- sep_b->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER);
+ sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
}
@@ -3334,7 +3334,7 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
AVStreams::streamQoS &the_qos,
CORBA::Boolean_out is_met,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -3347,15 +3347,15 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
ACE_NEW_RETURN (this->stream_ctrl_,
TAO_StreamCtrl,
0);
- AVStreams::MMDevice_var mmdevice = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ AVStreams::MMDevice_var mmdevice = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
this->stream_ctrl_->bind_devs (peer_device,
mmdevice.in (),
the_qos,
the_spec
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- streamctrl = this->stream_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ streamctrl = this->stream_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3374,7 +3374,7 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
AVStreams::streamQoS &the_qos,
CORBA::Boolean_out is_met,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -3397,7 +3397,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
CORBA::Boolean_out met_qos,
char *&/*named_vdev*/,
const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ());
AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ());
@@ -3410,7 +3410,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
{
if (this->endpoint_strategy_->create_A (sep_a,
the_vdev
- TAO_ENV_ARG_PARAMETER) == -1)
+ ACE_ENV_ARG_PARAMETER) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"TAO_MMDevice::create_A_B (%P|%t) - "
"error in create_A\n"),
@@ -3422,7 +3422,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
{
if (this->endpoint_strategy_->create_B (sep_b,
the_vdev
- TAO_ENV_ARG_PARAMETER) == -1)
+ ACE_ENV_ARG_PARAMETER) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"TAO_MMDevice::create_A_B (%P|%t) - "
"error in create_B\n"),
@@ -3451,12 +3451,12 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
{
// Get the flowconnection for this flow.
CORBA::Object_var flowconnection_obj =
- streamctrl->get_flow_connection (forward_entry.flowname () TAO_ENV_ARG_PARAMETER);
+ streamctrl->get_flow_connection (forward_entry.flowname () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flowconnection);
if (!CORBA::is_nil (flowconnection_obj.in ()))
{
flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flowconnection);
}
}
@@ -3494,7 +3494,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
flow_qos,
met_qos,
named_fdev.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
break;
case MMDEVICE_B:
@@ -3504,7 +3504,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
flow_qos,
met_qos,
named_fdev.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
break;
}
@@ -3525,7 +3525,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
flow_qos,
met_qos,
named_fdev.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
break;
case MMDEVICE_B:
@@ -3538,7 +3538,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
flow_qos,
met_qos,
named_fdev.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
break;
}
@@ -3550,10 +3550,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
}
CORBA::Any flowname_any;
flowname_any <<= forward_entry.flowname ();
- flow_endpoint->define_property ("FlowName", flowname_any TAO_ENV_ARG_PARAMETER);
+ flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
sep->add_fep (flow_endpoint.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -3575,7 +3575,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
CORBA::Boolean_out met_qos,
char *&named_vdev,
const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -3584,16 +3584,16 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
AVStreams::noSuchFlow))
{
CORBA::String_var str_ctrl_ior =
- TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl TAO_ENV_ARG_PARAMETER);
+ TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
AVStreams::StreamEndPoint_A_ptr sep_a = 0;
AVStreams::StreamEndPoint_var sep;
ACE_TRY
{
- sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER);
+ sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() TAO_ENV_ARG_PARAMETER);
+ sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3614,7 +3614,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
CORBA::Boolean_out met_qos,
char *&named_vdev,
const AVStreams::flowSpec &flow_spec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -3627,9 +3627,9 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
ACE_TRY
{
- sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER);
+ sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() TAO_ENV_ARG_PARAMETER);
+ sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3647,7 +3647,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
void
TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
const char * /* vdev_name */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported))
{
@@ -3661,7 +3661,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
char *
TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed))
@@ -3679,7 +3679,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
ACE_OS::sprintf (tmp, "flow%d", flow_num_++);
CORBA::Any flowname_any;
flowname_any <<= flow_name.in ();
- fdev->define_property ("Flow", flowname_any TAO_ENV_ARG_PARAMETER);
+ fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3694,7 +3694,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
// Adds the fdev object to the MMDevice.
char *
TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed))
@@ -3704,14 +3704,14 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
ACE_TRY_EX (flow_name)
{
CORBA::Any_ptr flow_name_any;
- fdev = AVStreams::FDev::_narrow (fdev_obj TAO_ENV_ARG_PARAMETER);
+ fdev = AVStreams::FDev::_narrow (fdev_obj ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_name);
if (CORBA::is_nil (fdev.in ()))
return 0;
- flow_name_any = fdev->get_property_value ("Flow" TAO_ENV_ARG_PARAMETER);
+ flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flow_name);
const char *tmp;
@@ -3721,7 +3721,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
ACE_CATCHANY
{
flow_name =
- this->add_fdev_i (fdev.in () TAO_ENV_ARG_PARAMETER);
+ this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
ACE_ENDTRY;
@@ -3746,7 +3746,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
{
this->define_property ("Flows",
flows_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (flows);
}
ACE_CATCHANY
@@ -3762,7 +3762,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
// Gets the FDev object associated with this flow.
CORBA::Object_ptr
TAO_MMDevice::get_fdev (const char *flow_name
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::noSuchFlow))
@@ -3779,7 +3779,7 @@ TAO_MMDevice::get_fdev (const char *flow_name
// Removes the fdev from this MMDevice.
void
TAO_MMDevice::remove_fdev (const char *flow_name
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::noSuchFlow,
@@ -3806,7 +3806,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name
this->flows_ = new_flows;
this->define_property ("Flows",
flows
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -3862,7 +3862,7 @@ TAO_FlowConnection::set_protocol (const char *protocol)
// stop this flow.
void
-TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -3873,7 +3873,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
this->flow_producer_set_.end ();
producer_begin != producer_end; ++producer_begin)
{
- (*producer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+ (*producer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3882,7 +3882,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
this->flow_consumer_set_.end ();
consumer_begin != consumer_end; ++consumer_begin)
{
- (*consumer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+ (*consumer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -3897,7 +3897,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
// start this flow.
void
-TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -3908,7 +3908,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
this->flow_consumer_set_.end ();
consumer_begin != consumer_end; ++consumer_begin)
{
- (*consumer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+ (*consumer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
@@ -3917,7 +3917,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
this->flow_producer_set_.end ();
producer_begin != producer_end; ++producer_begin)
{
- (*producer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+ (*producer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -3932,7 +3932,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
// destroy this flow.
void
-TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -3943,7 +3943,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
this->flow_producer_set_.end ();
producer_begin != producer_end; ++producer_begin)
{
- (*producer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ (*producer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3952,7 +3952,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
this->flow_consumer_set_.end ();
consumer_begin != consumer_end; ++consumer_begin)
{
- (*consumer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ (*consumer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -3971,7 +3971,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
// modify the QoS for this flow.
CORBA::Boolean
TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed))
{
@@ -3984,7 +3984,7 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
CORBA::Boolean
TAO_FlowConnection::use_flow_protocol (const char * fp_name,
const CORBA::Any & fp_settings
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::FPError,
AVStreams::notSupported))
@@ -3998,7 +3998,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
producer_begin != producer_end; ++producer_begin)
{
(*producer_begin)->use_flow_protocol
- (fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
+ (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -4008,7 +4008,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
consumer_begin != consumer_end; ++consumer_begin)
{
(*consumer_begin)->use_flow_protocol
- (fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
+ (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
return 1;
@@ -4016,7 +4016,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
void
TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_UNUSED_ARG (the_event);
@@ -4026,7 +4026,7 @@ CORBA::Boolean
TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
AVStreams::FDev_ptr b_party,
AVStreams::QoS & flow_qos
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -4035,7 +4035,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
CORBA::Boolean result = 0;
ACE_TRY
{
- AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Boolean met_qos;
CORBA::String_var named_fdev ((const char *)"");
@@ -4044,19 +4044,19 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
flow_qos,
met_qos,
named_fdev.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::FlowConsumer_var consumer =
b_party->create_consumer (flowconnection.in (),
flow_qos,
met_qos,
named_fdev.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
result = this->connect (producer.in (),
consumer.in (),
flow_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4074,7 +4074,7 @@ CORBA::Boolean
TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
AVStreams::FlowConsumer_ptr consumer,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::formatMismatch,
AVStreams::FEPMismatch,
@@ -4091,19 +4091,19 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
this->flow_producer_set_.insert (flow_producer);
this->flow_consumer_set_.insert (flow_consumer);
AVStreams::FlowConnection_var flowconnection =
- this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
flow_producer->set_peer (flowconnection.in (),
flow_consumer,
the_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
flow_consumer->set_peer (flowconnection.in (),
flow_producer,
the_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
char *consumer_address =
@@ -4111,7 +4111,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
0, // false for is_mcast
flow_producer,
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (ACE_OS::strcmp (consumer_address, "") == 0)
@@ -4121,12 +4121,12 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
0, // false for is_mcast
flow_consumer,
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
flow_consumer->connect_to_peer (the_qos,
consumer_address,
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// @@ Naga: We have to find means to set the reverse channel for the producer.
// Its broken in the point-to_point case for UDP.
@@ -4137,7 +4137,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
flow_producer->connect_to_peer (the_qos,
consumer_address,
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -4152,7 +4152,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
CORBA::Boolean
-TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_CHECK_RETURN (0);
@@ -4162,7 +4162,7 @@ TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL)
CORBA::Boolean
TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::alreadyConnected,
AVStreams::notSupported))
@@ -4181,7 +4181,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
for (; begin != end; ++begin)
{
if ((*begin)->_is_equivalent (producer
- TAO_ENV_ARG_PARAMETER))
+ ACE_ENV_ARG_PARAMETER))
// producer exists in the set, a duplicate.
ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1);
}
@@ -4216,7 +4216,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
met_qos,
mcast_address,
this->fp_name_.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (this->producer_address_.in () == 0)
@@ -4239,15 +4239,15 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
ACE_NEW_RETURN (this->mcastconfigif_i_,
TAO_MCastConfigIf,
0);
- this->mcastconfigif_ = this->mcastconfigif_i_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
- AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
flow_producer->set_Mcast_peer (flowconnection.in (),
this->mcastconfigif_.in (),
the_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4263,7 +4263,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
CORBA::Boolean
TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::alreadyConnected))
{
@@ -4276,7 +4276,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
for (; begin != end; ++begin)
{
if ((*begin)->_is_equivalent (consumer
- TAO_ENV_ARG_PARAMETER))
+ ACE_ENV_ARG_PARAMETER))
// Consumer exists in the set, a duplicate.
ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1);
}
@@ -4301,21 +4301,21 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
if (!this->ip_multicast_)
{
flow_consumer->set_protocol_restriction (protocols
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
char * address =
flow_consumer->go_to_listen (the_qos,
1,
flow_producer,
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Boolean is_met;
flow_producer->connect_mcast (the_qos,
is_met,
address,
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
else
@@ -4328,14 +4328,14 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
flow_consumer->connect_to_peer (the_qos,
this->producer_address_.in (),
this->fp_name_.inout ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
// char * address =
// flow_consumer->go_to_listen (the_qos,
// 1,
// flow_producer,
// this->fp_name_.inout ()
- // TAO_ENV_ARG_PARAMETER);
+ // ACE_ENV_ARG_PARAMETER);
// ACE_TRY_CHECK;
}
@@ -4349,7 +4349,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
this->mcastconfigif_->set_peer (flow_consumer,
stream_qos,
flow_spec
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4364,7 +4364,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
CORBA::Boolean
TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notConnected))
{
@@ -4405,17 +4405,17 @@ TAO_FlowEndPoint::open (const char *flowname,
this->format_ = format;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CORBA::Any flowname_any;
flowname_any <<= flowname;
this->define_property ("Flow",
flowname_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->set_format (format
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->protocol_addresses_ = protocols;
AVStreams::protocolSpec protocol_spec (protocols.length ());
@@ -4429,7 +4429,7 @@ TAO_FlowEndPoint::open (const char *flowname,
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ()));
}
this->set_protocol_restriction (protocol_spec
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4453,7 +4453,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
// used by one flowconnection so that multiple connections cant use
// the same flowendpoint.
CORBA::Boolean
-TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// lock the current flowendpoint
@@ -4467,7 +4467,7 @@ TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL)
// unlocks the flowendpoint , becomes free to be used in another flow.
void
-TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_CHECK;
@@ -4477,7 +4477,7 @@ TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL)
void
-TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
int result = TAO_AV_Core::deactivate_servant (this);
@@ -4490,7 +4490,7 @@ TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -4499,14 +4499,14 @@ TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
void
TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep);
}
AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_flow_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
@@ -4514,7 +4514,7 @@ TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
void
TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_CHECK;
@@ -4524,7 +4524,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
// returns the connected peer for this flow
AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notConnected,
AVStreams::notSupported))
@@ -4535,7 +4535,7 @@ TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Boolean
TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
const CORBA::Any &
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::FPError,
AVStreams::notSupported))
@@ -4547,7 +4547,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
flowname_property <<= fp_name;
this->define_property ("FlowProtocol",
flowname_property
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4562,7 +4562,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
void
TAO_FlowEndPoint::set_format (const char * format
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported))
{
@@ -4575,7 +4575,7 @@ TAO_FlowEndPoint::set_format (const char * format
format_val <<= format;
this->define_property ("Format",
format_val
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4588,7 +4588,7 @@ TAO_FlowEndPoint::set_format (const char * format
void
TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed))
@@ -4600,7 +4600,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
DevParams_property <<= new_settings;
this->define_property ("DevParams",
DevParams_property
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -4613,7 +4613,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
void
TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported))
{
@@ -4630,11 +4630,11 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
AvailableProtocols_property <<= protocols;
this->define_property ("AvailableProtocols",
AvailableProtocols_property
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AVStreams::protocolSpec *temp_spec;
CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
temp_any.in () >>= temp_spec;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
@@ -4655,7 +4655,7 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
CORBA::Boolean
TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::formatMismatch,
AVStreams::deviceQosMismatch))
@@ -4671,7 +4671,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format";
format_ptr = this->get_property_value ("Format"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
const char *temp_format;
@@ -4680,7 +4680,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
// get my peer's format value
exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]";
format_ptr = peer_fep->get_property_value ("Format"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
format_ptr.in () >>= temp_format;
peer_format = CORBA::string_dup (temp_format);
@@ -4696,7 +4696,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
exception_message =
"TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols";
AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AvailableProtocols_ptr.in () >>= temp_protocols;
my_protocol_spec = *temp_protocols;
@@ -4704,7 +4704,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
exception_message =
"TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]";
AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
AvailableProtocols_ptr.in () >>= temp_protocols;
peer_protocol_spec = *temp_protocols;
@@ -4750,7 +4750,7 @@ CORBA::Boolean
TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
AVStreams::FlowEndPoint_ptr the_peer_fep,
AVStreams::QoS & /* the_qos */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed,
AVStreams::streamOpFailed))
@@ -4764,7 +4764,7 @@ CORBA::Boolean
TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */,
AVStreams::MCastConfigIf_ptr mcast_peer,
AVStreams::QoS & /* the_qos */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed))
{
@@ -4778,7 +4778,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
CORBA::Boolean /*is_mcast*/,
AVStreams::FlowEndPoint_ptr peer_fep,
char *& flowProtocol
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -4800,13 +4800,13 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
AVStreams::protocolSpec *temp_protocols;
CORBA::Any_var AvailableProtocols_ptr =
peer_fep->get_property_value ("AvailableProtocols"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
AvailableProtocols_ptr.in () >>= temp_protocols;
peer_protocol_spec = *temp_protocols;
AvailableProtocols_ptr =
this->get_property_value ("AvailableProtocols"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
AvailableProtocols_ptr.in () >>= temp_protocols;
my_protocol_spec = *temp_protocols;
@@ -4871,7 +4871,7 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
AVStreams::QoS & /*the_qos*/,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -4935,7 +4935,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
// gets the reverse channel for feedback.
char *
TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return 0;
@@ -4943,7 +4943,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
// The start, stop and destroy are to be handled by the application.
void
-TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4956,7 +4956,7 @@ TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_FlowProducer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4980,7 +4980,7 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
CORBA::Boolean is_mcast,
AVStreams::FlowEndPoint_ptr peer_fep,
char *& flowProtocol
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -4991,14 +4991,14 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
is_mcast,
peer_fep,
flowProtocol
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
CORBA::Boolean
TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -5008,7 +5008,7 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
the_qos,
address,
use_flow_protocol
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
// Connect to a IP multicast address.
char *
@@ -5016,7 +5016,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
CORBA::Boolean_out /* is_met */,
const char *address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::notSupported,
@@ -5060,7 +5060,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
// sets the key for this flow.
void
TAO_FlowProducer::set_key (const AVStreams::key & the_key
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -5069,7 +5069,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key
anyval <<= the_key;
this->define_property ("PublicKey",
anyval
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -5083,7 +5083,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key
// source id to be used to distinguish this source from others.
void
TAO_FlowProducer::set_source_id (CORBA::Long source_id
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->source_id_ = source_id;
@@ -5108,7 +5108,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
// The start, stop and destroy are to be handled by the application.
void
-TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5118,7 +5118,7 @@ TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-TAO_FlowConsumer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5134,7 +5134,7 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
CORBA::Boolean is_mcast,
AVStreams::FlowEndPoint_ptr peer_fep,
char *& flowProtocol
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -5145,14 +5145,14 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
is_mcast,
peer_fep,
flowProtocol
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
CORBA::Boolean
TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -5162,7 +5162,7 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
the_qos,
address,
use_flow_protocol
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 80edd90fc01..95ab3009b5b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -95,14 +95,14 @@ public:
/// Stop the transfer of data of the stream
/// Empty the_spec means apply operation to all flows
virtual void stop (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
/// Start the transfer of data in the stream.
/// Empty the_spec means apply operation to all flows
virtual void start (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
@@ -112,7 +112,7 @@ public:
* Empty the_spec means apply operation to all flows
*/
virtual void destroy (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
@@ -120,7 +120,7 @@ public:
/// Empty the_spec means apply operation to all flows
virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed));
@@ -128,14 +128,14 @@ public:
/// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
/// E.g., loss of flow, reestablishment of flow, etc..
virtual void push_event (const struct CosPropertyService::Property & the_event
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Used to control the flow protocol parameters.
virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
const char *fp_name,
const CORBA::Any &fp_settings
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::FPError));
@@ -143,7 +143,7 @@ public:
/// Not implemented in the light profile, will raise the notsupported
/// exception
virtual CORBA::Object_ptr get_flow_connection (const char *flow_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::notSupported));
@@ -152,7 +152,7 @@ public:
/// exception
virtual void set_flow_connection (const char *flow_name,
CORBA::Object_ptr flow_connection
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::notSupported));
@@ -186,7 +186,7 @@ class TAO_AV_Export TAO_Negotiator
public:
virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
const AVStreams::streamQoS &qos_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
};
@@ -251,14 +251,14 @@ public:
/// Stop the transfer of data of the stream
/// Empty the_spec means apply operation to all flows
virtual void stop (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
/// Start the transfer of data in the stream.
/// Empty the_spec means apply operation to all flows
virtual void start (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
@@ -268,7 +268,7 @@ public:
* Empty the_spec means apply operation to all flows
*/
virtual void destroy (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
@@ -283,7 +283,7 @@ public:
AVStreams::MMDevice_ptr b_party,
AVStreams::streamQoS& the_qos,
const AVStreams::flowSpec& the_flows
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -298,7 +298,7 @@ public:
AVStreams::StreamEndPoint_B_ptr b_party,
AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -306,7 +306,7 @@ public:
virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
const AVStreams::flowSpec & the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow));
@@ -314,19 +314,19 @@ public:
/// Unbind the_ep from the stream. Empty the_spec means apply to all flows.
virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow));
/// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
- virtual void unbind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void unbind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed));
virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
AVStreams::StreamEndPoint_out sep
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed));
@@ -334,7 +334,7 @@ public:
/// Empty the_spec means apply operation to all flows
virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed));
@@ -386,28 +386,28 @@ public:
virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
AVStreams::streamQoS & the_qos,
const AVStreams::flowSpec & the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed,
AVStreams::streamOpFailed));
virtual void configure (const CosPropertyService::Property & a_configuration
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void set_initial_configuration (const CosPropertyService::Properties & initial
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void set_format (const char * flowName,
const char * format_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported));
virtual void set_dev_params (const char * flowName,
const CosPropertyService::Properties & new_params
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
@@ -494,15 +494,15 @@ public:
/// Application needs to define this
virtual int handle_stop (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Application needs to define this
virtual int handle_start (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Application needs to define this
virtual int handle_destroy (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Application needs to define this
virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec);
@@ -512,7 +512,7 @@ public:
/// Application needs to define this
virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
@@ -563,19 +563,19 @@ public:
/// Stop the stream. Empty the_spec means, for all the flows
virtual void stop (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
/// Start the stream, Empty the_spec means, for all the flows
virtual void start (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
/// Destroy the stream, Empty the_spec means, for all the flows
virtual void destroy (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow));
@@ -583,7 +583,7 @@ public:
virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
AVStreams::streamQoS& qos_spec,
const AVStreams::flowSpec& the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -595,7 +595,7 @@ public:
CORBA::Boolean is_mcast,
AVStreams::streamQoS &qos,
AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpDenied,
AVStreams::noSuchFlow,
@@ -605,23 +605,23 @@ public:
/// Change the transport qos on a stream
virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed));
virtual int change_qos (AVStreams::streamQoS &new_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Used to restrict the set of protocols
virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// disconnect the flows
virtual void disconnect (const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::streamOpFailed));
@@ -630,46 +630,46 @@ public:
virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
const char *fp_name,
const CORBA::Any &fp_settings
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::FPError));
/// Not implemented in the light profile, throws notsupported
virtual CORBA::Object_ptr get_fep (const char *flow_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::noSuchFlow));
/// Not implemented in the light profile, throws notsupported
virtual char * add_fep (CORBA::Object_ptr the_fep
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed));
/// Not implemented in the light profile, throws notsupported
virtual void remove_fep (const char *fep_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed));
/// Used to "attach" a negotiator to the endpoint
virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Used for public key encryption.
virtual void set_key (const char *flow_name,
const AVStreams::key & the_key
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Used to set a unique id for packets sent by this streamendpoint
virtual void set_source_id (CORBA::Long source_id
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Destructor
@@ -677,17 +677,17 @@ public:
CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
protected:
/// Helper methods to implement add_fep()
char* add_fep_i (AVStreams::FlowEndPoint_ptr fep
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed));
char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed));
@@ -753,7 +753,7 @@ public:
/// Used for ATM-style multicast
virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -763,7 +763,7 @@ public:
virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_flows
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -773,7 +773,7 @@ public:
/// Used to remove a multicast leaf
virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
const AVStreams::flowSpec &theSpec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -806,7 +806,7 @@ public:
/// Used for internet-style multicast
virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -837,7 +837,7 @@ public:
AVStreams::VDev_ptr the_peer_dev,
AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -848,7 +848,7 @@ public:
AVStreams::MCastConfigIf_ptr a_mcastconfigif,
AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed,
@@ -856,7 +856,7 @@ public:
/// Called by the peer VDev to configure the device (catch all)
virtual void configure (const CosPropertyService::Property &the_config_mesg
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed));
@@ -864,14 +864,14 @@ public:
/// Used to set a format on a flowname
virtual void set_format (const char *flowName,
const char *format_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported));
/// Used to set device parameters
virtual void set_dev_params (const char *flowName,
const CosPropertyService::Properties &new_params
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed));
@@ -879,7 +879,7 @@ public:
/// Called to change QoS of the device
virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::noSuchFlow,
AVStreams::QoSRequestFailed));
@@ -890,7 +890,7 @@ public:
protected:
/// hook called after set_peer is done to set the media ctrl of the peer vdev.
virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// My stream controller
AVStreams::StreamCtrl_var streamctrl_;
@@ -927,7 +927,7 @@ public:
CORBA::Boolean_out met_qos,
char *&named_vdev,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// Can be used to request the MMDevice to create a new StreamCtrl,
/// and call bind_devs on it
@@ -935,7 +935,7 @@ public:
AVStreams::streamQoS &the_qos,
CORBA::Boolean_out is_met,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -946,7 +946,7 @@ public:
AVStreams::streamQoS &the_qos,
CORBA::Boolean_out is_met,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::noSuchFlow,
@@ -959,7 +959,7 @@ public:
CORBA::Boolean_out met_qos,
char *&named_vdev,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -974,7 +974,7 @@ public:
CORBA::Boolean_out met_qos,
char *&named_vdev,
const AVStreams::flowSpec &the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -985,27 +985,27 @@ public:
/// Remove the StreamEndPoint and the related vdev
virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
const char *vdev_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported));
/// Not supported in the light profile, raises notsupported
virtual char * add_fdev (CORBA::Object_ptr the_fdev
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed));
/// Not supported in the light profile, raises notsupported
virtual CORBA::Object_ptr get_fdev (const char *flow_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::noSuchFlow));
/// Not supported in the light profile, raises notsupported
virtual void remove_fdev (const char *flow_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::noSuchFlow,
@@ -1017,7 +1017,7 @@ public:
protected:
/// Helper method to implement add_fdev()
char* add_fdev_i (AVStreams::FDev_ptr fdev
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported,
AVStreams::streamOpFailed));
@@ -1066,34 +1066,34 @@ public:
TAO_FlowConnection (void);
/// stop this flow.
- virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// start this flow.
- virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// destroy this flow.
- virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// modify the QoS for this flow.
virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed));
/// use the specified flow protocol for this flow.
virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
const CORBA::Any & fp_settings
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::FPError,
AVStreams::notSupported));
/// pushes an event , to be handled by the application.
virtual void push_event (const AVStreams::streamEvent & the_event
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
@@ -1101,7 +1101,7 @@ public:
virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
AVStreams::FDev_ptr b_party,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -1111,20 +1111,20 @@ public:
virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
AVStreams::FlowConsumer_ptr flow_consumer,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::formatMismatch,
AVStreams::FEPMismatch,
AVStreams::alreadyConnected));
/// disconnect this flow connection.
- virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean disconnect (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// adds the producer to this flow connection.
virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::alreadyConnected,
AVStreams::notSupported));
@@ -1132,13 +1132,13 @@ public:
/// adds a consumer to this flow connection.
virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::alreadyConnected));
/// drops a flow endpoint from the flow.
virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notConnected));
@@ -1200,41 +1200,41 @@ public:
TAO_AV_Protocol_Object *object);
/// lock the flow endpoint for a particular flow.
- virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual CORBA::Boolean lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// unlock the flow endpoint for subsequent use.
- virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// destroy this flow.
- virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// get method for the related streamendpoint under which this
/// flowendpoint is.
- virtual AVStreams::StreamEndPoint_ptr related_sep(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual AVStreams::StreamEndPoint_ptr related_sep(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// set method for the related streamendpoint under which this
/// flowendpoint is.
virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual AVStreams::FlowConnection_ptr related_flow_connection(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
// accessor for the related flow connection attribute.
/// set method for the related flow connection attribute.
virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// returns the other flowendpoint to which this is connected.
- virtual AVStreams::FlowEndPoint_ptr get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual AVStreams::FlowEndPoint_ptr get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notConnected,
AVStreams::notSupported));
@@ -1242,33 +1242,33 @@ public:
//// use the specified flow protocol.
virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
const CORBA::Any & fp_settings
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::FPError,
AVStreams::notSupported));
/// sets the data format.
virtual void set_format (const char * format
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported));
/// sets the device parameters.
virtual void set_dev_params (const CosPropertyService::Properties & new_settings
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::PropertyException,
AVStreams::streamOpFailed));
/// sets the list of protocols to be used.
virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported));
/// checks whether the passed flowendpoint is compatible with this.
virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::formatMismatch,
AVStreams::deviceQosMismatch));
@@ -1277,7 +1277,7 @@ public:
virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
AVStreams::FlowEndPoint_ptr the_peer_fep,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed,
AVStreams::streamOpFailed));
@@ -1286,7 +1286,7 @@ public:
virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
AVStreams::MCastConfigIf_ptr a_mcastconfigif,
AVStreams::QoS & the_qos
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::QoSRequestFailed));
@@ -1299,7 +1299,7 @@ public:
virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -1310,7 +1310,7 @@ public:
AVStreams::QoS & the_qos,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -1325,7 +1325,7 @@ public:
CORBA::Boolean is_mcast,
AVStreams::FlowEndPoint_ptr peer,
char *& flowProtocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -1337,7 +1337,7 @@ public:
CORBA::Boolean is_mcast,
AVStreams::FlowEndPoint_ptr peer,
char *& flowProtocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -1394,22 +1394,22 @@ public:
* know the reverse channel on its peer fep to send data to.
*/
virtual char * get_rev_channel (const char * pcol_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// stop this flow, to be overridden by the application.
- virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// start this flow, to be overridden by the application.
- virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char * go_to_listen (AVStreams::QoS & the_qos,
CORBA::Boolean is_mcast,
AVStreams::FlowEndPoint_ptr peer,
char *& flowProtocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -1418,7 +1418,7 @@ public:
virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -1429,7 +1429,7 @@ public:
CORBA::Boolean_out is_met,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::notSupported,
@@ -1440,13 +1440,13 @@ public:
/// sets the public key to be used for encryption of the data.
virtual void set_key (const AVStreams::key & the_key
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// sets the source id of this flow producer so that it can be used
/// to distinguish this producer from others in the multicast case.
virtual void set_source_id (CORBA::Long source_id
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
protected:
@@ -1469,18 +1469,18 @@ public:
const char *format);
/// stop this flow, to be overridden by the application.
- virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// start this flow, to be overridden by the application.
- virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char * go_to_listen (AVStreams::QoS & the_qos,
CORBA::Boolean is_mcast,
AVStreams::FlowEndPoint_ptr peer,
char *& flowProtocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToListen,
AVStreams::FPError,
@@ -1489,7 +1489,7 @@ public:
virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
const char * address,
const char * use_flow_protocol
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::failedToConnect,
AVStreams::FPError,
@@ -1513,33 +1513,33 @@ public:
virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
AVStreams::PositionKey a_key
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::MediaControl::PostionKeyNotSupported)) =0;
virtual void set_media_position (const AVStreams::Position & a_position
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::MediaControl::PostionKeyNotSupported,
AVStreams::InvalidPosition)) =0;
virtual void start (const AVStreams::Position & a_position
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::InvalidPosition)) =0;
virtual void pause (const AVStreams::Position & a_position
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::InvalidPosition)) =0;
virtual void resume (const AVStreams::Position & a_position
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::InvalidPosition)) =0;
virtual void stop (const AVStreams::Position & a_position
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::InvalidPosition)) =0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 1c4406449ed..5c73560bc55 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -149,7 +149,7 @@ TAO_AV_Core::reactor (void)
int
TAO_AV_Core::init (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init "));
this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -1016,18 +1016,18 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
// the servant when all pending requests on this servant are
// complete.
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- PortableServer::POA_var poa = servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+ PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::ObjectId_var id = poa->servant_to_id (servant
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
poa->deactivate_object (id.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index d170ef600b4..c1242aed973 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -86,7 +86,7 @@ public:
int init (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
int run (void);
int stop_run (void);
int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index fe0fb2884ad..f70a5c8b9e9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -53,7 +53,7 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void)
int
TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */,
AVStreams::VDev_ptr & /* vdev */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) Error creating A endpoint\n"),
@@ -67,7 +67,7 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_
int
TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */,
AVStreams::VDev_ptr & /*vdev */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
ACE_ERROR_RETURN ((LM_ERROR,
"(%P|%t) Error creating B endpoint\n"),
@@ -156,19 +156,19 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
"remove"),
-1);
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Get ourselves a Naming service
- this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Get the stream endpoint created by the child from the naming service
- this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->get_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Get the Vdev created by the child from the naming service
- this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->get_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -183,7 +183,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
// Get ourselves a Naming service reference
int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC
return 0;
CORBA::Object_var naming_obj =
- TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+ TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
@@ -200,7 +200,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC
-1);
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC
// Get the VDev created in the child process from the namingservice
int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -236,13 +236,13 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL)
// Get the CORBA::Object
CORBA::Object_var vdev =
this->naming_context_->resolve (VDev_Name
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Narrow it
this->vdev_ =
AVStreams::VDev::_narrow (vdev.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Check if valid
@@ -280,7 +280,7 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void)
int
TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
{
// use the baseclass activate
if (this->activate () == -1)
@@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
// Gets the stream endpoint object reference from the naming service
int
-TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -319,13 +319,13 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL
// Get the CORBA::Object
CORBA::Object_var stream_endpoint_a =
this->naming_context_->resolve (Stream_Endpoint_A_Name
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Narrow the reference
this->stream_endpoint_a_ =
AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Check for validity
@@ -363,7 +363,7 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
int
TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
ACE_TRY
{
@@ -374,7 +374,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n",
TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_
- TAO_ENV_ARG_PARAMETER)));
+ ACE_ENV_ARG_PARAMETER)));
ACE_TRY_CHECK;
stream_endpoint = this->stream_endpoint_b_;
vdev = this->vdev_;
@@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
// Gets the B type stream_endpoint from the Naming service
int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -413,13 +413,13 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL
// Get the CORBA::Object reference
CORBA::Object_var stream_endpoint_b =
this->naming_context_->resolve (Stream_Endpoint_B_Name
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Narrow the reference
this->stream_endpoint_b_ =
AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Check for validity
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 7323dd79bcb..f57d2ac3533 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -44,12 +44,12 @@ public:
/// Called by the MMDevice, when it needs to create an A type endpoint
virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
/// Called by the MMDevice, when it needs to create an B type endpoint
virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
protected:
/// The "A" stream endpoint
@@ -87,18 +87,18 @@ public:
protected:
/// Bind to the naming service
- virtual int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
/**
* Get the object reference for the newly created stream
* endpoint (which will be in the child process)
* Subclasses will define the functionality for this
*/
- virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0;
+ virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
/// Get the Vdev object reference for the newly created
/// endpoint
- virtual int get_vdev (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int get_vdev (ACE_ENV_SINGLE_ARG_DECL);
/// Naming context
CosNaming::NamingContext_var naming_context_;
@@ -135,10 +135,10 @@ protected:
/// Creates an "A" type stream endpoint, and a vdev
virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
/// Gets the "A" type stream endpoint from the child process
- virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
};
@@ -163,11 +163,11 @@ protected:
/// Creates a "B" type stream endpoint, and a vdev
virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
/// Gets the object reference of the "B" type streamendpoint.
- virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
};
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 87dac015760..68df61b060d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -32,15 +32,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->activate_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->activate_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
- this->activate_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->activate_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n"));
- this->activate_mediactrl (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->activate_mediactrl (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
}
@@ -56,22 +56,22 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
char *
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL)
{
PortableServer::ObjectId_var id =
this->poa_->activate_object (servant
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
CORBA::Object_var obj =
this->poa_->id_to_reference (id.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
CORBA::String_var str =
this->orb_->object_to_string (obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
return str._retn ();
@@ -81,7 +81,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate VDev into the POA
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -92,15 +92,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate the object under the root poa.
// CORBA::String_var vdev_ior = this->activate_with_poa (vdev,
-// TAO_ENV_ARG_PARAMETER);
+// ACE_ENV_ARG_PARAMETER);
// ACE_TRY_CHECK;
// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
// vdev_ior. in ()));
// Save the object reference, so that create_A can return it
- this->vdev_ = vdev->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->vdev_ = vdev->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- vdev->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+ vdev->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -117,7 +117,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate the media_controller
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -128,7 +128,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Activate the mediactrl object under the root poa.
// CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl
-// TAO_ENV_ARG_PARAMETER);
+// ACE_ENV_ARG_PARAMETER);
// ACE_TRY_CHECK;
// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n",
@@ -138,13 +138,13 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
// Associate the media controller object reference with the vdev, as per the OMG spec
CORBA::Any anyval;
CORBA::Object_var media_ctrl_obj
- = media_ctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ = media_ctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- media_ctrl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+ media_ctrl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var str = this->orb_->object_to_string (media_ctrl_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
anyval <<= str.in();
@@ -152,7 +152,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
this->vdev_->define_property ("Related_MediaCtrl",
anyval
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -235,7 +235,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
+ ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
{
if (this->activate () == -1)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -251,7 +251,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
// Put the stream_endpoint into the POA
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -262,14 +262,14 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
return -1;
// CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a
-// TAO_ENV_ARG_PARAMETER);
+// ACE_ENV_ARG_PARAMETER);
// ACE_TRY_CHECK;
// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
// Save the object references, so that create_a can return them
- this->stream_endpoint_a_ = stream_endpoint_a->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- stream_endpoint_a->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+ stream_endpoint_a->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -312,7 +312,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
// Activate stream_endpoint
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
@@ -321,13 +321,13 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
if (this->make_stream_endpoint (stream_endpoint_b) == -1)
return -1;
// CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b
-// TAO_ENV_ARG_PARAMETER);
+// ACE_ENV_ARG_PARAMETER);
// ACE_TRY_CHECK;
// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
- this->stream_endpoint_b_ = stream_endpoint_b->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- stream_endpoint_b->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+ stream_endpoint_b->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -345,7 +345,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
+ ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
{
if (this->activate () == -1)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -393,19 +393,19 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
// create the objects and activate them in the poa
this->activate_objects (argc,
argv
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Get ourselves a naming_service object reference
- this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Register the vdev with the naming service
- this->register_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->register_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// register the stream_endpoing with the naming_service
- this->register_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->register_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -427,22 +427,22 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
char *
TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
PortableServer::ObjectId_var id =
this->poa_->activate_object (servant
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
CORBA::Object_var obj =
this->poa_->id_to_reference (id.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
CORBA::String_var str =
this->orb_->object_to_string (obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
return str._retn ();
@@ -453,7 +453,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/,
char ** /*argv*/
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
ACE_TRY
{
@@ -471,7 +471,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
// activate the stream_endpoint
CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
"(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",
@@ -479,7 +479,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
// activate the vdev
CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
"(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",
@@ -487,7 +487,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
// activate the media controller
CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
@@ -505,12 +505,12 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
// Bind to the namingservice
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
CORBA::Object_var naming_obj =
- this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+ this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -519,7 +519,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
this->naming_context_ =
CosNaming::NamingContext::_narrow (naming_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -535,7 +535,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
// register the vdev with the naming service
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::Object_ptr vdev_obj = CORBA::Object::_nil ();
ACE_TRY
@@ -555,26 +555,26 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TA
// make the media controller a property of the vdev
CORBA::Any media_ctrl_property;
CORBA::Object_var media_ctrl_obj =
- this->media_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->media_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->vdev_->define_property ("Related_MediaCtrl",
media_ctrl_property
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- vdev_obj = this->vdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ vdev_obj = this->vdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- this->vdev_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->vdev_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_TRY_EX (bind)
{
// Register the vdev with the naming server.
this->naming_context_->bind (this->vdev_name_,
vdev_obj
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (bind);
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
@@ -583,7 +583,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TA
// with this one
this->naming_context_->rebind (this->vdev_name_,
vdev_obj
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -612,7 +612,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+ this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -660,14 +660,14 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
// register the stream_endpoint with the naming service
template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
int
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
ACE_TRY
{
- stream_endpoint_obj = this->stream_endpoint_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ stream_endpoint_obj = this->stream_endpoint_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- this->stream_endpoint_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->stream_endpoint_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
// Create a name for the video control object
@@ -675,7 +675,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
// Register the stream endpoint object with the naming server.
this->naming_context_->bind (this->stream_endpoint_name_,
stream_endpoint_obj
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
@@ -683,7 +683,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
// if the name was already there, replace the reference with the new one
this->naming_context_->rebind (this->stream_endpoint_name_,
stream_endpoint_obj
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -742,11 +742,11 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
if (CORBA::is_nil (this->naming_context_.in ()) == 0)
return 0;
this->naming_context_->unbind (this->stream_endpoint_name_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
this->naming_context_->unbind (this->vdev_name_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index f4cb2acefd7..1ff9129d44f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -42,15 +42,15 @@ protected:
virtual int activate (void);
/// activates the stream_endpoint with the POA
- virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0;
+ virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
/// activates the vdev with the POA
- virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int activate_vdev (ACE_ENV_SINGLE_ARG_DECL);
/// activates the media controller with the POA
- virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL);
/// Bridge method to create a vdev, a la Acceptor. Applications
/// can override this
@@ -65,7 +65,7 @@ protected:
virtual int make_mediactrl (T_MediaCtrl *&media_ctrl);
- char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL);
+ char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
CORBA::ORB_var orb_;
@@ -95,12 +95,12 @@ public:
/// Overrides the base class stream_endpoint activator, to activate
/// an "A" type endpoint
- virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
/// Called by the MMDevice, when it needs to create an A type endpoint
virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
};
@@ -126,12 +126,12 @@ public:
/// Overrides the base class stream_endpoint activator, to activate
/// a "B" type endpoint
- virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+ virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
/// Called by the MMDevice, when it needs to create a B type endpoint
virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
AVStreams::VDev_ptr &vdev
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
};
// ----------------------------------------------------------------------
@@ -168,22 +168,22 @@ protected:
*/
int activate_objects (int argc,
char **argv
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
///activate the servant with the poa
- char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL);
+ char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
/// Removes the vdev and streamendpoint names from the naming service.
int unbind_names (void);
/// Binds to the naming service
- int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+ int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
/// Registers vdev with the naming service
- int register_vdev (TAO_ENV_SINGLE_ARG_DECL);
+ int register_vdev (ACE_ENV_SINGLE_ARG_DECL);
/// Registers stream_endpoint with the naming service
- int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+ int register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
/// Releases the semaphore on which the parent is waiting on
int release_semaphore ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index e26e6bc7116..a309efdf318 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -28,7 +28,7 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
flowname_any <<= flowname;
this->define_property ("Flow",
flowname_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -63,7 +63,7 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name)
flowname_any <<= flow_name;
this->define_property ("Flow",
flowname_any
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -81,7 +81,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
AVStreams::QoS & the_qos,
CORBA::Boolean_out met_qos,
char *& named_fdev
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -93,7 +93,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
the_qos,
met_qos,
named_fdev
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
template <class T_Producer, class T_Consumer>
@@ -103,7 +103,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
AVStreams::QoS & /* the_qos */,
CORBA::Boolean_out /* met_qos */,
char *& /* named_fdev */
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil ();
ACE_TRY
@@ -114,7 +114,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
T_Producer,
0);
this->producer_list_.insert_tail (producer_i);
- producer = producer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ producer = producer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -134,7 +134,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
AVStreams::QoS & /* the_qos */,
CORBA::Boolean_out /* met_qos */,
char *& /* named_fdev */
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil ();
ACE_TRY
@@ -145,7 +145,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
T_Consumer,
0);
this->consumer_list_.insert_tail (consumer_i);
- consumer = consumer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ consumer = consumer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -164,7 +164,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
AVStreams::QoS & the_qos,
CORBA::Boolean_out met_qos,
char *& named_fdev
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -175,7 +175,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
the_qos,
met_qos,
named_fdev
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
template <class T_Producer, class T_Consumer>
@@ -184,7 +184,7 @@ AVStreams::FlowConnection_ptr
TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
AVStreams::QoS & the_qos,
CORBA::Boolean_out is_met
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::QoSRequestFailed))
@@ -202,7 +202,7 @@ AVStreams::FlowConnection_ptr
TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
AVStreams::QoS & the_qos,
CORBA::Boolean_out is_met
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::QoSRequestFailed))
@@ -218,7 +218,7 @@ template <class T_Producer, class T_Consumer>
void
TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
const char * /* fdev_name */
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported))
{
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index b227851f3e7..c7a7cb87e47 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -48,7 +48,7 @@ public:
AVStreams::QoS & the_qos,
CORBA::Boolean_out met_qos,
char *& named_fdev
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -61,14 +61,14 @@ public:
AVStreams::QoS & the_qos,
CORBA::Boolean_out met_qos,
char *& named_fdev
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// create a flow consumer object.
virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester,
AVStreams::QoS & the_qos,
CORBA::Boolean_out met_qos,
char *& named_fdev
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::streamOpDenied,
@@ -81,13 +81,13 @@ public:
AVStreams::QoS & the_qos,
CORBA::Boolean_out met_qos,
char *& named_fdev
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
/// bind this FDev with another FDev.
virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
AVStreams::QoS & the_qos,
CORBA::Boolean_out is_met
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::QoSRequestFailed));
@@ -96,7 +96,7 @@ public:
virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
AVStreams::QoS & the_qos,
CORBA::Boolean_out is_met
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::streamOpFailed,
AVStreams::QoSRequestFailed));
@@ -104,7 +104,7 @@ public:
/// destroys this FDev.
virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
const char * fdev_name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
AVStreams::notSupported));
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index dbeb3e615f0..27d79bd3ebd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -318,7 +318,7 @@ int
TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
"(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
@@ -375,7 +375,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
AVStreams::Negotiator_var remote_negotiator;
this->negotiator_->negotiate (remote_negotiator.in (),
new_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
}
}
@@ -871,7 +871,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
int
TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
int result = 0;
// TAO_AV_Callback *callback = 0;
@@ -1020,7 +1020,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
{
CORBA::Any_ptr negotiator_any =
this->endpoint_->get_property_value ("Negotiator"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (negotiator);
*negotiator_any >>= negotiator;
@@ -1298,7 +1298,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
{
CORBA::Any_ptr negotiator_any =
this->endpoint_->get_property_value ("Negotiator"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX (negotiator);
*negotiator_any >>= negotiator;
View Lorry Controller Status