diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-05 17:01:57 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-05 17:01:57 +0000 |
| commit | b7600bf64899e37199e675bd6759d3ae5bd451aa (patch) | |
| tree | 21b28c73105d7547a7e709accb7f89fbc798344c | |
| parent | 6a0a7bb6d007fa85d0230324870c0296ad029e18 (diff) | |
| download | ATCD-b7600bf64899e37199e675bd6759d3ae5bd451aa.tar.gz | |
ChangeLogTag: Wed Feb 5 10:59:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 21cf577e5e2..af2d33877c3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Feb 5 10:59:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + + Added a missing check for typecode support before generating + the typecode for an enum. Thanks to Mario Hofmann + <Mario.Hofmann@SystemaGmbH.de> for reporting the bug. + Wed Feb 5 09:44:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/examples/ORT/Gateway_i.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp index 72ef3b80356..7d38eb9501e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp @@ -43,7 +43,14 @@ be_visitor_enum_cs::~be_visitor_enum_cs (void) int be_visitor_enum_cs::visit_enum (be_enum *node) { - if (!node->cli_stub_gen () && !node->imported () && !node->is_local ()) + if (node->cli_stub_gen () + || node->imported () + || node->is_local ()) + { + return 0; + } + + if (be_global->tc_support ()) { be_visitor_context ctx (*this->ctx_); ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN); @@ -58,9 +65,8 @@ be_visitor_enum_cs::visit_enum (be_enum *node) "TypeCode definition failed\n"), -1); } - - node->cli_stub_gen (I_TRUE); } + node->cli_stub_gen (I_TRUE); return 0; } |