diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-04 14:20:52 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-04 14:20:52 +0000 |
| commit | aef08effe6190f3793eba01f8a1a6fcf4e2ba5ed (patch) | |
| tree | 7689214cc55e7ec9c191904d3ecd873f3dfbcb6c /ace | |
| parent | a3087518bb259edd784c56eb74966d05dded0ba8 (diff) | |
| download | ATCD-aef08effe6190f3793eba01f8a1a6fcf4e2ba5ed.tar.gz | |
ChangeLogTag: Tue Sep 4 09:14:36 2001 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/CDR_Stream.cpp | 14 | ||||
| -rw-r--r-- | ace/CDR_Stream.i | 11 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 6 |
3 files changed, 28 insertions, 3 deletions
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp index 38c871864f7..831b1b3876e 100644 --- a/ace/CDR_Stream.cpp +++ b/ace/CDR_Stream.cpp @@ -1400,6 +1400,20 @@ ACE_InputCDR::reset_contents (void) // -------------------------------------------------------------- +#if defined (VXWORKS) && defined (ghs) +ACE_CDR::Boolean +ACE_OutputCDR::write_float (ACE_CDR::Float x) +{ + return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x)); +} + +ACE_CDR::Boolean +ACE_InputCDR::read_float (ACE_CDR::Float &x) +{ + return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x)); +} +#endif /* VXWORKS && ghs */ + ACE_CDR::Boolean operator<< (ACE_OutputCDR &os, const ACE_CString &x) { diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i index de0d13e70cb..cfea878b357 100644 --- a/ace/CDR_Stream.i +++ b/ace/CDR_Stream.i @@ -222,11 +222,13 @@ ACE_OutputCDR::write_ulonglong (const ACE_CDR::ULongLong &x) return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*,&x)); } +#if !defined (VXWORKS) || !defined (ghs) ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::write_float (ACE_CDR::Float x) { return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x)); } +#endif /* !VXWORKS || !ghs */ ACE_INLINE ACE_CDR::Boolean ACE_OutputCDR::write_double (const ACE_CDR::Double &x) @@ -569,12 +571,13 @@ ACE_InputCDR::read_ulonglong (ACE_CDR::ULongLong &x) return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x)); } +#if !defined (VXWORKS) || !defined (ghs) ACE_INLINE ACE_CDR::Boolean ACE_InputCDR::read_float (ACE_CDR::Float &x) { return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x)); } - +#endif /* !VXWORKS || !ghs */ ACE_INLINE ACE_CDR::Boolean ACE_InputCDR::read_double (ACE_CDR::Double &x) @@ -846,8 +849,10 @@ ACE_InputCDR::skip_ulonglong (void) ACE_INLINE ACE_CDR::Boolean ACE_InputCDR::skip_float (void) { - float x; - return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*,&x)); + // Changing this removes the warning for GHS and it + // stops the compiler from getting an internal error. + ACE_CDR::ULong value; + return this->read_4 (&value); } ACE_INLINE ACE_CDR::Boolean diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index 0b548268903..240ed0692e2 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -63,6 +63,12 @@ # include "ace/config-ghs-common.h" # define ACE_LACKS_UNISTD_H +# define ACE_LACKS_IOSTREAM_TOTALLY + +// Short-circuit the include of <arpa/inet.h> +// Green Hills has a problem with multiply defined functions +// with different parameters. +# define __INCineth #elif defined (__DCPLUSPLUS__) // Diab 4.2a or later. |