diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-31 14:11:02 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-31 14:11:02 +0000 |
| commit | df236529171700e18bce6670227f792c8dc76849 (patch) | |
| tree | 9dac93dcad2544dbe39c138072950b5a0cde87bb /TAO | |
| parent | f82aaf0208e3ad1df82a7db538791ef97caa744a (diff) | |
| download | ATCD-df236529171700e18bce6670227f792c8dc76849.tar.gz | |
ChangeLogTag: Tue Aug 31 09:06:40 2004 Dale Wilson <wilson_d@ociweb.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 23 | ||||
| -rw-r--r-- | TAO/interop-tests/wchar/interop_wchar_i.cpp | 6 |
2 files changed, 17 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c44433c7993..bd0f2bc51d2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 31 09:06:40 2004 Dale Wilson <wilson_d@ociweb.com> + + * interop-tests/wchar/interop_wchar_i.cpp: + Another exception emulation problem. + Tue Aug 31 13:43:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Transport.cpp (dump_iov): @@ -24,9 +29,9 @@ Tue Aug 31 09:23:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> Mon Aug 30 23:03:48 2004 J.T. Conklin <jtc@acorntoolworks.com> - * tao/Makefile.am: + * tao/Makefile.am: - Update after Portable Server refactor changes. + Update after Portable Server refactor changes. Mon Aug 30 18:14:49 2004 Jeff Parsons <j.parsons@vanderbilt.edu> @@ -45,16 +50,16 @@ Mon Aug 30 18:14:49 2004 Jeff Parsons <j.parsons@vanderbilt.edu> Mon Aug 30 12:27:38 2004 Ossama Othman <ossama@dre.vanderbilt.edu> - * orbsvcs/examples/Security/Send_File/README: + * orbsvcs/examples/Security/Send_File/README: - Added note that "-SSLNoProtection" flag must be set when running - IIOP client to SSLIOP server test. Thanks to Jules Colding - <jules at tdcadsl dot dk> for pointing out the inconsistency. + Added note that "-SSLNoProtection" flag must be set when running + IIOP client to SSLIOP server test. Thanks to Jules Colding + <jules at tdcadsl dot dk> for pointing out the inconsistency. - * orbsvcs/examples/Security/Send_File/server.conf: + * orbsvcs/examples/Security/Send_File/server.conf: - Enabled "-SSLNoProtection" flag to server configuration to allow - IIOP client to SSLIOP server test to work as documented. + Enabled "-SSLNoProtection" flag to server configuration to allow + IIOP client to SSLIOP server test to work as documented. Mon Aug 30 14:24:20 2004 Dale Wilson <wilson_d@ociweb.com> diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp index d7cf8d4dae2..47e04dd4e5d 100644 --- a/TAO/interop-tests/wchar/interop_wchar_i.cpp +++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp @@ -98,7 +98,7 @@ interop_WChar_Passer_i::warray_from_server (CORBA::Short key CORBA::Boolean interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test, CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { return @@ -115,9 +115,9 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key { interop::wstruct_var ws = new interop::wstruct (); ws->st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (interop::wstruct.nil ()); + ACE_CHECK_RETURN (0); ws->st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (interop::wstruct.nil ()); + ACE_CHECK_RETURN (0); ref_.assign_warray (key, ws->st_array); ws->st_any <<= ref_.get_wstring(key); return ws._retn (); |