diff options
| author | sumedh <sumedh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-03 00:20:10 +0000 |
|---|---|---|
| committer | sumedh <sumedh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-05-03 00:20:10 +0000 |
| commit | d3a19ea262fcf7e8bcffbea9d3930293062630a8 (patch) | |
| tree | 0caaa47a07e0962766ed0a3c6242cdb90e3c8700 | |
| parent | 80beb786752fbcb447268297fa945886ca2d5a6c (diff) | |
| download | ATCD-d3a19ea262fcf7e8bcffbea9d3930293062630a8.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index ab59f039909..4df92cc607e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -850,7 +850,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Pro TAO_CATCHANY { TAO_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate"); - return -1; } TAO_ENDTRY; @@ -870,7 +869,6 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Pro // the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> TAO_AV_Child_Process_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_A () - : stream_endpoint_name_ (1) { this->stream_endpoint_name_.length (1); this->stream_endpoint_name_ [0].id = CORBA::string_dup ("Stream_Endpoint_A"); @@ -884,7 +882,6 @@ TAO_AV_Child_Process_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Pr // the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> TAO_AV_Child_Process_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_B () - : stream_endpoint_name_ (1) { this->stream_endpoint_name_.length (1); this->stream_endpoint_name_ [0].id = CORBA::string_dup ("Stream_Endpoint_B"); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 89b9241ceea..1975ae60aaa 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -241,10 +241,6 @@ public: // runs the ORB event loop protected: - const char *stream_endpoint_name_; - // The name of the stream endpoint. Subclasses - // can override this to define their own name - int activate_objects (int argc, char **argv, CORBA::Environment &env); @@ -283,6 +279,12 @@ public: CosNaming::NamingContext_var naming_context_; // The root Naming Context of the TAO naming service + CosNaming::Name vdev_name_; + // Name of the vdev + + CosNaming::Name stream_endpoint_name_; + // Name of the stream_endpoint + T_StreamEndpoint *stream_endpoint_; // The stream endpoint member |