diff options
Diffstat (limited to 'TAO/tao/CDR.cpp')
| -rw-r--r-- | TAO/tao/CDR.cpp | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 6101e0b01be..53361ea9f6a 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -3,7 +3,6 @@ #include "tao/CDR.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" -#include "tao/Environment.h" #include "tao/SystemException.h" #include "tao/GIOP_Fragmentation_Strategy.h" @@ -182,31 +181,31 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block, } void -TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL) +TAO_OutputCDR::throw_stub_exception (int error_num ) { switch (error_num) { case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); + throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); ACE_NOTREACHED (break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); ACE_NOTREACHED (break); #endif case EACCES : // wchar but no codeset - ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); + throw ( ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); ACE_NOTREACHED (break); default : - ACE_THROW (CORBA::MARSHAL ()); + throw ::CORBA::MARSHAL (); } } void -TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) +TAO_OutputCDR::throw_skel_exception (int error_num ) { switch (error_num) { @@ -214,23 +213,23 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES)); ACE_NOTREACHED (break); case EACCES : // wchar but no codeset - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 23, + throw ( ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 23, CORBA::COMPLETED_YES)); ACE_NOTREACHED (break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); ACE_NOTREACHED (break); #endif default : - ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); } } @@ -274,51 +273,51 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, } void -TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL) +TAO_InputCDR::throw_stub_exception (int error_num ) { switch (error_num) { case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); + throw ( ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); #endif case EACCES : // wchar but no codeset - ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); + throw ( ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); default : - ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); + throw ( ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); } } void -TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) +TAO_InputCDR::throw_skel_exception (int error_num ) { switch (error_num) { case 0 : break; case EINVAL : // wchar from a GIOP 1.0 - ACE_THROW (CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); + throw ( ::CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO)); ACE_NOTREACHED(break); case EACCES : // wchar but no codeset - ACE_THROW (CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO)); + throw ( ::CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO)); ACE_NOTREACHED(break); #if (ERANGE != EINVAL) case ERANGE : // untranslatable character - ACE_THROW (CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); + throw ( ::CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO)); ACE_NOTREACHED(break); #endif default : - ACE_THROW (CORBA::MARSHAL()); + throw ( ::CORBA::MARSHAL()); } } |