diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-15 10:07:13 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-15 10:07:13 +0000 |
| commit | 03b6575a9c48a3fc68c2c25b705e148b113e32cb (patch) | |
| tree | 4aa1c34b7235ac35427dd6c845e02ef53440993d | |
| parent | 85b2453b0a39877e708a6f5ba123109ffa1f08a9 (diff) | |
| download | ATCD-03b6575a9c48a3fc68c2c25b705e148b113e32cb.tar.gz | |
Wed Nov 15 10:05:00 UTC 2006 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/Oneway_Timeouts/client.cpp | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9c0b5e732e1..2e90f6d59cc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,6 +1,13 @@ +Wed Nov 15 10:05:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * tests/Oneway_Timeouts/client.cpp: + + Windows warnings removed (for Phil Mesnier). + Wed Nov 15 08:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * docs/Options.html: + Added ORBServiceConfigLoggerKey, thanks to Doug and Abdul for finding out this was lacking diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index 36be9d30ffe..ad01a67d4bf 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -352,7 +352,6 @@ int main (int ac, char *av[]) for (; i < num_requests; ++i) { - ACE_DEBUG ((LM_DEBUG, "Updating 'before' time\n")); before = ACE_High_Res_Timer::gettimeofday_hr (); try { @@ -461,7 +460,7 @@ int main (int ac, char *av[]) return 0; } - catch (CORBA::TRANSIENT &ex) + catch (CORBA::TRANSIENT &) { ACE_DEBUG ((LM_DEBUG, "caught transient exception\n")); if (force_timeout) @@ -502,7 +501,7 @@ int main (int ac, char *av[]) ACE_ERROR_RETURN ((LM_ERROR, "Error: Unexpected\n"), 1); } } - catch (CORBA::TIMEOUT &ex) + catch (CORBA::TIMEOUT &) { ACE_DEBUG ((LM_DEBUG, "caught timeout exception\n")); if (force_timeout) |