Uninlined union destructor.

2 files changed, 8 insertions, 9 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index d4327d785a9..91fa1eec0f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -61,16 +61,7 @@ int be_visitor_union_ci::visit_union (be_union *node)
       *os << "// Inline operations for union " << node->name () << be_nl;
       *os << "// *************************************************************\n\n";
 
-      // generate the default constructor and the destructor here
       os->indent ();
-      *os << "// destructor" << be_nl
-          << "ACE_INLINE" << be_nl
-          << node->name () << "::~" << node->local_name () << " (void)" << be_nl
-          << "{" << be_idt_nl
-          << "// finalize" << be_nl
-          << "this->_reset (this->disc_, 1);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
-
       // the virtual overloaded _reset method
       *os << "// this reset method is used by the decoding engine" << be_nl;
       *os << "ACE_INLINE void" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index 59156205438..1e081b10a50 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -154,6 +154,14 @@ int be_visitor_union_cs::visit_union (be_union *node)
       os->decr_indent ();
       *os << "}\n\n";
 
+      os->indent ();
+      *os << "// destructor" << be_nl
+          << node->name () << "::~" << node->local_name () << " (void)" << be_nl
+          << "{" << be_idt_nl
+          << "// finalize" << be_nl
+          << "this->_reset (this->disc_, 1);" << be_uidt_nl
+          << "}" << be_nl << be_nl;
+
       this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
 
       // Reset this for generating the assignment operator.