diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/PICurrent.cpp | 17 |
2 files changed, 10 insertions, 15 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index bd9839bca04..ed1c4f2298d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Feb 12 16:01:25 2002 Ossama Othman <ossama@uci.edu> + + * tao/PICurrent.cpp (copy): + + Now that the code has been greatly simplified, an ACE_TRY block + is no longer necessary. Fixes an "unused label" warning in + emulated exception builds. + Tue Feb 12 15:02:38 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tao/ObjectReferenceTemplateC.i: Regenerated the code after the diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp index 415fbae3e38..b425c4b1146 100644 --- a/TAO/tao/PICurrent.cpp +++ b/TAO/tao/PICurrent.cpp @@ -219,21 +219,8 @@ TAO_PICurrent_Impl::copy (TAO_PICurrent_Impl &rhs, CORBA::Boolean deep_copy) this->slot_table_.size (new_size); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - for (size_t i = 0; i < new_size; ++i) - this->slot_table_[i] = t[i]; // Deep copy - } - ACE_CATCHANY - { - if (TAO_debug_level > 0) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P|%t) Error during PICurrent " - "slot table copy."); - } - ACE_ENDTRY; - ACE_CHECK; + for (size_t i = 0; i < new_size; ++i) + this->slot_table_[i] = t[i]; // Deep copy rhs.dirty (0); |