diff options
Diffstat (limited to 'ace/IOStream.h')
| -rw-r--r-- | ace/IOStream.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h index 00f253ba81f..d98e8a3b399 100644 --- a/ace/IOStream.h +++ b/ace/IOStream.h @@ -397,7 +397,7 @@ typedef ostream& (*__omanip_)(ostream&); // These are necessary in case somebody wants to derive from us and // override one of these with a custom approach. -#if defined (ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS) +#ifdef CHORUS #define GET_FUNC_SET0(MT,CODE,CODE2) \ GET_PROT(MT,short &,CODE) \ GET_PROT(MT,u_short &,CODE) \ @@ -412,18 +412,6 @@ typedef ostream& (*__omanip_)(ostream&); GET_PROT(MT,char *,CODE) \ inline virtual MT& operator>>(__omanip_ func) CODE2 \ inline virtual MT& operator>>(__manip_ func) CODE2 -#elif defined (ACE_LACKS_CHAR_RIGHT_SHIFTS) -#define GET_FUNC_SET0(MT,CODE,CODE2) \ - GET_PROT(MT,short &,CODE) \ - GET_PROT(MT,u_short &,CODE) \ - GET_PROT(MT,int &,CODE) \ - GET_PROT(MT,u_int &,CODE) \ - GET_PROT(MT,long &,CODE) \ - GET_PROT(MT,u_long &,CODE) \ - GET_PROT(MT,float &,CODE) \ - GET_PROT(MT,double &,CODE) \ - inline virtual MT& operator>>(__omanip_ func) CODE2 \ - inline virtual MT& operator>>(__manip_ func) CODE2 #else #define GET_FUNC_SET0(MT,CODE,CODE2) \ GET_PROT(MT,short &,CODE) \ @@ -463,7 +451,7 @@ typedef ostream& (*__omanip_)(ostream&); #define GET_FUNC_SET1(MT,CODE,CODE2) GET_FUNC_SET0(MT,CODE,CODE2) #define PUT_FUNC_SET1(MT,CODE,CODE2) PUT_FUNC_SET0(MT,CODE,CODE2) #else -#if defined (ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS) +#ifdef CHORUS #define GET_FUNC_SET1(MT,CODE,CODE2) \ GET_PROT(MT,signed char &,CODE) \ GET_FUNC_SET0(MT,CODE,CODE2) |