ChangeLogTag: Tue Feb 15 07:09:41 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 26 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a011b2d004f..217b83403e1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -7,6 +7,19 @@ Tue Feb 15 07:09:41 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
           processed happens to be an eventtype. Also added the _ptr
           typedef, so it can be seen by a component declaration
           that occurs later in the same scope.
+          
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        
+          Changed return values of some generated methods that
+          return CORBA::Boolean to return 'true' or 'false'
+          instead of '1' or '0'.
+          
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp (_tao_duplicate):
+        
+          Added code generation to initialize the declaration of the
+          return value pointer to 0. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for making the suggestion.
 
 Tue Feb 15 10:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
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 cc46761452b..d9aa9352aad 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -268,7 +268,7 @@ be_visitor_component_cs::visit_component (be_component *node)
       << ")" << be_uidt << be_uidt_nl
       << " )" << be_nl
       << "{" << be_idt_nl
-      << "return 1; // success using local knowledge" << be_uidt_nl
+      << "return true; // success using local knowledge" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_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 91f56a51cfb..57f95a097d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -177,7 +177,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
   *os << "CORBA::Exception *" << be_nl
       << node->name () << "::_tao_duplicate (void) const" << be_nl
       << "{" << be_idt_nl
-      << "CORBA::Exception *result;" << be_nl
+      << "CORBA::Exception *result = 0;" << be_nl
       << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
       << "result," << be_nl
       << "::" << node->name () << " (*this)," << 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 50c10d3c5ac..c3ad637baa7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -411,14 +411,14 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << ")" << be_nl
       << "{" << be_idt_nl
-      << "return 1; // success using local knowledge" << be_uidt_nl
+      << "return true; // success using local knowledge" << be_uidt_nl
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl;
 
   if (node->is_abstract () || node->is_local ())
     {
-      *os << "return 0;" << be_uidt_nl;
+      *os << "return false;" << be_uidt_nl;
     }
   else
     {
@@ -447,7 +447,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << node->name () << "::marshal (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index dc10fd54e4f..1b554882495 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -57,6 +57,14 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
   // Now the valuetype definition itself.
   os->gen_ifdef_macro (node->flat_name ());
+  
+  if (node->node_type () == AST_Decl::NT_eventtype)
+    {
+      *os << be_nl << be_nl
+          << "class " << node->local_name () << "Consumer;" << be_nl
+          << "typedef " << node->local_name () << "Consumer *"
+          << node->local_name () << "Consumer_ptr;";
+    }
 
   // Now generate the class definition.
   *os << be_nl << be_nl << "class " << be_global->stub_export_macro ()