summaryrefslogtreecommitdiff
path: root/TAO/tao/CDR.cpp
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-02-11 14:44:05 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-02-11 14:44:05 +0000
commit42b041a3690a5b3b903bd35d410f360afe4f818a (patch)
tree69f59e90ba81c43cfd149c42c5c4ae691e57ec25 /TAO/tao/CDR.cpp
parent8b4ce0e024477bcdf539458d01fae6389194492b (diff)
downloadATCD-42b041a3690a5b3b903bd35d410f360afe4f818a.tar.gz
ChangeLogTag: Fri Feb 11 08:42:25 2005 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/tao/CDR.cpp')
-rw-r--r--TAO/tao/CDR.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 3c62df4c3e5..89cbe621255 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -142,9 +142,11 @@ TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
case EINVAL : // wchar from a GIOP 1.0
ACE_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, CORBA::COMPLETED_NO));
ACE_NOTREACHED(break);
+#endif
case EACCES : // wchar but no codeset
ACE_THROW(CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
ACE_NOTREACHED(break);
@@ -168,9 +170,11 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
ACE_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, CORBA::COMPLETED_YES));
ACE_NOTREACHED(break);
+#endif
default :
ACE_THROW (CORBA::MARSHAL(0, CORBA::COMPLETED_YES));
@@ -214,9 +218,11 @@ TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
case EINVAL : // wchar from a GIOP 1.0
ACE_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));
ACE_NOTREACHED(break);
+#endif
case EACCES : // wchar but no codeset
ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES));
ACE_NOTREACHED(break);
@@ -240,9 +246,11 @@ TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
ACE_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));
ACE_NOTREACHED(break);
+#endif
default :
ACE_THROW (CORBA::MARSHAL());