ChangeLogTag: Mon Apr 12 16:36:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 78 insertions, 218 deletions

diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl
index 1ab261609c7..1a2e0a44ab1 100644
--- a/TAO/tao/UShortSeq.pidl
+++ b/TAO/tao/UShortSeq.pidl
@@ -10,6 +10,7 @@
  *     tao_idl
  *        -o orig -Ge 1 -Sc -GT -GA
  *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include=tao/TAO_Export.h
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          UShortSeq.pidl
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
index 0b9a278dcad..72249becf3b 100644
--- a/TAO/tao/UShortSeqA.cpp
+++ b/TAO/tao/UShortSeqA.cpp
@@ -29,8 +29,8 @@
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -103,5 +103,5 @@ CORBA::Boolean operator>>= (
         CORBA::UShortSeq \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
index a766c042b4c..0b8345ec3e0 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:323
+// be\be_codegen.cpp:323
 
 
 #include "UShortSeqC.h"
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -50,7 +50,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_USHORTSEQ_CS_)
 #define _CORBA_USHORTSEQ_CS_
@@ -103,7 +103,7 @@ void CORBA::UShortSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_UShortSeq[] =
 {
@@ -145,7 +145,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_
 #define _TAO_CDR_OP_CORBA_UShortSeq_CPP_
@@ -203,7 +203,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1712
+// be\be_visitor_root/root.cpp:1633
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index a4a85d1ac05..c4374917997 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:171
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_USHORTSEQC_H_
 #define _TAO_IDL_ORIG_USHORTSEQC_H_
@@ -39,6 +39,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -69,13 +70,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_USHORTSEQ_CH_)
 #define _CORBA_USHORTSEQ_CH_
@@ -123,17 +124,17 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -141,7 +142,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version
@@ -149,12 +150,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_
 #define _TAO_CDR_OP_CORBA_UShortSeq_H_
@@ -171,12 +167,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:978
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "UShortSeqC.i"
diff --git a/TAO/tao/UShortSeqC.i b/TAO/tao/UShortSeqC.i
index 1ca0be621c3..38aa32569ba 100644
--- a/TAO/tao/UShortSeqC.i
+++ b/TAO/tao/UShortSeqC.i
@@ -26,21 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_CORBA_UShortSeq_I_
-#define _TAO_CDR_OP_CORBA_UShortSeq_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UShortSeq &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CORBA::UShortSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_UShortSeq_I_ */
-
diff --git a/TAO/tao/UShortSeqS.i b/TAO/tao/UShortSeqS.i
deleted file mode 100644
index 1d2df31bd57..00000000000
--- a/TAO/tao/UShortSeqS.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- 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/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl
index 46211bc84a2..a189dbe29c6 100644
--- a/TAO/tao/WrongTransaction.pidl
+++ b/TAO/tao/WrongTransaction.pidl
@@ -10,7 +10,7 @@
  * following command:
  *
  *   tao_idl
- *        -o orig -Ge 1 -GT -GA
+ *        -o orig -Ge 1 -GT -GA -Sc
  *        -Wb,export_macro=TAO_Export
  *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index e52519b156c..4f30655d72e 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "WrongTransactionC.h"
-#include "WrongTransactionA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -40,12 +39,12 @@ TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
   )
 {
   CORBA::String_var id;
-  
+
   if ((cdr >> id.out ()) == 0)
     {
       return 0;
     }
-  
+
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -56,7 +55,7 @@ TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
       return 0;
     }
   ACE_ENDTRY;
-  
+
   return 1;
 }
 
@@ -131,5 +130,5 @@ CORBA::Boolean operator>>= (
         CORBA::WrongTransaction \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/WrongTransactionA.h b/TAO/tao/WrongTransactionA.h
deleted file mode 100644
index add59879149..00000000000
--- a/TAO/tao/WrongTransactionA.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- 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
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONA_ANYOP_H_
-#define _TAO_IDL_ORIG_WRONGTRANSACTIONA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index ec27b7367ec..6c05568b6db 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "WrongTransactionC.h"
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -51,7 +51,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::WrongTransaction::WrongTransaction (void)
   : CORBA::UserException (
@@ -153,11 +153,16 @@ void CORBA::WrongTransaction::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
 {
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_LIB_TEXT ("This TAO-specific method is now")
+              ACE_LIB_TEXT (" deprecated and will be removed")
+              ACE_LIB_TEXT (" in future versions.\n")));
+  
   return ::CORBA::_tc_WrongTransaction;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_CORBA_WrongTransaction[] =
 {
@@ -197,7 +202,34 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_exception/cdr_op_cs.cpp:60
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::WrongTransaction &_tao_aggregate
+  )
+{
+  // First marshal the repository ID.
+  if (strm << _tao_aggregate._rep_id ())
+    {
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA::WrongTransaction&
+  )
+{
+  return 1;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1633
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 2a6da3447d8..7f3e59cb956 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
 #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
@@ -67,13 +67,13 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_WRONGTRANSACTION_CH_)
 #define _CORBA_WRONGTRANSACTION_CH_
@@ -108,25 +108,25 @@ namespace CORBA
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:125
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -134,23 +134,21 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_exception/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "WrongTransactionC.i"
diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i
index 124ddda34fe..38aa32569ba 100644
--- a/TAO/tao/WrongTransactionC.i
+++ b/TAO/tao/WrongTransactionC.i
@@ -26,32 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WrongTransaction &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::WrongTransaction&
-  )
-{
-  return 1;
-}
-
diff --git a/TAO/tao/diffs/WrongTransaction.diff b/TAO/tao/diffs/WrongTransaction.diff
deleted file mode 100644
index 5ef1f159509..00000000000
--- a/TAO/tao/diffs/WrongTransaction.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- orig/WrongTransactionC.h	Mon Feb  4 15:45:55 2002
-+++ WrongTransactionC.h	Mon Feb  4 15:56:28 2002
-@@ -23,7 +23,12 @@
- #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
-+#include "tao/Exception.h"
-+#include "tao/CDR.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
-@@ -127,6 +132,8 @@
- #if defined (__BORLANDC__)
- #pragma option pop
- #endif /* __BORLANDC__ */
-+
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
- 
- #include "ace/post.h"
- #endif /* ifndef */
---- orig/WrongTransactionC.cpp	Mon Feb  4 15:45:55 2002
-+++ WrongTransactionC.cpp	Mon Feb  4 15:56:45 2002
-@@ -21,6 +21,8 @@
- 
- #include "WrongTransactionC.h"
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
- #include "tao/PortableInterceptor.h"
-@@ -266,3 +268,4 @@
-   return 0;
- }
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */