diff options
Diffstat (limited to 'tests/CDR_Test.cpp')
-rw-r--r-- | tests/CDR_Test.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index ca61076c4ed..699a28e4608 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -228,7 +228,7 @@ short_stream (void) ACE_TEXT ("string transfer error")), 1); - if (ACE_OS::wscmp (wstr1, wstr)) + if (ACE_OS::strcmp (wstr1, wstr)) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("wide string transfer error")), @@ -430,7 +430,7 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const 1); // zero length ACE_Auto_Basic_Array_Ptr<ACE_CDR::WChar> auto_xwstr (wstr1); - if (ACE_OS::wslen(auto_xwstr.get () )) + if (ACE_OS::strlen(auto_xwstr.get () )) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("wstring[%d] differs\n"), i), @@ -450,7 +450,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version(), ACE::beta_version())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dn:l:")); int opt; int debug = 0; @@ -481,7 +481,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } // Sanity checks. - ACE_ASSERT (sizeof (ACE_CDR::Boolean) >= 1); + ACE_ASSERT (sizeof (ACE_CDR::Boolean) == 1); ACE_ASSERT (sizeof (ACE_CDR::Octet) == 1); ACE_ASSERT (sizeof (ACE_CDR::WChar) >= 2); ACE_ASSERT (sizeof (ACE_CDR::Short) == 2); @@ -566,3 +566,16 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +// Not necessary here, because it's instantiated in +// ace/Memory_Pool.cpp. +// template class ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +// Not necessary here, because it's instantiated in +// ace/Memory_Pool.cpp. +// #pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char> + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |