diff options
| -rw-r--r-- | ace/IOStream.h | 16 | ||||
| -rw-r--r-- | ace/README | 6 |
2 files changed, 20 insertions, 2 deletions
diff --git a/ace/IOStream.h b/ace/IOStream.h index d98e8a3b399..00f253ba81f 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. -#ifdef CHORUS +#if defined (ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS) #define GET_FUNC_SET0(MT,CODE,CODE2) \ GET_PROT(MT,short &,CODE) \ GET_PROT(MT,u_short &,CODE) \ @@ -412,6 +412,18 @@ 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) \ @@ -451,7 +463,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 -#ifdef CHORUS +#if defined (ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS) #define GET_FUNC_SET1(MT,CODE,CODE2) \ GET_PROT(MT,signed char &,CODE) \ GET_FUNC_SET0(MT,CODE,CODE2) diff --git a/ace/README b/ace/README index 33acf1336b1..e2ca109bae9 100644 --- a/ace/README +++ b/ace/README @@ -837,6 +837,12 @@ ACE_LACKS_U_LONGLONG_T Platform does not have ACE_LACKS_UALARM_PROTOTYPE Platform/compiler lacks the ualarm() prototype (e.g., Solaris) +ACE_LACKS_CHAR_RIGHT_SHIFTS Compiler does not have any istream + operator>> for chars, u_chars, or + signed chars. +ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS Compiler does not have + operator>> (istream &, u_char *) or + operator>> (istream &, signed char *) ACE_LACKS_UCONTEXT_H Platform lacks the ucontext.h file ACE_LACKS_LINEBUFFERED_STREAMBUF Platform lacks streambuf |