summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-03-22 20:08:49 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-03-22 20:08:49 +0000
commitfbc261aabc3f09552ea56f34b22f71adc444b07e (patch)
tree75a67dcae93509f5a122c85579753ba39b44068e
parenta7443bdf0286789b05e2a037ae8980adaf086a8f (diff)
downloadATCD-fbc261aabc3f09552ea56f34b22f71adc444b07e.tar.gz
Modified the body of _tao_any_destructor() to use the node's local
name instead of its full name.
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp4
5 files changed, 11 insertions, 11 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 58ff6db1063..dbf0bd267be 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -102,9 +102,9 @@ int be_visitor_array_cs::visit_array (be_array *node)
*os << "void " << fname << "_forany"
<< "::_tao_any_destructor (void *x)" << be_nl
<< "{" << be_idt_nl
- << fname << "_slice *tmp = ACE_static_cast ("
- << fname << "_slice*,x);" << be_nl
- << fname << "_free (tmp);" << be_uidt_nl
+ << lname << "_slice *tmp = ACE_static_cast ("
+ << lname << "_slice*,x);" << be_nl
+ << lname << "_free (tmp);" << be_uidt_nl
<< "}\n\n";
// dup method
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index f9e211aa193..f959ee7dae7 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -78,8 +78,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
*os << "void "
<< node->name () << "::_tao_any_destructor (void *x)" << be_nl
<< "{" << be_idt_nl
- << node->name () << " *tmp = ACE_static_cast ("
- << node->name () << "*,x);" << be_nl
+ << node->local_name () << " *tmp = ACE_static_cast ("
+ << node->local_name () << "*,x);" << be_nl
<< "delete tmp;" << be_uidt_nl
<< "}\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index f350d2d38ef..475d007f047 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -311,8 +311,8 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
<< "void "
<< node->name () << "::_tao_any_destructor (void *x)" << be_nl
<< "{" << be_idt_nl
- << node->name () << " *tmp = ACE_static_cast ("
- << node->name () << "*,x);" << be_nl
+ << node->local_name () << " *tmp = ACE_static_cast ("
+ << node->local_name () << "*,x);" << be_nl
<< "delete tmp;" << be_uidt_nl
<< "}\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index daa59d3ce89..27aa96eaed3 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -66,8 +66,8 @@ int be_visitor_structure_cs::visit_structure (be_structure *node)
*os << "void "
<< node->name () << "::_tao_any_destructor (void *x)" << be_nl
<< "{" << be_idt_nl
- << node->name () << " *tmp = ACE_static_cast ("
- << node->name () << "*,x);" << be_nl
+ << node->local_name () << " *tmp = ACE_static_cast ("
+ << node->local_name () << "*,x);" << be_nl
<< "delete tmp;" << be_uidt_nl
<< "}\n\n";
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 bf9ec529b9f..569b9a82947 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -198,8 +198,8 @@ int be_visitor_union_cs::visit_union (be_union *node)
*os << "void "
<< node->name () << "::_tao_any_destructor (void *x)" << be_nl
<< "{" << be_idt_nl
- << node->name () << " *tmp = ACE_static_cast ("
- << node->name () << "*,x);" << be_nl
+ << node->local_name () << " *tmp = ACE_static_cast ("
+ << node->local_name () << "*,x);" << be_nl
<< "delete tmp;" << be_uidt_nl
<< "}\n" << be_nl;