diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-20 02:19:05 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-20 02:19:05 +0000 |
| commit | 37f623dded0794dc39adc0ac8d9e9838283b39ac (patch) | |
| tree | 9afa6b4d1284a6eee57c803a7ce55dc7145939aa /ace/CDR_Stream.h | |
| parent | ee8bf6f84b88704ccb201f22947e879b58439d30 (diff) | |
| download | ATCD-37f623dded0794dc39adc0ac8d9e9838283b39ac.tar.gz | |
ChangeLogTag: Mon Jul 19 21:13:16 1999 Doug Anderson <doug@clark.net>
Diffstat (limited to 'ace/CDR_Stream.h')
| -rw-r--r-- | ace/CDR_Stream.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h index fecf55d2fc6..13dad9d7ab5 100644 --- a/ace/CDR_Stream.h +++ b/ace/CDR_Stream.h @@ -143,7 +143,7 @@ public: # if (defined (_MSC_VER) && (_MSC_VER >= 900)) \ || (defined (__BORLANDC__) && (__BORLANDC__ >= 0x530)) typedef __int64 LongLong; - # elif ACE_SIZEOF_LONG == 8 + # elif ACE_SIZEOF_LONG == 8 && !defined(_CRAYMPP) typedef long LongLong; # elif ACE_SIZEOF_LONG_LONG == 8 && !defined (ACE_LACKS_LONGLONG_T) # if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T) && !defined (__KCC) @@ -179,11 +179,11 @@ public: # else /* ACE_SIZEOF_INT != 4 */ // Applications will probably have trouble with this. char f[4]; - # if defined(_UNICOS) - Float (void); - Float (const float &init); - float operator= (const Float &rhs) const; - int operator!= (const Float &rhs) const; + # if defined(_UNICOS) && !defined(_CRAYMPP) + Float (void); + Float (const float &init); + Float & operator= (const float &rhs); + int operator!= (const Float &rhs) const; # endif /* _UNICOS */ # endif /* ACE_SIZEOF_INT != 4 */ }; |