diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2019-01-04 15:23:09 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2019-01-04 15:23:09 -0600 |
| commit | b6cf7c9390396281e48c98c19dfc066a9fd5ae75 (patch) | |
| tree | 3a82b7a022d45154c8e98dd8da9fce97ed2fe657 | |
| parent | 0feb70a073028df03019c48530c71482b00a3e27 (diff) | |
| download | ATCD-b6cf7c9390396281e48c98c19dfc066a9fd5ae75.tar.gz | |
tao_idl: Small fixes
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_annotation_appl.cpp | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_annotation_member.cpp | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp index 8a88364c654..112a7fbee3f 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp @@ -34,7 +34,7 @@ void AST_Annotation_Appl::dump (ACE_OSTREAM_TYPE &o) { dump_i (o, "("); Params::ITERATOR iter (*params_); - Param **i; + Param **i = 0; while (!iter.done ()) { iter.next (i); @@ -54,9 +54,8 @@ void AST_Annotation_Appl::dump (ACE_OSTREAM_TYPE &o) } } -int AST_Annotation_Appl::ast_accept (ast_visitor *visitor) +int AST_Annotation_Appl::ast_accept (ast_visitor *) { - ACE_UNUSED_ARG (visitor); return 0; } @@ -118,7 +117,7 @@ AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl) Params *parameters = params (); if (parameters) { - Param **param; + Param **param = 0; for (Param::Iterator it (*parameters); !it.done (); it.advance ()) { diff --git a/TAO/TAO_IDL/ast/ast_annotation_member.cpp b/TAO/TAO_IDL/ast/ast_annotation_member.cpp index f966e66da72..2acba197bfb 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_member.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_member.cpp @@ -44,10 +44,7 @@ AST_Annotation_Member::AST_Annotation_Member ( AST_Annotation_Member::~AST_Annotation_Member () { - if (value_) - { - delete value_; - } + delete value_; } void |