diff options
| author | vishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-30 03:43:14 +0000 |
|---|---|---|
| committer | vishal <vishal@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-30 03:43:14 +0000 |
| commit | e1256e7473841725400ccdd96d2f29862a0a4347 (patch) | |
| tree | 1b1efe80510c4116aaddb0a1bfd76b7d91960d00 | |
| parent | 91718f3d9d1ee333c5269b7926dd3e8c2e7e9f5e (diff) | |
| download | ATCD-e1256e7473841725400ccdd96d2f29862a0a4347.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 15 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp | 2 |
4 files changed, 22 insertions, 7 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index aabf87ecc4f..2c956b543d3 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -5,6 +5,21 @@ Mon Mar 29 21:27:56 1999 David L. Levine <levine@cs.wustl.edu> Mon Mar 29 20:12:12 1999 Vishal Kachroo <vishal@merengue.cs.wustl.edu> + Changed the ACE_TRY_ENV in ACE_PRINT_EXCEPTION to ACE_ANY_EXCEPTION. + * orbsvcs/orbsvcs/Time/TAO_UTO.cpp + * orbsvcs/orbsvcs/Time/TAO_TIO.cpp + * orbsvcs/orbsvcs/Time/Timer_Helper.cpp + + * TAO/examples/Simple/time: + Updated the following projects to contain Simple_util.* + Removed the obsolete files. Thanks to Barry Hoggard + <hoggard@cfx.com> for pointing this out. + + * TAO/examples/Simple/timeserver.dsp + * TAO/examples/Simple/timeclient.dsp + * TAO/examples/Simple/timeserver_static.dsp + * TAO/examples/Simple/timeclient_static.dsp + * TAO/examples/Simple/time: Updated the following projects to contain Simple_util.* Removed the obsolete files. Thanks to Barry Hoggard diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 321af53b610..b29d52f34d3 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -129,11 +129,11 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_TRY_ENV, "Exception:"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:"); } ACE_ENDTRY; ACE_CHECK_RETURN (CosTime::OTNoOverlap); - + return CosTime::OTNoOverlap; } @@ -238,7 +238,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_TRY_ENV,"Exception:"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception:"); } ACE_ENDTRY; ACE_CHECK_RETURN (CosTime::OTNoOverlap); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index c6461a5304a..d9957753beb 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -142,7 +142,7 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_TRY_ENV, "Exception:"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:"); } ACE_ENDTRY; ACE_CHECK_RETURN (CosTime::TCIndeterminate); @@ -185,7 +185,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_TRY_ENV, "Exception:"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:"); return CosTime::TIO::_nil (); } ACE_ENDTRY; @@ -220,7 +220,7 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_TRY_ENV, "Exception:"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:"); return CosTime::TIO::_nil (); } ACE_ENDTRY; diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 334541a6d55..2da2b708e98 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -130,7 +130,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_TRY_ENV, "Exception in the handle_timeout ()\n"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in the handle_timeout ()\n"); return -1; } ACE_ENDTRY; |