Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 16 insertions, 42 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e56b450e848..3ae5d042cc8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 24 12:25:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Instead of Environment.h generate Basic_Types.h as include
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+          Generate throw instead of ACE_THROW
+
 Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * TAO version 1.5.5 released.
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index ae563cf3e4c..d18af7c1b1b 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1625,7 +1625,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
     );
 
   this->gen_standard_include (this->client_header_,
-                              "tao/Environment.h");
+                              "tao/Basic_Types.h");
 
   // Conditionally included.
 
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 589825b354d..d966f3905a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -235,7 +235,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   *os << "void " << node->name () << "::_raise (void) const" << be_nl
       << "{" << be_idt_nl
-      << "TAO_RAISE (*this);" << be_uidt_nl
+      << "throw (*this);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "void " << node->name ()
@@ -250,14 +250,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "return;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
@@ -266,14 +259,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "TAO_OutputCDR &) const" << be_nl
           << "{" << be_idt_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
@@ -290,14 +276,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "return;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
@@ -306,14 +285,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 4061f48b16b..cab35ba9eff 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -397,14 +397,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke
       *os << be_uidt << be_uidt_nl
           << " ))" << be_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl << be_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl << be_nl;
     }