diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h | 26 |
1 files changed, 13 insertions, 13 deletions
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 (); |