ChangeLogTag: Mon Aug 15 16:25:23 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 24 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 50dc3c4ae1a..4bfd3173c8e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Aug 15 16:25:23 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
+        
+          Removed incorrect generation of '::' before CORBA::is_nil()
+          and CORBA::release().
+
 Mon Aug 15 16:08:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_valuetype.cpp:
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 6f01b89e037..0dddeb5100a 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -109,7 +109,7 @@ be_visitor_component_cs::visit_component (be_component *node)
     {
       *os << be_nl << be_nl
           << "void" << be_nl
-          << "::CORBA::release ("
+          << "CORBA::release ("
           << node->name ()
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
@@ -119,12 +119,12 @@ be_visitor_component_cs::visit_component (be_component *node)
 
       *os << be_nl << be_nl
           << "::CORBA::Boolean" << be_nl
-          << "::CORBA::is_nil ("
+          << "CORBA::is_nil ("
           << node->name ()
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::Object_ptr obj = p;" << be_nl
-          << "return ::CORBA::is_nil (obj);" << be_uidt_nl
+          << "return CORBA::is_nil (obj);" << be_uidt_nl
           << "}";
     }
 
@@ -230,7 +230,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << bt->nested_type_name (this->ctx_->scope ())
       << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
-      << "if (! ::CORBA::is_nil (obj))" << be_idt_nl
+      << "if (! CORBA::is_nil (obj))" << be_idt_nl
       << "{" << be_idt_nl
       << "obj->_add_ref ();" << be_uidt_nl
       << "}" << be_uidt_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 f922eb8df16..32e22901508 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -81,7 +81,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->name () << "_ptr p" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
-          << "::CORBA::release (p);" << be_uidt_nl
+          << "CORBA::release (p);" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -119,22 +119,22 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << be_nl << be_nl
           << "void" << be_nl
-          << "::CORBA::release ("
+          << "CORBA::release ("
           << node->name ()
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::AbstractBase_ptr abs = p;" << be_nl
-          << "::CORBA::release (abs);" << be_uidt_nl
+          << "CORBA::release (abs);" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
           << "::CORBA::Boolean" << be_nl
-          << "::CORBA::is_nil ("
+          << "CORBA::is_nil ("
           << node->name ()
           << "_ptr p)" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::Object_ptr obj = p;" << be_nl
-          << "return ::CORBA::is_nil (obj);" << be_uidt_nl
+          << "return CORBA::is_nil (obj);" << be_uidt_nl
           << "}";
     }
 
@@ -271,7 +271,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << node->local_name () << " *_tao_tmp_pointer =" << be_idt_nl
           << "static_cast<"
           << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl
-          << "::CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
+          << "CORBA::release (_tao_tmp_pointer);" << be_uidt_nl
           << "}" << be_nl << be_nl;
     }
 
@@ -315,7 +315,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << bt->local_name ()
       << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
-      << "if (! ::CORBA::is_nil (obj))" << be_idt_nl
+      << "if (! CORBA::is_nil (obj))" << be_idt_nl
       << "{" << be_idt_nl
       << "obj->_add_ref ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
@@ -328,7 +328,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << bt->local_name ()
       << "_ptr obj)" << be_nl
       << "{" << be_idt_nl
-      << "::CORBA::release (obj);" << be_uidt_nl
+      << "CORBA::release (obj);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index f52f0b7cf71..f2b65b7f3d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -329,7 +329,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os << "{" << be_idt_nl
           << "// Obtain the real proxy stored in <base_proxy_>" << be_nl
-          << "if ( ::CORBA::is_nil (this->proxy_.in ()))" << be_idt_nl
+          << "if (CORBA::is_nil (this->proxy_.in ()))" << be_idt_nl
           << "{" << be_idt_nl
           << " // Verify whether factory is one-shot, if so disable"<<be_nl
           << " // factory temporarily or not else remove."<<be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index f3d07cabb93..46e93a19938 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -182,7 +182,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << fulltiename
       << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl
-      << "if (! ::CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
+      << "if (! CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
       << "return PortableServer::POA::_duplicate (this->poa_.in ());" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl