diff options
Diffstat (limited to 'TAO/interop-tests/wchar/interop_wchar_i.cpp')
| -rw-r--r-- | TAO/interop-tests/wchar/interop_wchar_i.cpp | 78 |
1 files changed, 31 insertions, 47 deletions
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp index fdad0ebf491..df242339900 100644 --- a/TAO/interop-tests/wchar/interop_wchar_i.cpp +++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp @@ -46,16 +46,14 @@ interop_WChar_Passer_i::orb_name (void) CORBA::Boolean interop_WChar_Passer_i::wchar_to_server (CORBA::WChar test, - CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return ref_.match_wchar (key,test); } CORBA::WChar -interop_WChar_Passer_i::wchar_from_server (CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) +interop_WChar_Passer_i::wchar_from_server (CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return ref_.get_wchar (key); @@ -63,16 +61,14 @@ interop_WChar_Passer_i::wchar_from_server (CORBA::Short key CORBA::Boolean interop_WChar_Passer_i::wstring_to_server (const CORBA::WChar * test, - CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return ref_.match_wstring(key,test); } CORBA::WChar * -interop_WChar_Passer_i::wstring_from_server (CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) +interop_WChar_Passer_i::wstring_from_server (CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return CORBA::wstring_dup (ref_.get_wstring(key)); @@ -80,16 +76,14 @@ interop_WChar_Passer_i::wstring_from_server (CORBA::Short key CORBA::Boolean interop_WChar_Passer_i::warray_to_server (const interop::warray test, - CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return ref_.match_warray(key,test); } interop::warray_slice * -interop_WChar_Passer_i::warray_from_server (CORBA::Short key - ACE_ENV_ARG_DECL_NOT_USED) +interop_WChar_Passer_i::warray_from_server (CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return interop::warray_dup (ref_.get_warray(key)); @@ -97,25 +91,23 @@ 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) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { return ref_.match_wchar (key,test.st_char) && ref_.match_wstring (key,test.st_string) && ref_.match_warray (key,test.st_array) && - this->any_to_server (test.st_any,key ACE_ENV_ARG_PARAMETER); + this->any_to_server (test.st_any,key); } interop::wstruct * -interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key - ACE_ENV_ARG_DECL) +interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { interop::wstruct_var ws = new interop::wstruct (); - ws->st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER); - ws->st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER); + ws->st_char = this->wchar_from_server(key); + ws->st_string = this->wstring_from_server(key); ref_.assign_warray (key, ws->st_array); ws->st_any <<= ref_.get_wstring(key); return ws._retn (); @@ -123,21 +115,19 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key CORBA::Boolean interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test, - CORBA::Short key - ACE_ENV_ARG_DECL) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::Boolean result = 1; for (CORBA::ULong i = 0; result && i < test.length(); i++) { - result = this->wstruct_to_server(test[i], key ACE_ENV_ARG_PARAMETER); + result = this->wstruct_to_server(test[i], key); } return result; } interop::wstructseq * -interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key - ACE_ENV_ARG_DECL) +interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { interop::wstructseq_var wsListI = new interop::wstructseq(); @@ -145,8 +135,8 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key for (CORBA::ULong i = 0; i < wsListI->length(); i++) { - wsListI[i].st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER); - wsListI[i].st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER); + wsListI[i].st_char = this->wchar_from_server(key); + wsListI[i].st_string = this->wstring_from_server(key); ref_.assign_warray (key, wsListI[i].st_array); // this is to keep Cxx on TRUE64 happy // it won't cast a wide character literal (i.e. L"") @@ -160,17 +150,16 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key CORBA::Boolean interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test, - CORBA::Short key - ACE_ENV_ARG_DECL) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { switch (test._d()) { case interop::is_wchar : - return this->wchar_to_server (test.u_char(),key ACE_ENV_ARG_PARAMETER); + return this->wchar_to_server (test.u_char(),key); case interop::is_wstring : - return this->wstring_to_server (test.u_string(),key ACE_ENV_ARG_PARAMETER); + return this->wstring_to_server (test.u_string(),key); case interop::is_warray : - return this->warray_to_server (test.u_array(),key ACE_ENV_ARG_PARAMETER); + return this->warray_to_server (test.u_array(),key); default: /*return 0*/; } @@ -179,8 +168,7 @@ interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test, interop::wunion * interop_WChar_Passer_i::wunion_from_server (CORBA::Short key, - interop::wchar_types type - ACE_ENV_ARG_DECL_NOT_USED) + interop::wchar_types type) ACE_THROW_SPEC (( CORBA::SystemException )) { interop::wunion *wu = new interop::wunion (); @@ -201,8 +189,7 @@ interop_WChar_Passer_i::wunion_from_server (CORBA::Short key, CORBA::Boolean interop_WChar_Passer_i::any_to_server (const CORBA::Any &test, - CORBA::Short key - ACE_ENV_ARG_DECL) + CORBA::Short key) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::WChar wc; @@ -212,23 +199,22 @@ interop_WChar_Passer_i::any_to_server (const CORBA::Any &test, if (test >>= CORBA::Any::to_wchar(wc)) { - return this->wchar_to_server(wc,key ACE_ENV_ARG_PARAMETER); + return this->wchar_to_server(wc,key); } else if (test >>= ws) { - return this->wstring_to_server (ws,key ACE_ENV_ARG_PARAMETER); + return this->wstring_to_server (ws,key); } else if (test >>= forany) { - return this->warray_to_server (forany.in(),key ACE_ENV_ARG_PARAMETER); + return this->warray_to_server (forany.in(),key); } return 0; } CORBA::Any* interop_WChar_Passer_i::any_from_server (CORBA::Short key, - interop::wchar_types type - ACE_ENV_ARG_DECL_NOT_USED) + interop::wchar_types type) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::Any *any = new CORBA::Any; @@ -250,26 +236,24 @@ interop_WChar_Passer_i::any_from_server (CORBA::Short key, } CORBA::Any * -interop_WChar_Passer_i::any_echo (const CORBA::Any &test - ACE_ENV_ARG_DECL_NOT_USED) +interop_WChar_Passer_i::any_echo (const CORBA::Any &test) ACE_THROW_SPEC (( CORBA::SystemException )) { return new CORBA::Any (test); } void -interop_WChar_Passer_i::exception_test ( CORBA::Short key - ACE_ENV_ARG_DECL) +interop_WChar_Passer_i::exception_test ( CORBA::Short key) ACE_THROW_SPEC ((CORBA::SystemException, interop::WChar_Passer::WStringException)) { - ACE_THROW (interop::WChar_Passer::WStringException(ref_.get_except(key), - this->wchar_from_server(key ACE_ENV_ARG_PARAMETER))); + throw interop::WChar_Passer::WStringException(ref_.get_except(key), + this->wchar_from_server(key)); } void interop_WChar_Passer_i::shutdown (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown(0); } |