diff options
author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-06 22:41:29 +0000 |
---|---|---|
committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-06 22:41:29 +0000 |
commit | 9b9915a888788bb035e39873b80ffbc7dde2080d (patch) | |
tree | 9cfd8eeb92c67e9fd913514e548553ff903afbca /TAO/orbsvcs/tests/AVStreams/Multicast | |
parent | 9ac88cce95d6820d634b0e12615c3a7b493ba0bb (diff) | |
download | ATCD-9b9915a888788bb035e39873b80ffbc7dde2080d.tar.gz |
ChangeLogTag:Sat May 6 15:37:25 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Multicast')
-rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp | 18 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 9c8e94c908e..d80bd3e0554 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -62,7 +62,7 @@ FTP_Client_Callback::handle_timeout (void *) } if (n == 0) { - if (::feof (CLIENT::instance ()->file ())) + if (feof (CLIENT::instance ()->file ())) { // wait for sometime for the data to be flushed to the other side. this->count_++; @@ -132,7 +132,7 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *flowname, // { // ACE_DEBUG ((LM_DEBUG,"FTP_Client_Flow_Handler::start")); // ACE_Time_Value delta = ACE_Time_Value::zero; -// this->timer_id_ = +// this->timer_id_ = // TAO_AV_CORE::instance ()->reactor ()->schedule_timer (this, // 0, // delta, @@ -224,9 +224,9 @@ Client::parse_args (int argc, char **argv) { ACE_Get_Opt opts (argc,argv,"f:a:p:s"); - + this->use_sfp_ = 0; - char c; + int c; while ((c= opts ()) != -1) { switch (c) @@ -400,7 +400,7 @@ Client::run (void) &addr); flow_spec [0] = entry.entry_to_string (); flow_spec.length (1); - CORBA::Boolean result = + CORBA::Boolean result = this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV), AVStreams::MMDevice::_nil (), the_qos.inout (), @@ -408,7 +408,7 @@ Client::run (void) ACE_TRY_ENV); ACE_TRY_CHECK; if (this->bind_to_server ("Server_MMDevice1") == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), -1); result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), @@ -418,7 +418,7 @@ Client::run (void) ACE_TRY_ENV); ACE_TRY_CHECK; if (this->bind_to_server ("Server_MMDevice2") == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), -1); result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), @@ -468,6 +468,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO template class TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> -#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> +#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> +#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 80431bfa31d..90cfcdf4cb3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -71,7 +71,7 @@ Server::init (int argc, argv, ACE_TRY_ENV); ACE_TRY_CHECK; - this->orb_manager_ = + this->orb_manager_ = TAO_AV_CORE::instance ()->orb_manager (); // Initialize the orb_manager @@ -167,7 +167,7 @@ Server::parse_args (int argc,char **argv) { ACE_Get_Opt opts (argc,argv,"f:p:"); - char c; + int c; while ((c = opts ()) != -1) { switch (c) |