diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-03 21:00:31 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-03 21:00:31 +0000 |
| commit | f8926f5a28b6e24e6f1d48e2652781220a7bf9cd (patch) | |
| tree | 889fbaa8c36e8dff06f14e70a2d8a9297ebfdfe0 /TAO | |
| parent | bb5defae9a7ad84c6ba3e293838d8928917044f0 (diff) | |
| download | ATCD-f8926f5a28b6e24e6f1d48e2652781220a7bf9cd.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-99c | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/ast_expression.h | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index fcd68052b2d..555e2cf6b83 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,12 @@ +Mon May 3 15:53:45 1999 Jeff Parsons <parsons@cs.wustl.edu> + + * TAO_IDL/include/AST_Expression.h: + Used #if defined (ACE_LACKS_LONGLONG_T) to conditionally + define a longlong and unsigned longlong as a long and + an unsigned long, respectively. This in only to make + GreenHills/Solaris happy. Thanks to David Levine for + reporting the problem. + Mon May 03 15:26:19 1999 David L. Levine <levine@cs.wustl.edu> * tao/Object_Adapter.h: added "class" in friend diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index 68aa523697d..f39e0115ed9 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -136,8 +136,13 @@ public: long lval; // Contains long expression value unsigned long ulval; // Contains unsigned long expr value unsigned long bval; // Contains boolean expression value +#if ! defined (ACE_LACKS_LONGLONG_T) ACE_CDR::LongLong llval; // Contains long long expr value ACE_CDR::ULongLong ullval; // Contains unsigned long long expr value +#else /* ACE_LACKS_LONGLONG_T */ + ACE_CDR::Long llval; // These are solely to make + ACE_CDR::ULong ullval; // GreenHills/Solaris happy +#endif /* ACE_LACKS_LONGLONG_T */ float fval; // Contains 32-bit float expr value double dval; // Contains 64-bit float expr value char cval; // Contains char expression value |