summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp')
-rw-r--r--TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index c2f85d715ff..df033ef129f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -110,10 +110,6 @@ be_visitor_component_ch::visit_component (be_component *node)
<< "typedef " << node->local_name () << "_var _var_type;"
<< be_nl;
-
- // Generate the static variable that we use for narrowing.
- *os << "static int _tao_class_id;" << be_nl << be_nl;
-
// Generate the static _duplicate, _narrow, and _nil operations.
*os << "// The static operations." << be_nl
<< "static " << node->local_name () << "_ptr " << "_duplicate ("
@@ -128,8 +124,8 @@ be_visitor_component_ch::visit_component (be_component *node)
// g++ problems.
*os << "static " << node->local_name () << "_ptr _nil (void)"
<< be_idt_nl << "{" << be_idt_nl
- << "return (" << node->local_name ()
- << "_ptr)0;" << be_uidt_nl
+ << "return static_cast<" << node->local_name ()
+ << "_ptr> (0);" << be_uidt_nl
<< "}" << be_uidt_nl << be_nl;
if (be_global->any_support ())