Wed Jan 31 15:00:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 35 insertions, 36 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 597d502b68b..152d44e9073 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan 31 15:00:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+          Layout improvements for the generated code now we don't generate
+          emulated exception macros
+
 Wed Jan 31 14:44:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index fe23f84f78c..88b1d1db183 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -149,39 +149,36 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
       // emit  nested variation of any operators
       *os << be_nl << be_nl
-          << "// Copying insertion." << be_nl
+          << "/// Copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << "_ptr _tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << node->local_name () << "_ptr _tao_objptr =" << be_idt_nl
           << node->local_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
           << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
-      *os << "// Non-copying insertion." << be_nl
+      *os << "/// Non-copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << "_ptr *_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
           << be_idt << be_idt_nl
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*_tao_elem)" << be_uidt
+          << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       *os << "::CORBA::Boolean" << be_nl
           << "operator>>= (" << be_idt << be_idt_nl
           << "const ::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << "_ptr &_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << "_ptr &_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::extract ("
@@ -189,8 +186,8 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt << be_uidt_nl
+          << "_tao_elem)" << be_uidt << be_uidt
+          << be_uidt << be_uidt_nl
           << "}";
 
       be_util::gen_nested_namespace_end (os, module);
@@ -200,41 +197,38 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
     }
 
   *os << be_global->core_versioning_begin () << be_nl;
-  
+
   *os << be_nl << be_nl
-      << "// Copying insertion." << be_nl
+      << "/// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr _tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl
       << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
       << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr *_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "*_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "*_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr &_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr &_tao_elem)" << be_uidt << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::extract ("
@@ -242,9 +236,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
-      << "}";
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
+      << "}" << be_nl;
 
   *os << be_global->core_versioning_end () << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 468e5c56e06..79a828435b0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -69,8 +69,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
-      << "const " << node->full_name () << "_ptr _tao_objref" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->full_name () << "_ptr _tao_objref)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (node->is_abstract ())
@@ -95,8 +95,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
-      << node->full_name () << "_ptr &_tao_objref" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << "_ptr &_tao_objref)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   if (node->is_abstract ())
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
index 3d62e15856b..640572ba84c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
@@ -104,8 +104,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << " *_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::add_ref (_tao_elem);" << be_nl
           << "_tao_any <<= &_tao_elem;" << be_uidt_nl
@@ -115,16 +114,14 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << " **_tao_elem)" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
           << be_idt << be_idt_nl
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*_tao_elem);" << be_uidt << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       *os << "::CORBA::Boolean" << be_nl