diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2021-06-14 15:58:44 -0500 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2021-06-14 15:58:44 -0500 |
| commit | 737b9195ece838d15d4c6d54300026a26e5d1c44 (patch) | |
| tree | e05729f4a2db94dd3d062141ecec84c417d0be73 /TAO/tao | |
| parent | 2afc6a2c504ab9a80a54c2d71efea83a0d5085c9 (diff) | |
| download | ATCD-737b9195ece838d15d4c6d54300026a26e5d1c44.tar.gz | |
Partially Respond to Review of #840
https://github.com/DOCGroup/ACE_TAO/pull/840
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Basic_Types.h | 4 | ||||
| -rw-r--r-- | TAO/tao/CDR.h | 4 | ||||
| -rw-r--r-- | TAO/tao/CDR.inl | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h index 4da95d3cd5a..31e9031dd73 100644 --- a/TAO/tao/Basic_Types.h +++ b/TAO/tao/Basic_Types.h @@ -79,8 +79,8 @@ namespace CORBA typedef ACE_CDR::Int8 Int8; typedef Int8 &Int8_out; - typedef ACE_CDR::Uint8 Uint8; - typedef Uint8 &Uint8_out; + typedef ACE_CDR::UInt8 UInt8; + typedef UInt8 &UInt8_out; typedef ACE_CDR::Int16 Int16; typedef Int16 &Int16_out; diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 6b4a769a28b..c230463502a 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -500,7 +500,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_OutputCDR::from_std_wstring x); #endif /* ACE_LACKS_STD_WSTRING */ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Int8 x); -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Uint8 x); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::UInt8 x); // CDR input operators for CORBA types @@ -541,7 +541,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os, ACE_InputCDR::to_std_wstring x); #endif /* ACE_LACKS_STD_WSTRING */ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Int8 &x); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Uint8 &x); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::UInt8 &x); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index 02ba3827fb5..3ea12fd249d 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -501,7 +501,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Int8 x) && static_cast<ACE_OutputCDR &> (os) << x; } -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::Uint8 x) +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, CORBA::UInt8 x) { return os.fragment_stream (ACE_CDR::OCTET_ALIGN, ACE_CDR::OCTET_SIZE) @@ -643,7 +643,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Int8 &x) return static_cast<ACE_InputCDR &> (is) >> x; } -ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Uint8 &x) +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::UInt8 &x) { return static_cast<ACE_InputCDR &> (is) >> x; } |