summaryrefslogtreecommitdiff
path: root/ace/IOStream.h
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-08 14:03:32 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-08 14:03:32 +0000
commitf02f1491145ee866a1a8aff7ee37b5c393b64ab5 (patch)
tree33d0f0287faf3d305c06501160cf83d08b65d509 /ace/IOStream.h
parentec190d015f8a5b701dbf803e393afabbb16a2968 (diff)
downloadATCD-f02f1491145ee866a1a8aff7ee37b5c393b64ab5.tar.gz
added ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS and ACE_LACKS_CHAR_RIGHT_SHIFTS support.
Diffstat (limited to 'ace/IOStream.h')
-rw-r--r--ace/IOStream.h16
1 files changed, 14 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)