diff options
Diffstat (limited to 'ace/CDR_Base.h')
| -rw-r--r-- | ace/CDR_Base.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h index 04468fa07b1..6b163161f6f 100644 --- a/ace/CDR_Base.h +++ b/ace/CDR_Base.h @@ -45,7 +45,6 @@ # include "ace/If_Then_Else.h" #endif /* !_MSC_VER || _MSC_VER >= 1310 */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Block; @@ -182,9 +181,15 @@ public: bool, unsigned char>::result_type Boolean; # endif /* _MSC_VER <= 1310 */ + +# if !defined (ACE_CDR_WCHAR_OVERRIDE) || defined(ACE_USES_WCHAR) +# undef ACE_CDR_WCHAR_OVERRIDE +# define ACE_CDR_WCHAR_OVERRIDE wchar_t +# endif + typedef unsigned char Octet; typedef char Char; - typedef ACE_WCHAR_T WChar; + typedef ACE_CDR_WCHAR_OVERRIDE WChar; typedef ACE_INT16 Short; typedef ACE_UINT16 UShort; typedef ACE_INT32 Long; @@ -304,8 +309,6 @@ public: #endif /* ACE_CDR_GIOP_MINOR_VERSION */ }; -ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "ace/CDR_Base.inl" #endif /* __ACE_INLINE__ */ |