diff options
Diffstat (limited to 'TAO/TAO_IDL/include/ast_expression.h')
| -rw-r--r-- | TAO/TAO_IDL/include/ast_expression.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index f379f6cd1d6..390454145b9 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -167,7 +167,7 @@ public: unsigned short usval; // Contains unsigned short expr value. long lval; // Contains long expression value. unsigned long ulval; // Contains unsigned long expr value. - bool bval; // Contains boolean expression value. + unsigned long bval; // Contains boolean expression value. #if ! defined (ACE_LACKS_LONGLONG_T) ACE_CDR::LongLong llval; // Contains long long expr value. #endif /* ! defined (ACE_LACKS_LONGLONG_T) */ @@ -205,7 +205,8 @@ public: AST_Expression (long l); - AST_Expression (bool b); + AST_Expression (long l, + ExprType t); AST_Expression (unsigned long ul); @@ -290,9 +291,9 @@ public: protected: // Evaluate different sets of operators. - AST_ExprValue *eval_bin_op (EvalKind ek); + AST_ExprValue *eval_bin_op (void); - AST_ExprValue *eval_mod_op (EvalKind ek); + AST_ExprValue *eval_mod_op (void); AST_ExprValue *eval_bit_op (EvalKind ek); @@ -300,7 +301,7 @@ protected: AST_ExprValue *eval_symbol (EvalKind ek); - bool type_mismatch (ExprType et); + idl_bool type_mismatch (ExprType et); private: UTL_Scope *pd_defined_in; |