diff options
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Generic_Sequence_T.h | 2 | ||||
| -rw-r--r-- | TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp | 25 |
3 files changed, 26 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bc7762c4af9..1f37111fea5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu May 26 13:11:19 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tao/Generic_Sequence_T.h: + Added file name to doxygen documentation + + * tests/Sequence_Unit_Tests/value_sequence_tester.hpp: + Resolved Coverity warning: catching a uncaught BAD_PARAM exception. + Fri May 20 22:07:56 UTC 2011 Adam Mitz <mitza@ociweb.com> * tao/AnyTypeCode/TAO_AnyTypeCode.rc: diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index c29dcf9ee22..7b24c0e297c 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -1,7 +1,7 @@ #ifndef guard_generic_sequence_hpp #define guard_generic_sequence_hpp /** - * @file + * @file Generic_Sequence_T.h * * @brief Implement the generic version of CORBA sequences. * diff --git a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp index f07b05c0d9e..2c63dfd2a7a 100644 --- a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp +++ b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp @@ -12,6 +12,7 @@ #include "tao/Basic_Types.h" #include "test_macros.h" +#include <tao/SystemException.h> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -68,14 +69,22 @@ struct value_sequence_tester int test_index_accessor() { - tested_sequence x; - x.length(8); - // Set x[4] to any value just for suppressing valgrind complains. - x[4] = 1; - - tested_sequence const & y = x; - const_value_type & z = y[4]; - CHECK_EQUAL(z, y[4]); + try + { + tested_sequence x; + x.length(8); + // Set x[4] to any value just for suppressing valgrind complains. + x[4] = 1; + + tested_sequence const & y = x; + const_value_type & z = y[4]; + CHECK_EQUAL(z, y[4]); + } + catch (const ::CORBA::BAD_PARAM &) + { + ACE_ERROR ((LM_ERROR, "Error: test_index_accessor: BAD_PARAM exception caught\n")); + return 1; + } return 0; } |