ChangeLogTag: Mon Jan 31 16:06:28 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 32 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 445c611d92e..6b2cc62df87 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,26 @@
+Mon Jan 31 16:06:28 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        
+          - In the generated _nil() method for interfaces, changed
+            the C-style cast of 0 to the *_ptr type to a C++-style
+            static_cast<>.
+            
+          - In the generated _is_a() method for the skeleton, removed
+            the unnecessary cast to char* on the first argument
+            passed to ACE_OS::strcmp().
+            
+          - Also in the generated _is_a() method for the skeleton,
+            changed the 'if (...) return 1 else return 0;' style
+            to just 'return (...)' since the expression (..)
+            already evaluates to the required boolean return type.
+            
+          Thanks to Johnny Willemsen <jwillemsen@rememedy.nl> for
+          suggesting the first two of the above changes.
+
 Mon Jan 31 15:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h:
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 8f2d23ae2f7..e2244d24285 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1889,7 +1889,7 @@ be_interface::is_a_helper (be_interface * /*derived*/,
 {
   // Emit the comparison code.
   *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "(char *)value," << be_nl
+      << "value," << be_nl
       << "\"" << bi->repoID () << "\"" << be_uidt_nl
       << ") ||" << be_uidt_nl;
 
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..71e770b2a9d 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -128,8 +128,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 ())
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 63c9f77a75e..e21027e99aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -170,8 +170,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   *os << "static " << node->local_name () << "_ptr _nil (void)"
       << be_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_nl << be_nl;
 
   if (be_global->any_support ())
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 9eda68c1af3..be9fcb60c0d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -360,7 +360,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "if (" << be_idt << be_idt_nl;
+      << "return" << be_idt_nl
+      << "(" << be_idt_nl;
 
   if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
     {
@@ -372,7 +373,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   *os << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-      << "(char *)value," << be_nl
+      << "value," << be_nl
       << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl
       << ")";
 
@@ -386,14 +387,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
 
   *os << be_uidt << be_uidt_nl
-      << " )" << be_nl
-      << "{" << be_idt_nl
-      << "return 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // the downcast method.