ChangeLogTag: Fri Sep 9 11:08:40 2005 Simon McQueen <sm@prismtech.com>

8 files changed, 142 insertions, 1 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c58b3b988f4..76dc035ac6d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,6 +1,24 @@
 Fri Sep  9 11:08:40 2005  Simon McQueen  <sm@prismtech.com>
 
-	* 
+        * tao/orb.idl:
+
+          Add include of WrongTransaction.pidl.
+
+        * tao/WrongTransaction.pidl:
+
+          Update generation instructions.
+
+        * tao/WrongTransactionS.h:
+        * tao/WrongTransactionS.inl:
+
+          Add these new 'handcrafted' files. These changes fix
+          bug #1813.
+
+        * tests/Bug_1813_Regression/Bug_1813_Regession.mpc:
+        * tests/Bug_1813_Regression/Test.idl:
+        * tests/Bug_1813_Regression/test.cpp:
+
+          Regression test for the above.
 
 Fri Sep  9 10:28:11 2005  Simon McQueen  <sm@prismtech.com>
 
diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
index 47cc10c04c7..641a75c8fcd 100644
--- a/TAO/tao/WrongTransaction.pidl
+++ b/TAO/tao/WrongTransaction.pidl
@@ -20,6 +20,7 @@
  * and then:
  *
  * cp orig/WrongTransactionC.{h,inl,cpp} .
+ * cp orig/WrongTransactionS.{h.inl} .
  *
  */
 #ifndef TAO_CORBA_WRONGTRANSACTION_PIDL
diff --git a/TAO/tao/WrongTransactionS.h b/TAO/tao/WrongTransactionS.h
new file mode 100644
index 00000000000..8dfb6c70d6c
--- /dev/null
+++ b/TAO/tao/WrongTransactionS.h
@@ -0,0 +1,65 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:373
+
+#ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONS_H_
+#define _TAO_IDL_ORIG_WRONGTRANSACTIONS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "WrongTransactionC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+  
+
+// TAO_IDL - Generated from
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from 
+// E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1072
+
+
+#if defined (__ACE_INLINE__)
+#include "WrongTransactionS.inl"
+#endif /* defined INLINE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/WrongTransactionS.inl b/TAO/tao/WrongTransactionS.inl
new file mode 100755
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/WrongTransactionS.inl
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index f26fe1c5fec..ad528ccd617 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -35,6 +35,7 @@
 #include <tao/ParameterMode.pidl>
 #include <tao/orb_types.pidl>
 #include <tao/Typecode_types.pidl>
+//#include <tao/WrongTransaction.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
new file mode 100755
index 00000000000..679a47c31c8
--- /dev/null
+++ b/TAO/tests/Bug_1813_Regression/Bug_1813_Regession.mpc
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project (*Test) : taoserver {
+
+    Source_Files {
+        test.cpp
+    }
+}
diff --git a/TAO/tests/Bug_1813_Regression/Test.idl b/TAO/tests/Bug_1813_Regression/Test.idl
new file mode 100755
index 00000000000..2b47d41dd97
--- /dev/null
+++ b/TAO/tests/Bug_1813_Regression/Test.idl
@@ -0,0 +1,8 @@
+// $Id$
+
+#include <orb.idl>
+
+interface foo {
+     void op () raises (CORBA::WrongTransaction);
+};
+
diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp
new file mode 100755
index 00000000000..d3b463ab1f1
--- /dev/null
+++ b/TAO/tests/Bug_1813_Regression/test.cpp
@@ -0,0 +1,12 @@
+// $Id$
+
+#include "TestS.h"
+
+/**
+* This test does not run - successful compile and link == successful test.
+*/
+int
+main (int, char *[])
+{
+  return 0;
+}