diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-26 08:51:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-26 08:51:19 +0000 |
| commit | 33e7f422cfd6bdbe288cc1820574cfe859d7ded9 (patch) | |
| tree | be46040948d67a30fb3239641602d804116be471 /TAO/tests/Sequence_Unit_Tests | |
| parent | 7e5ccd5ef16d5b4ec26444a592da74351b78dfc6 (diff) | |
| download | ATCD-33e7f422cfd6bdbe288cc1820574cfe859d7ded9.tar.gz | |
Thu Mar 26 08:52:23 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
* tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp:
* tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
* tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
Only test wchar when it is available
Diffstat (limited to 'TAO/tests/Sequence_Unit_Tests')
4 files changed, 8 insertions, 3 deletions
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 01a9fb09d04..c6d58b3389e 100644 --- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp @@ -346,11 +346,12 @@ int ACE_TMAIN(int,ACE_TCHAR*[]) status += myntester.test_all(); +#if defined(ACE_HAS_WCHAR) typedef TAO::bounded_basic_string_sequence<CORBA::WChar, MAXIMUM> w_sequence; typedef Tester<w_sequence> wTester; wTester mywtester; - status += mywtester.test_all(); +#endif return status; } diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp index a70089ecb79..6893ef187fb 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp @@ -61,6 +61,7 @@ struct helper <char> } }; +#if defined(ACE_HAS_WCHAR) template<> struct helper <CORBA::WChar> { @@ -95,6 +96,7 @@ struct helper <CORBA::WChar> return ACE_OS::strcmp (lhs, rhs) == 0; } }; +#endif template<class charT> struct Tester diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp index ffcb4923845..ab3820281cc 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp +++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_tester.hpp @@ -62,6 +62,7 @@ struct string_sequence_test_helpers<char> } }; +#if defined(ACE_HAS_WCHAR) template<> struct string_sequence_test_helpers<CORBA::WChar> { @@ -101,8 +102,7 @@ struct string_sequence_test_helpers<CORBA::WChar> return ACE_OS::strcmp(value, L"") == 0; } }; - - +#endif /* ACE_HAS_WCHAR */ template<class tested_sequence> struct string_sequence_tester 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 58f9b30fa8a..cc497b138ea 100644 --- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp @@ -494,11 +494,13 @@ int ACE_TMAIN(int,ACE_TCHAR*[]) status += ntester.test_all (); } +#if defined(ACE_HAS_WCHAR) { typedef Tester<unbounded_basic_string_sequence <CORBA::WChar> > wTester; wTester wtester; status += wtester.test_all (); } +#endif return status; } |