diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-27 08:32:21 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-27 08:32:21 +0000 |
| commit | f307344aadbcf2dd0f639510bf3248a77182177e (patch) | |
| tree | 875519022b9a2f3001bc1646b65ea86a67448ff6 | |
| parent | a5b89137a3e1056abd22a2865054a522b8ee3f4f (diff) | |
| download | ATCD-f307344aadbcf2dd0f639510bf3248a77182177e.tar.gz | |
3 files changed, 5 insertions, 8 deletions
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp index 3ac1584a6e4..7a09816a5f2 100644 --- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp @@ -16,7 +16,7 @@ #include "tao/Bounded_Object_Reference_Sequence_T.h" #include "tao/Bounded_Value_Sequence_T.h" -#include "tao/Bounded_String_Sequence_T.h" +#include "tao/Bounded_Basic_String_Sequence_T.h" #include "tao/Bounded_Array_Sequence_T.h" #include "tao/Bounded_Sequence_CDR_T.h" #include "tao/CDR.h" diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp index e493adadce1..de4b2fecc00 100644 --- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp @@ -14,8 +14,7 @@ #include "tao/String_Traits_T.h" #include "testing_allocation_traits.hpp" -#include "tao/Bounded_String_Sequence_T.h" -#include "tao/Bounded_Wstring_Sequence_T.h" +#include "tao/Bounded_Basic_String_Sequence_T.h" #include "tao/CORBA_String.h" #include "string_sequence_tester.hpp" @@ -375,14 +374,14 @@ init_unit_test_suite(int, char*[]) BOOST_TEST_SUITE("bounded string sequence unit test"); { - typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence; + typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence; typedef Tester<s_sequence> nTester; boost::shared_ptr<nTester> tester(nTester::allocate()); tester->add_all(ts); } { - typedef TAO::bounded_wstring_sequence<MAXIMUM> w_sequence; + typedef TAO::bounded_basic_string_sequence<CORBA::WChar, MAXIMUM> w_sequence; typedef Tester<w_sequence> wTester; boost::shared_ptr<wTester> tester(wTester::allocate()); tester->add_all(ts); diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp index 0cbb69be858..5adc30287b1 100644 --- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp @@ -12,9 +12,7 @@ #include "testing_allocation_traits.hpp" #include "testing_range_checking.hpp" -#include "tao/Unbounded_String_Sequence_T.h" -#include "tao/Unbounded_Wstring_Sequence_T.h" -#include "tao/Unbounded_Wstring_Sequence_T.h" +#include "tao/Unbounded_Basic_String_Sequence_T.h" #include "tao/CORBA_String.h" #include "string_sequence_tester.hpp" |