diff options
| author | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-23 23:08:46 +0000 |
|---|---|---|
| committer | yamuna <yamuna@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-23 23:08:46 +0000 |
| commit | 78e28c96ff88af47ec476de224bad1995f8ed3ff (patch) | |
| tree | dbeae4bbd06a6f93a462a04fa01b87470158e590 /TAO/orbsvcs/tests | |
| parent | 163e65d46d567fd5ce83305a565c8cfecb1ddef7 (diff) | |
| download | ATCD-78e28c96ff88af47ec476de224bad1995f8ed3ff.tar.gz | |
Fixed compile warnings
Diffstat (limited to 'TAO/orbsvcs/tests')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index ffbca15f900..30474f8f276 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -54,7 +54,7 @@ FTP_Client_Callback::handle_timeout (void *) ACE_Message_Block mb (BUFSIZ); ACE_DEBUG ((LM_DEBUG,"FTP_Client_Callback::get_frame")); char *buf = mb.rd_ptr (); - cerr << "message block size" << mb.size () << endl; + //cerr << "message block size" << mb.size () << endl; int n = ACE_OS::fread(buf,1,mb.size (),CLIENT::instance ()->file ()); if (n < 0) { @@ -72,12 +72,14 @@ FTP_Client_Callback::handle_timeout (void *) { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); - ACE_DECLARE_NEW_CORBA_ENV; + //ACE_DECLARE_NEW_CORBA_ENV; CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_TRY_CHECK; CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV); + ACE_TRY_CHECK; //TAO_AV_CORE::instance ()->stop_run (); TAO_AV_CORE::instance ()->orb_manager ()->fini (ACE_TRY_ENV); + ACE_TRY_CHECK; return 0; } ACE_CATCHANY @@ -93,7 +95,7 @@ FTP_Client_Callback::handle_timeout (void *) else ACE_ERROR_RETURN ((LM_ERROR,"FTP_Client_Flow_Handler::fread error\n"),-1); } - cerr << "read bytes = " << n << endl; + //cerr << "read bytes = " << n << endl; mb.wr_ptr (n); int result = this->protocol_object_->send_frame (&mb); if (result < 0) diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 297c000eb4c..6dc6afcbf2b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -168,7 +168,7 @@ FTP_Client_Callback::handle_timeout (void *) ACE_Message_Block mb (BUFSIZ); ACE_DEBUG ((LM_DEBUG,"FTP_Client_Callback::get_frame")); char *buf = mb.rd_ptr (); - cerr << "message block size" << mb.size () << endl; + //cerr << "message block size" << mb.size () << endl; int n = ACE_OS::fread(buf,1,mb.size (),CLIENT::instance ()->file ()); if (n < 0) { @@ -186,12 +186,14 @@ FTP_Client_Callback::handle_timeout (void *) { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); - ACE_DECLARE_NEW_CORBA_ENV; + //ACE_DECLARE_NEW_CORBA_ENV; CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_TRY_CHECK; CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV); + ACE_TRY_CHECK; //TAO_AV_CORE::instance ()->stop_run (); TAO_AV_CORE::instance ()->orb_manager ()->fini (ACE_TRY_ENV); + ACE_TRY_CHECK; return 0; } ACE_CATCHANY @@ -207,7 +209,7 @@ FTP_Client_Callback::handle_timeout (void *) else ACE_ERROR_RETURN ((LM_ERROR,"FTP_Client_Flow_Handler::fread error\n"),-1); } - cerr << "read bytes = " << n << endl; + //cerr << "read bytes = " << n << endl; mb.wr_ptr (n); int result = this->protocol_object_->send_frame (&mb); if (result < 0) |