diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-13 16:31:59 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-13 16:31:59 +0000 |
| commit | e614610be089b44b562bdd8dc7d6709704bba40d (patch) | |
| tree | 2b3e2c8cadd56adfa906e865ef546a077acaccb4 | |
| parent | 53d844684084ce7a3d0d38739210007cf1f32c9c (diff) | |
| download | ATCD-e614610be089b44b562bdd8dc7d6709704bba40d.tar.gz | |
ChangeLogTag:Fri May 13 09:31:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b1b8a67d351..6a5ab3fd71a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri May 13 09:31:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/TypeCodeFactory/TypeCodeFactory_i.cpp (check_recursion): + + Fixed emulated exception usage error. + Fri May 13 00:04:16 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/Recursive_Type_TypeCode.h: diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index ab4842ada2b..02772abddb2 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -1915,18 +1915,18 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, { CORBA::ULong const nfields = unaliased_member->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (false); for (CORBA::ULong i = 0; i < nfields; ++i) { CORBA::TypeCode_var member_tc = unaliased_member->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (false); CORBA::TCKind const member_tc_kind = member_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (false); if (member_tc_kind == CORBA::TAO_TC_KIND_COUNT) { @@ -2003,11 +2003,11 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind, { CORBA::TypeCode_var content_tc = unaliased_member->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (false); CORBA::TCKind const content_tc_kind = content_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (false); if (content_tc_kind == CORBA::TAO_TC_KIND_COUNT) { |