diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-31 00:50:25 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-31 00:50:25 +0000 |
| commit | 724c7db53bd1eb1cdaae7a924352f76768bd8729 (patch) | |
| tree | 78942bbff12412c719408fc2d05b43dca8c7351b | |
| parent | 12afa2b36f94ce3f15e23884a91927a80bc40e85 (diff) | |
| download | ATCD-724c7db53bd1eb1cdaae7a924352f76768bd8729.tar.gz | |
ChangeLogTag:Fri Jul 30 19:49:29 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 11 | ||||
| -rw-r--r-- | TAO/tests/Faults/ping_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/Faults/pong.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Faults/test_i.cpp | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index b533cc10b0c..832e29643c2 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,14 @@ +Fri Jul 30 19:49:29 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tests/Faults/test_i.cpp: + Reduce the sleep time to avoid false timeouts + + * tests/Faults/pong.cpp: + * tests/Faults/ping_i.cpp: + * tests/Faults/pong.cpp: + Fixed syntax errors in last commit, Sun/CC just seems unable to + catch them. + Fri Jul 30 18:47:34 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * tests/Faults/Makefile: diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index 678944dda9e..2d3fbbd6dab 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -18,7 +18,7 @@ Ping_i::ping (Ping_ptr callback, } void -Ping_i::pong (CORBA::Environment &ACE_TRY_ENV) +Ping_i::pong (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Ping_i::pong (%P|%t)\n")); @@ -32,7 +32,7 @@ Ping_i::shutdown (CORBA::Environment &ACE_TRY_ENV) } PortableServer::POA_ptr -Ping_i::_default_POA (CORBA::Environment &ACE_TRY_ENV) +Ping_i::_default_POA (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index 20a59f70a37..6bf06030a43 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -52,7 +52,7 @@ parse_args (int argc, char *argv[]) } void -run_client (ORB_ptr orb, +run_client (CORBA::ORB_ptr orb, Ping_ptr server, Ping_ptr callback, CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index 68ceda1d6df..e0c4b248c75 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -40,7 +40,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback, callback->shutdown (is_clean, ACE_TRY_ENV); ACE_CHECK_RETURN (0); } - ACE_Time_Value tv (0, 50000); + ACE_Time_Value tv (0, 20000); ACE_OS::sleep (tv); return 0; } |