ChangeLogTag: Mon Aug 11 09:05:31 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 25 insertions, 12 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 400652d76e9..c48c651a5a4 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,16 @@
+Mon Aug 11 09:05:31 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+
+          Change the name of the local pointer variable in _tao_any_destructor
+          to '_tao_tmp_pointer' from 'tmp' to avoid a name clash with an
+          IDL type called 'tmp'.
+
 Mon Aug 11 08:56:42 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/ClientRequestInterceptor_Adapter.h:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index ef356e07777..d2a65ea977b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -271,9 +271,9 @@ be_visitor_component_cs::visit_component (be_component *node)
           << node->name ()
           << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
           << "{" << be_idt_nl
-          << node->local_name () << " *tmp = ACE_static_cast ("
+          << node->local_name () << " *_tao_tmp_pointer = ACE_static_cast ("
           << node->local_name () << " *, _tao_void_pointer);" << be_nl
-          << "CORBA::release (tmp);" << be_uidt_nl
+          << "CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
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 6f5f1302214..c8d7e8a058d 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -140,9 +140,9 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << node->name ()
           << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
           << "{" << be_idt_nl
-          << node->local_name () << " *tmp = ACE_static_cast ("
+          << node->local_name () << " *_tao_tmp_pointer = ACE_static_cast ("
           << node->local_name () << "*, _tao_void_pointer);" << be_nl
-          << "delete tmp;" << be_uidt_nl
+          << "delete _tao_tmp_pointer;" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 1bb473a9fe3..ece537dc222 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -281,9 +281,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->name ()
           << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
           << "{" << be_idt_nl
-          << node->local_name () << " *tmp = ACE_static_cast ("
+          << node->local_name () << " *_tao_tmp_pointer = ACE_static_cast ("
           << node->local_name () << " *, _tao_void_pointer);" << be_nl
-          << "CORBA::release (tmp);" << be_uidt_nl
+          << "CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
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 2d9cec3e23f..65766b42d5c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -185,12 +185,12 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
           << "void * _tao_void_pointer" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
-          << node->local_name () << " * tmp =" << be_idt_nl
+          << node->local_name () << " * _tao_tmp_pointer =" << be_idt_nl
           << "ACE_static_cast (" << be_idt << be_idt_nl
           << node->local_name () << " *," << be_nl
           << "_tao_void_pointer" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
-          << "delete tmp;" << be_uidt_nl
+          << "delete _tao_tmp_pointer;" << be_uidt_nl
           << "}";
     }
 
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 a160d3c2900..40bd2d18787 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -71,9 +71,9 @@ be_visitor_structure_cs::visit_structure (be_structure *node)
           << node->name ()
           << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
           << "{" << be_idt_nl
-          << node->local_name () << " *tmp = ACE_static_cast ("
+          << node->local_name () << " *_tao_tmp_pointer = ACE_static_cast ("
           << node->local_name () << "*, _tao_void_pointer);" << be_nl
-          << "delete tmp;" << be_uidt_nl
+          << "delete _tao_tmp_pointer;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index e80369a3f12..f0f84e513c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -224,12 +224,12 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->name () 
           << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
           << "{" << be_idt_nl
-          << node->local_name () << " *tmp =" << be_idt_nl
+          << node->local_name () << " *_tao_tmp_pointer =" << be_idt_nl
           << "ACE_static_cast (" << be_idt << be_idt_nl
           << node->local_name () << " *," << be_nl
           << "_tao_void_pointer" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
-          << "CORBA::remove_ref (tmp);" << be_uidt_nl
+          << "CORBA::remove_ref (_tao_tmp_pointer);" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }