summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-03-25 11:32:29 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-03-25 11:32:29 +0000
commit7308a68fd4b8c2c45e14c858907486274afcf008 (patch)
treee6af227a8309209e3f3ec643ddba97006490dac1
parent43a9fea09d017f8f8b947dc7ecb7034f11435d70 (diff)
downloadATCD-7308a68fd4b8c2c45e14c858907486274afcf008.tar.gz
*** empty log message ***
-rw-r--r--TAO/TAO_IDL/be/be_codegen.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 7460f0e21a7..609369bba6b 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1997,6 +1997,10 @@ TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream)
"tao/Alias_TypeCode.h");
this->gen_cond_file_include (idl_global->enum_seen_,
+ "tao/TypeCode_Non_Default_Case.h",
+ stream);
+
+ this->gen_cond_file_include (idl_global->enum_seen_,
"tao/Enum_TypeCode.h",
stream);
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
index 0f8eb99a172..744e28ed970 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
@@ -65,7 +65,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
<< be_nl
<< "if (_tao_success)" << be_idt_nl
<< "{" << be_idt_nl
- << "enumerator = static_cast<" << node->name ()
+ << "_tao_enumerator = static_cast<" << node->name ()
<< "> (_tao_temp);" << be_uidt_nl
<< "}" << be_uidt_nl << be_nl
<< "return _tao_success;" << be_uidt_nl