diff options
| author | sergio <sergio@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-26 03:18:52 +0000 |
|---|---|---|
| committer | sergio <sergio@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-26 03:18:52 +0000 |
| commit | e29583db5e092be0c80814ad4e04490bb617bcdc (patch) | |
| tree | 638aa22164493b620b9131bda8ac7aaedd36e19a /TAO | |
| parent | 2c3d869fb7202ce956b18d2654024d56ceaf4e98 (diff) | |
| download | ATCD-e29583db5e092be0c80814ad4e04490bb617bcdc.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 21 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_constant.cpp | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_expression.cpp | 15 |
3 files changed, 34 insertions, 8 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 1a668218570..d75b1ed5c7d 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,24 @@ +Sat Oct 25 22:05:43 1997 Sergio Flores <sergio@macarena.cs.wustl.edu> + + * TAO_IDL/ast/ast_constant.cpp (exprtype_to_string): + Added case statements to handle the rest of un-handled + enumerations from AST_Expression::ExprType. These will + handle a default value (i.e. the same case as + AST_Expression::EV_none). + + * TAO_IDL/ast/ast_expression.cpp (operator==): + * TAO_IDL/ast/ast_expression.cpp (compare): + Make the default return value I_FALSE instead of NULL which + was giving "lacks a cast" warning. + + * TAO_IDL/ast/ast_expression.cpp (fill_definition_details): + Use 0 instead of NULL to initialize pointers in the + member initialization list, again to avoid ANSI C++ forbids + implicit (void *) conversions warnings. + + * TAO_IDL/ast/ast_expression.cpp (eval_symbol): + Initialized pointers to 0. + Sat Oct 25 17:45:17 1997 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> * TAO_IDL/driver/drv_preproc.cpp: Fixed the same bug that Sumedh diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index 8dcbb412367..d17bd242159 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -113,6 +113,12 @@ exprtype_to_string(AST_Expression::ExprType et) return "void"; case AST_Expression::EV_none: return "none"; + case AST_Expression::EV_wstring: + case AST_Expression::EV_wchar: + case AST_Expression::EV_longdouble: + case AST_Expression::EV_ulonglong: + case AST_Expression::EV_longlong: + return NULL; } return NULL; } diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 7f86f014833..c385e13e004 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -62,8 +62,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -/* - * ast_expression.cc - Implementation of class AST_Expression +/* * ast_expression.cc - Implementation of class AST_Expression * * AST_Expression nodes denote IDL expressions used in the IDL input. */ @@ -84,7 +83,7 @@ AST_Expression::fill_definition_details() { pd_defined_in = idl_global->scopes()->depth() > 0 ? idl_global->scopes()->top() - : NULL; + : 0 ; pd_line = idl_global->lineno(); pd_file_name = idl_global->filename(); } @@ -1036,9 +1035,9 @@ AST_Expression::eval_un_op(AST_Expression::EvalKind ek) AST_Expression::AST_ExprValue * AST_Expression::eval_symbol(AST_Expression::EvalKind ek) { - UTL_Scope *s; - AST_Decl *d; - AST_Constant *c; + UTL_Scope *s = 0; + AST_Decl *d = 0; + AST_Constant *c = 0; /* * Is there a symbol stored? @@ -1285,7 +1284,7 @@ AST_Expression::operator==(AST_Expression *vc) case EV_none: return I_FALSE; } - return NULL; + return I_FALSE; } long @@ -1338,7 +1337,7 @@ AST_Expression::compare(AST_Expression *vc) case EV_none: return I_FALSE; } - return NULL; + return I_FALSE; } /* |