diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-23 08:42:10 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-23 08:42:10 +0000 |
commit | 685d80cdd61ee53ef418f1a0c153d1efde33118c (patch) | |
tree | cb1afcdc51bbb83de68fbfa9ef730a51a22f69d7 /TAO/tao | |
parent | e64d7669db9746e2878c3695a436432c80f23165 (diff) | |
download | ATCD-685d80cdd61ee53ef418f1a0c153d1efde33118c.tar.gz |
Thu Nov 23 07:41:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/AnyTypeCode/OctetSeqA.cpp | 146 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/OctetSeqA.h | 71 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/UShortSeqA.cpp | 146 | ||||
-rw-r--r-- | TAO/tao/AnyTypeCode/UShortSeqA.h | 112 | ||||
-rw-r--r-- | TAO/tao/OctetSeq.pidl | 3 | ||||
-rw-r--r-- | TAO/tao/OctetSeqC.cpp | 124 | ||||
-rw-r--r-- | TAO/tao/OctetSeqC.h | 175 | ||||
-rw-r--r-- | TAO/tao/OctetSeqS.h | 28 | ||||
-rw-r--r-- | TAO/tao/UShortSeq.pidl | 3 | ||||
-rw-r--r-- | TAO/tao/UShortSeqC.cpp | 127 | ||||
-rw-r--r-- | TAO/tao/UShortSeqC.h | 177 | ||||
-rw-r--r-- | TAO/tao/UShortSeqS.h | 28 | ||||
-rw-r--r-- | TAO/tao/diffs/OctetSeq.diff | 21 | ||||
-rw-r--r-- | TAO/tao/diffs/UShortSeq.diff | 21 | ||||
-rw-r--r-- | TAO/tao/tao.mpc | 32 |
15 files changed, 14 insertions, 1200 deletions
diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp deleted file mode 100644 index dd6b7864968..00000000000 --- a/TAO/tao/AnyTypeCode/OctetSeqA.cpp +++ /dev/null @@ -1,146 +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 - -#include "tao/AnyTypeCode/OctetSeqA.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// be\be_visitor_typecode/alias_typecode.cpp:50 - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:937 - - -#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD -#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD -namespace TAO -{ - namespace TypeCode - { - TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - CORBA_OctetSeq_0 ( - CORBA::tk_sequence, - &CORBA::_tc_octet, - 0U); - - ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 = - &CORBA_OctetSeq_0; - - } -} - - -#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */ - -static TAO::TypeCode::Alias<char const *, - CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - _tao_tc_CORBA_OctetSeq ( - CORBA::tk_alias, - "IDL:omg.org/CORBA/OctetSeq:1.0", - "OctetSeq", - &TAO::TypeCode::tc_CORBA_OctetSeq_0); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr const _tc_OctetSeq = - &_tao_tc_CORBA_OctetSeq; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_cs.cpp:54 - - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::OctetSeq &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy ( - _tao_any, - CORBA::OctetSeq::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_OctetSeq_0, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::OctetSeq *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert ( - _tao_any, - CORBA::OctetSeq::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_OctetSeq_0, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::OctetSeq *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const CORBA::OctetSeq *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::OctetSeq *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract ( - _tao_any, - CORBA::OctetSeq::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_OctetSeq_0, - _tao_elem - ); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h deleted file mode 100644 index 8b94976cb20..00000000000 --- a/TAO/tao/AnyTypeCode/OctetSeqA.h +++ /dev/null @@ -1,71 +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:788 - -#ifndef _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_ -#define _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/OctetSeqC.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CORBA -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:53 - -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp deleted file mode 100644 index 582d15d69d0..00000000000 --- a/TAO/tao/AnyTypeCode/UShortSeqA.cpp +++ /dev/null @@ -1,146 +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 - -#include "tao/AnyTypeCode/UShortSeqA.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// be\be_visitor_typecode/alias_typecode.cpp:50 - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:937 - - -#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD -#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD -namespace TAO -{ - namespace TypeCode - { - TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - CORBA_UShortSeq_0 ( - CORBA::tk_sequence, - &CORBA::_tc_ushort, - 0U); - - ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 = - &CORBA_UShortSeq_0; - - } -} - - -#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */ - -static TAO::TypeCode::Alias<char const *, - CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - _tao_tc_CORBA_UShortSeq ( - CORBA::tk_alias, - "IDL:omg.org/CORBA/UShortSeq:1.0", - "UShortSeq", - &TAO::TypeCode::tc_CORBA_UShortSeq_0); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr const _tc_UShortSeq = - &_tao_tc_CORBA_UShortSeq; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_cs.cpp:54 - - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::UShortSeq &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy ( - _tao_any, - CORBA::UShortSeq::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_UShortSeq_0, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::UShortSeq *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert ( - _tao_any, - CORBA::UShortSeq::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_UShortSeq_0, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::UShortSeq *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const CORBA::UShortSeq *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::UShortSeq *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract ( - _tao_any, - CORBA::UShortSeq::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_UShortSeq_0, - _tao_elem - ); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h deleted file mode 100644 index 824246509de..00000000000 --- a/TAO/tao/AnyTypeCode/UShortSeqA.h +++ /dev/null @@ -1,112 +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:153 - -#ifndef _TAO_IDL_ORIG_USHORTSEQA_H_ -#define _TAO_IDL_ORIG_USHORTSEQA_H_ - -#include /**/ "ace/pre.h" - - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/UShortSeqC.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CORBA -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 - -// Traits specializations. -namespace TAO -{ -} - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&); - -// TAO_IDL - Generated from -// be\be_codegen.cpp:955 - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index 19ad732f38c..30589312738 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -17,9 +17,6 @@ * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h * OctetSeq.pidl - * - * Patches for changes to the generated code are available in the - * `diffs' directory. */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp deleted file mode 100644 index 93c712762cb..00000000000 --- a/TAO/tao/OctetSeqC.cpp +++ /dev/null @@ -1,124 +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:288 - - -#include "tao/OctetSeqC.h" -#include "tao/CDR.h" -#include "tao/ORB_Core.h" - -// TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:70 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Arg traits specializations. -namespace TAO -{ -} - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_CORBA_OCTETSEQ_CS_) -#define _CORBA_OCTETSEQ_CS_ - -CORBA::OctetSeq::OctetSeq (void) -{} - -CORBA::OctetSeq::OctetSeq ( - CORBA::ULong max - ) - : TAO::unbounded_value_sequence< - CORBA::Octet - > - (max) -{} - -CORBA::OctetSeq::OctetSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet * buffer, - CORBA::Boolean release - ) - : TAO::unbounded_value_sequence< - CORBA::Octet - > - (max, length, buffer, release) -{} - -CORBA::OctetSeq::OctetSeq ( - const OctetSeq &seq - ) - : TAO::unbounded_value_sequence< - CORBA::Octet - > - (seq) -{} - -CORBA::OctetSeq::~OctetSeq (void) -{} - -void CORBA::OctetSeq::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - OctetSeq * _tao_tmp_pointer = - static_cast<OctetSeq *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_cs.cpp:96 - -#if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_ -#define _TAO_CDR_OP_CORBA_OctetSeq_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::OctetSeq &_tao_sequence - ) -{ - return TAO::marshal_sequence(strm, _tao_sequence); -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::OctetSeq &_tao_sequence - ) -{ - return TAO::demarshal_sequence(strm, _tao_sequence); -} - -#endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h deleted file mode 100644 index ab093f703bd..00000000000 --- a/TAO/tao/OctetSeqC.h +++ /dev/null @@ -1,175 +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:154 - -#ifndef _TAO_IDL_OCTETSEQC_H_ -#define _TAO_IDL_OCTETSEQC_H_ - -#include /**/ "ace/pre.h" - - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "tao/TAO_Export.h" -#include "tao/Environment.h" -#include "tao/Sequence_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_Export - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 - -namespace CORBA -{ - - // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_CORBA_OCTETSEQ_CH_) -#define _CORBA_OCTETSEQ_CH_ - - class OctetSeq; - - typedef - TAO_FixedSeq_Var_T< - OctetSeq - > - OctetSeq_var; - - typedef - TAO_Seq_Out_T< - OctetSeq - > - OctetSeq_out; - - class TAO_Export OctetSeq - : public - TAO::unbounded_value_sequence< - CORBA::Octet - > - { - public: - OctetSeq (void); - OctetSeq (CORBA::ULong max); - OctetSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet* buffer, - CORBA::Boolean release = false - ); - OctetSeq (const OctetSeq &); - ~OctetSeq (void); - - static void _tao_any_destructor (void *); - - typedef OctetSeq_var _var_type; - typedef OctetSeq_out _out_type; - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - OctetSeq ( - CORBA::ULong length, - const ACE_Message_Block* mb - ) - : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {} -#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ - }; - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 - -// Traits specializations. -namespace TAO -{ -} - -// Workaround for a Visual Studio .NET bug where this class is not -// properly imported by an application if typedef'd or subclassed, -// resulting in 'multiply defined' link errors. The export macro -// here forces an explicit import by the application. Please see -// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 -// The problem stems from use of the type below in PortableServer, -// but we put the instantiation here because the application will -// need to see it in *C.h to avoid the error. -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_ -#define _TAO_CDR_OP_CORBA_OctetSeq_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const CORBA::OctetSeq & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - CORBA::OctetSeq & - ); - -#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ - -// TAO_IDL - Generated from -// be\be_codegen.cpp:1062 - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h deleted file mode 100644 index 17b1360599e..00000000000 --- a/TAO/tao/OctetSeqS.h +++ /dev/null @@ -1,28 +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 - -// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl index 9a6e6bd9667..b8fb7df4f34 100644 --- a/TAO/tao/UShortSeq.pidl +++ b/TAO/tao/UShortSeq.pidl @@ -14,9 +14,6 @@ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * UShortSeq.pidl - * - * Patches for changes to the generated code are available in the - * `diffs' directory. */ // ================================================================ diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp deleted file mode 100644 index 53db618d251..00000000000 --- a/TAO/tao/UShortSeqC.cpp +++ /dev/null @@ -1,127 +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:291 - - -#include "tao/UShortSeqC.h" -#include "tao/CDR.h" - -#if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:70 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Arg traits specializations. -namespace TAO -{ -} - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_CORBA_USHORTSEQ_CS_) -#define _CORBA_USHORTSEQ_CS_ - -CORBA::UShortSeq::UShortSeq (void) -{} - -CORBA::UShortSeq::UShortSeq ( - CORBA::ULong max - ) - : TAO::unbounded_value_sequence< - CORBA::UShort - > - (max) -{} - -CORBA::UShortSeq::UShortSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort * buffer, - CORBA::Boolean release - ) - : TAO::unbounded_value_sequence< - CORBA::UShort - > - (max, length, buffer, release) -{} - -CORBA::UShortSeq::UShortSeq ( - const UShortSeq &seq - ) - : TAO::unbounded_value_sequence< - CORBA::UShort - > - (seq) -{} - -CORBA::UShortSeq::~UShortSeq (void) -{} - -void CORBA::UShortSeq::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - UShortSeq * _tao_tmp_pointer = - static_cast<UShortSeq *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_cs.cpp:96 - -#if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_ -#define _TAO_CDR_OP_CORBA_UShortSeq_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::UShortSeq &_tao_sequence - ) -{ - return TAO::marshal_sequence(strm, _tao_sequence); -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::UShortSeq &_tao_sequence - ) -{ - return TAO::demarshal_sequence(strm, _tao_sequence); -} - -#endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h deleted file mode 100644 index 71584f71a87..00000000000 --- a/TAO/tao/UShortSeqC.h +++ /dev/null @@ -1,177 +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:153 - -#ifndef _TAO_IDL_ORIG_USHORTSEQC_H_ -#define _TAO_IDL_ORIG_USHORTSEQC_H_ - -#include /**/ "ace/pre.h" - - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "tao/TAO_Export.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "tao/Sequence_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_Export - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CORBA -{ - - // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_CORBA_USHORTSEQ_CH_) -#define _CORBA_USHORTSEQ_CH_ - - class UShortSeq; - - typedef - TAO_FixedSeq_Var_T< - UShortSeq - > - UShortSeq_var; - - typedef - TAO_Seq_Out_T< - UShortSeq - > - UShortSeq_out; - - class TAO_Export UShortSeq - : public - TAO::unbounded_value_sequence< - CORBA::UShort - > - { - public: - UShortSeq (void); - UShortSeq (CORBA::ULong max); - UShortSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort* buffer, - CORBA::Boolean release = false - ); - UShortSeq (const UShortSeq &); - ~UShortSeq (void); - - static void _tao_any_destructor (void *); - - typedef UShortSeq_var _var_type; - typedef UShortSeq_out _out_type; - }; - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 - -// Traits specializations. -namespace TAO -{ -} - -// Workaround for a Visual Studio .NET bug where this class is not -// properly imported by an application if typedef'd or subclassed, -// resulting in 'multiply defined' link errors. The export macro -// here forces an explicit import by the application. Please see -// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 -// The problem stems from use of the type below in DsLogAdmin, -// but we put the instantiation here because the application will -// need to see it in *C.h to avoid the error. -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - template class TAO_Export TAO::unbounded_value_sequence<CORBA::UShortSeq>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_ -#define _TAO_CDR_OP_CORBA_UShortSeq_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const CORBA::UShortSeq & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - CORBA::UShortSeq & - ); - -#endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */ - -// TAO_IDL - Generated from -// be\be_codegen.cpp:955 - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h deleted file mode 100644 index 17b1360599e..00000000000 --- a/TAO/tao/UShortSeqS.h +++ /dev/null @@ -1,28 +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 - -// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff deleted file mode 100644 index fb15f742a61..00000000000 --- a/TAO/tao/diffs/OctetSeq.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- orig/OctetSeqC.h 2005-04-08 10:17:34.108726400 +0200 -+++ OctetSeqC.h 2005-04-08 10:17:41.829828800 +0200 -@@ -141,6 +141,18 @@ - { - } - -+// Workaround for a Visual Studio .NET bug where this class is not -+// properly imported by an application if typedef'd or subclassed, -+// resulting in 'multiply defined' link errors. The export macro -+// here forces an explicit import by the application. Please see -+// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 -+// The problem stems from use of the type below in PortableServer, -+// but we put the instantiation here because the application will -+// need to see it in *C.h to avoid the error. -+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -+ template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; -+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ -+ - // TAO_IDL - Generated from - // be\be_visitor_sequence/any_op_ch.cpp:52 - diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff deleted file mode 100644 index 1938744506a..00000000000 --- a/TAO/tao/diffs/UShortSeq.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- orig/UShortSeqC.h 2005-04-08 10:17:34.909878400 +0200 -+++ UShortSeqC.h 2005-04-08 10:17:41.759728000 +0200 -@@ -133,6 +133,18 @@ - { - } - -+// Workaround for a Visual Studio .NET bug where this class is not -+// properly imported by an application if typedef'd or subclassed, -+// resulting in 'multiply defined' link errors. The export macro -+// here forces an explicit import by the application. Please see -+// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 -+// The problem stems from use of the type below in DsLogAdmin, -+// but we put the instantiation here because the application will -+// need to see it in *C.h to avoid the error. -+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -+ template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>; -+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ -+ - // TAO_IDL - Generated from - // be\be_visitor_sequence/any_op_ch.cpp:52 - diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 4e560cf25dc..a1b464fae73 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -4,6 +4,13 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers sharedname = TAO dynamicflags = TAO_BUILD_DLL + idlflags += -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode \ + -Wb,export_macro=TAO_Export \ + -Wb,export_include=tao/TAO_Export.h \ + -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ + -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h + idlflags -= -Sa -St + Source_Files(TAO_COMPONENTS) { Abstract_Servant_Base.cpp Acceptor_Filter.cpp @@ -588,22 +595,11 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers } IDL_Files { - idlflags += -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ - -Wb,export_macro=TAO_Export \ - -Wb,export_include=tao/TAO_Export.h \ - -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ - -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - idlflags -= -Sa -St GIOP.pidl >> AnyTypeCode/GIOPA.h AnyTypeCode/GIOPA.cpp } IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ - -Wb,export_macro=TAO_Export \ - -Wb,export_include=tao/TAO_Export.h \ - -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ - -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - idlflags -= -Sa -St + idlflags += -Sci CONV_FRAME.pidl >> AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CONV_FRAMEA.cpp Current.pidl >> AnyTypeCode/CurrentA.h AnyTypeCode/CurrentA.cpp IIOP.pidl >> AnyTypeCode/IIOPA.h AnyTypeCode/IIOPA.cpp @@ -624,12 +620,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers } IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ - -Wb,export_macro=TAO_Export \ - -Wb,export_include=tao/TAO_Export.h \ - -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ - -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - idlflags -= -Sa -St + idlflags += -Sci -Gse BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp @@ -637,10 +628,12 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp + OctetSeq.pidl >> AnyTypeCode/OctetSeqA.h AnyTypeCode/OctetSeqA.cpp ShortSeq.pidl >> AnyTypeCode/ShortSeqA.h AnyTypeCode/ShortSeqA.cpp StringSeq.pidl >> AnyTypeCode/StringSeqA.h AnyTypeCode/StringSeqA.cpp ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp ULongSeq.pidl >> AnyTypeCode/ULongSeqA.h AnyTypeCode/ULongSeqA.cpp + UShortSeq.pidl >> AnyTypeCode/UShortSeqA.h AnyTypeCode/UShortSeqA.cpp WCharSeq.pidl >> AnyTypeCode/WCharSeqA.h AnyTypeCode/WCharSeqA.cpp WStringSeq.pidl >> AnyTypeCode/WStringSeqA.h AnyTypeCode/WStringSeqA.cpp } @@ -654,6 +647,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/CurrentA.h AnyTypeCode/DoubleSeqA.h AnyTypeCode/FloatSeqA.h + AnyTypeCode/LongSeqA.h AnyTypeCode/IIOPA.h AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IOPA.h @@ -664,6 +658,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/ObjectIdListA.h + AnyTypeCode/OctetSeqA.h AnyTypeCode/PI_ForwardA.h AnyTypeCode/ParameterModeA.h AnyTypeCode/Policy_ForwardA.h @@ -675,6 +670,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/TimeBaseA.h AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongSeqA.h + AnyTypeCode/UShortSeqA.h AnyTypeCode/WCharSeqA.h AnyTypeCode/WStringSeqA.h AnyTypeCode/orb_typesA.h |