summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-03-25 12:42:13 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-03-25 12:42:13 +0000
commitc917cf0c31a885c6da92106fb95d59819818b2da (patch)
treef81a1156a36d5dafd00642e4ae2ad3eebae68bb0
parent91bc317fab1a00cdf0ff009f822bb63b7d5a87bf (diff)
downloadATCD-c917cf0c31a885c6da92106fb95d59819818b2da.tar.gz
*** empty log message ***
-rw-r--r--TAO/TAO_IDL/be/be_codegen.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp4
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 063de29dc5a..6d9c929ce44 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1577,7 +1577,6 @@ TAO_CodeGen::gen_stub_src_includes (void)
"tao/SystemException.h");
}
-
// Includes whatever Any template classes that may be needed.
this->gen_any_file_includes ();
@@ -1994,9 +1993,14 @@ TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream)
// this->gen_standard_include (stream,
// "tao/TypeCode.h");
+
+
this->gen_standard_include (stream,
"tao/Null_RefCount_Policy.h");
+ this->gen_standard_include (stream,
+ "tao/TypeCode_Constants.h");
+
// Just assume we're going to need alias TypeCodes since there is
// currently no alias_seen_ or typedef_seen_ flag in idl_global.
this->gen_standard_include (stream,
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
index 1c1f35e9235..bdf4a72a0b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp
@@ -66,12 +66,12 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node)
<< "static TAO::TypeCode::Union<char const *," << be_nl
<< " " << case_array_type.c_str ()
<< " const *," << be_nl
- << " TAO::Null_RefCount_Policy> const"
+ << " TAO::Null_RefCount_Policy>"
<< be_idt_nl
<< "_tao_tc_" << node->flat_name () << " (" << be_idt_nl
<< "\"" << node->repoID () << "\"," << be_nl
<< "\"" << node->original_local_name () << "\"," << be_nl
- << discriminant_type->tc_name () << "," << be_nl
+ << "&" << discriminant_type->tc_name () << "," << be_nl
<< "_tao_cases_" << node->flat_name () << "," << be_nl
<< node->nfields () << ","
<< node->default_index () << "," << be_nl;