diff options
Diffstat (limited to 'ace/CDR_Base.h')
| -rw-r--r-- | ace/CDR_Base.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h index 1caa81333ad..3721b8f4ec2 100644 --- a/ace/CDR_Base.h +++ b/ace/CDR_Base.h @@ -38,7 +38,6 @@ #include "ace/Basic_Types.h" #include "ace/Default_Constants.h" -#include "ace/If_Then_Else.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -168,15 +167,13 @@ public: * avoid complaints from all compilers is to define them all. */ //@{ - typedef ACE::If_Then_Else<(sizeof (bool) == 1), - bool, - unsigned char>::result_type Boolean; # if !defined (ACE_CDR_WCHAR_OVERRIDE) || defined(ACE_USES_WCHAR) # undef ACE_CDR_WCHAR_OVERRIDE # define ACE_CDR_WCHAR_OVERRIDE wchar_t # endif + typedef bool Boolean; typedef unsigned char Octet; typedef char Char; typedef ACE_CDR_WCHAR_OVERRIDE WChar; |