diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index bc1a20f5b10..f4cb2acefd7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -7,7 +7,7 @@ * * $Id$ * - * @author Sumedh Mungee <sumedh@cs.wustl.edu> + * @author Sumedh Mungee <sumedh@cs.wustl.edu> * @author Nagarajan Surendran <naga@cs.wustl.edu> */ //============================================================================= @@ -42,15 +42,15 @@ protected: virtual int activate (void); /// activates the stream_endpoint with the POA - virtual int activate_stream_endpoint (CORBA::Environment &env) = 0; + virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0; /// activates the vdev with the POA - virtual int activate_vdev (CORBA::Environment &env); + virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL); /// activates the media controller with the POA - virtual int activate_mediactrl (CORBA::Environment &env); + virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL); /// Bridge method to create a vdev, a la Acceptor. Applications /// can override this @@ -65,10 +65,10 @@ protected: virtual int make_mediactrl (T_MediaCtrl *&media_ctrl); - char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env); - + char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); + CORBA::ORB_var orb_; - + PortableServer::POA_var poa_; }; @@ -95,12 +95,12 @@ public: /// Overrides the base class stream_endpoint activator, to activate /// an "A" type endpoint - virtual int activate_stream_endpoint (CORBA::Environment &env); + virtual int activate_stream_endpoint (TAO_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, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_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 (CORBA::Environment &env); + virtual int activate_stream_endpoint (TAO_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, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); }; // ---------------------------------------------------------------------- @@ -139,7 +139,7 @@ public: /** * @class TAO_AV_Child_Process * - * @brief Helper class for the child process created in + * @brief Helper class for the child process created in * TAO_AV_Endpoint_Process_Strategy */ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> @@ -167,23 +167,23 @@ protected: * return them to the client */ int activate_objects (int argc, - char **argv, - CORBA::Environment &env); + char **argv + TAO_ENV_ARG_DECL); ///activate the servant with the poa - char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env); + char* activate_with_poa (PortableServer::Servant servant TAO_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 (CORBA::Environment &env); + int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL); /// Registers vdev with the naming service - int register_vdev (CORBA::Environment &env); + int register_vdev (TAO_ENV_SINGLE_ARG_DECL); /// Registers stream_endpoint with the naming service - int register_stream_endpoint (CORBA::Environment &env); + int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); /// Releases the semaphore on which the parent is waiting on int release_semaphore (); @@ -225,7 +225,7 @@ protected: char host_[MAXHOSTNAMELEN]; CORBA::ORB_ptr orb_; - + PortableServer::POA_ptr poa_; }; |