diff options
79 files changed, 5165 insertions, 763 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 980d6f6c7fd..fc927d88611 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,123 @@ +Tue Jul 20 15:08:09 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/AnySeqC.cpp: + * tao/AnySeqC.h: + * tao/AnySeqC.inl: + * tao/AnySeqS.h: + * tao/CharSeqC.cpp: + * tao/CharSeqC.h: + * tao/CharSeqC.inl: + * tao/CharSeqS.h: + * tao/DoubleSeqC.cpp: + * tao/DoubleSeqC.h: + * tao/DoubleSeqC.inl: + * tao/DoubleSeqS.h: + * tao/LongDoubleSeqC.cpp: + * tao/LongDoubleSeqC.h: + * tao/LongDoubleSeqC.inl: + * tao/LongDoubleSeqS.h: + * tao/LongLongSeqC.cpp: + * tao/LongLongSeqC.h: + * tao/LongLongSeqC.inl: + * tao/LongLongSeqS.h: + * tao/LongSeqC.cpp: + * tao/LongSeqC.h: + * tao/LongSeqC.inl: + * tao/LongSeqS.h: + * tao/StringSeqC.inl: + * tao/ULongLongSeqC.cpp: + * tao/ULongLongSeqC.h: + * tao/ULongLongSeqC.inl: + * tao/ULongLongSeqS.h: + * tao/WCharSeqC.cpp: + * tao/WCharSeqC.h: + * tao/WCharSeqC.inl: + * tao/WCharSeqS.h: + * tao/WStringSeqC.cpp: + * tao/WStringSeqC.h: + * tao/WStringSeqC.inl: + * tao/WStringSeqS.h: + * tao/AnySeq.pidl: + * tao/CharSeq.pidl: + * tao/DoubleSeq.pidl: + * tao/LongDoubleSeq.pidl: + * tao/LongLongSeq.pidl: + * tao/LongSeq.pidl: + * tao/ULongLongSeq.pidl: + * tao/WCharSeq.pidl: + * tao/WStringSeq.pidl: + + New files, .pidl files containing sequences of basic types + that were not already added to TAO, and the associated generated + files. Thanks to Frank Pilhofer <fp@mc.com> for urging us to + add the remaining sequences of basic types to TAO. + + * tao/OctetSeqC.inl: + + Replaced OctetSeqC.i with the above file. + + * tao/orb.idl: + + Added includes of the above new .pidl files. + + * tao/tao.mpc: + + Added source files above to the project. + + * tao/StringSeq.pidl: + + Updated suggested command line for IDL compiler. + + * tao/OctetSeqC.cpp: + * tao/OctetSeqC.h: + * tao/OctetSeqS.h: + * tao/StringSeqA.cpp: + * tao/StringSeqC.cpp: + * tao/StringSeqC.h: + * tao/StringSeqS.h: + + Regenerated the above files. + + * tao/OctetSeqC.i: + * tao/OctetSeqS.cpp: + * tao/OctetSeqS.i: + * tao/OctetSeqS_T.cpp: + * tao/OctetSeqS_T.h: + * tao/OctetSeqS_T.i: + * tao/StringSeqC.i: + + Removed these files from the repository. The .i extension is now + obsolete and all skeleton header files in TAO have been modified + to be simply dummies that the IDL compiler can include in its + generated skeleton header files, so the skeleton source, inline + and template files need no longer be compiled and linked in TAO. + + * tests/Param_Test/Param_Test.mpc: + + Removed param_test_i.cpp from the client project file. + + * tests/Param_Test/any.cpp: + * tests/Param_Test/anyop.cpp: + * tests/Param_Test/big_union.cpp: + * tests/Param_Test/complex_any.cpp: + * tests/Param_Test/complex_any.h: + * tests/Param_Test/param_test.idl: + * tests/Param_Test/param_test_i.cpp: + * tests/Param_Test/param_test_i.h: + * tests/Param_Test/ub_any_seq.cpp: + * tests/Param_Test/ub_any_seq.h: + * tests/Param_Test/ub_long_seq.cpp: + * tests/Param_Test/ub_long_seq.h: + * tests/Param_Test/ub_short_seq.cpp: + * tests/Param_Test/ub_short_seq.h: + * tests/Param_Test/ub_str_seq.cpp: + * tests/Param_Test/ub_str_seq.h: + * tests/Param_Test/ub_wstr_seq.cpp: + * tests/Param_Test/ub_wstr_seq.h: + + Replaced sequences of shorts, longs, strings, wstrings, and anys + with the newly added CORBA counterparts. + Mon Jul 19 19:00:33 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * docs/ORBEndpoint.html: diff --git a/TAO/tao/AnySeq.pidl b/TAO/tao/AnySeq.pidl new file mode 100644 index 00000000000..40fef8fb6de --- /dev/null +++ b/TAO/tao/AnySeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in AnySeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * AnySeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_ANY_SEQ_IDL +#define TAO_CORBA_ANY_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<any> AnySeq; +}; + +#endif /* TAO_CORBA_ANY_SEQ_IDL */ diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp new file mode 100644 index 00000000000..61de4eca805 --- /dev/null +++ b/TAO/tao/AnySeqC.cpp @@ -0,0 +1,224 @@ +// -*- 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:303 + + +#include "AnySeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "AnySeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_ANYSEQ_CS_) +#define _CORBA_ANYSEQ_CS_ + +CORBA::AnySeq::AnySeq (void) +{} + +CORBA::AnySeq::AnySeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::Any + > + (max) +{} + +CORBA::AnySeq::AnySeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Any * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::Any + > + (max, length, buffer, release) +{} + +CORBA::AnySeq::AnySeq ( + const AnySeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::Any + > + (seq) +{} + +CORBA::AnySeq::~AnySeq (void) +{} + +void CORBA::AnySeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + AnySeq * _tao_tmp_pointer = + static_cast<AnySeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_AnySeq_CPP_ +#define _TAO_CDR_OP_CORBA_AnySeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::AnySeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm << _tao_sequence[i]); + } + + return _tao_marshal_flag; + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::AnySeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm >> _tao_sequence[i]); + } + + return _tao_marshal_flag; + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_VarSeq_Var_T< + CORBA::AnySeq, + CORBA::Any + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::AnySeq, + CORBA::Any + >; + + template class + TAO_Seq_Out_T< + CORBA::AnySeq, + CORBA::AnySeq_var, + CORBA::Any + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + CORBA::AnySeq, \ + CORBA::Any \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::AnySeq, \ + CORBA::Any \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::AnySeq, \ + CORBA::AnySeq_var, \ + CORBA::Any \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h new file mode 100644 index 00000000000..e8b78538149 --- /dev/null +++ b/TAO/tao/AnySeqC.h @@ -0,0 +1,188 @@ +// -*- 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_ANYSEQC_H_ +#define _TAO_IDL_ORIG_ANYSEQC_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/ORB.h" +#include "tao/Environment.h" +#include "tao/Any.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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_ANYSEQ_CH_) +#define _CORBA_ANYSEQ_CH_ + + class AnySeq; + + typedef + TAO_VarSeq_Var_T< + AnySeq, + CORBA::Any + > + AnySeq_var; + + typedef + TAO_Seq_Out_T< + AnySeq, + AnySeq_var, + CORBA::Any + > + AnySeq_out; + + class TAO_Export AnySeq + : public + TAO_Unbounded_Sequence< + CORBA::Any + > + { + public: + AnySeq (void); + AnySeq (CORBA::ULong max); + AnySeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Any* buffer, + CORBA::Boolean release = 0 + ); + AnySeq (const AnySeq &); + ~AnySeq (void); + + static void _tao_any_destructor (void *); + + typedef AnySeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AnySeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::AnySeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::AnySeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AnySeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AnySeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_AnySeq_H_ +#define _TAO_CDR_OP_CORBA_AnySeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::AnySeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::AnySeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_AnySeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "AnySeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/OctetSeqC.i b/TAO/tao/AnySeqC.inl index 38aa32569ba..38aa32569ba 100644 --- a/TAO/tao/OctetSeqC.i +++ b/TAO/tao/AnySeqC.inl diff --git a/TAO/tao/OctetSeqS_T.h b/TAO/tao/AnySeqS.h index 52944262cad..c77fc413703 100644 --- a/TAO/tao/OctetSeqS_T.h +++ b/TAO/tao/AnySeqS.h @@ -26,13 +26,23 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:545 +// .\be\be_codegen.cpp:391 -#ifndef _TAO_IDL_ORIG_OCTETSEQS_T_H_ -#define _TAO_IDL_ORIG_OCTETSEQS_T_H_ +#ifndef _TAO_IDL_ORIG_ANYSEQS_H_ +#define _TAO_IDL_ORIG_ANYSEQS_H_ #include /**/ "ace/pre.h" +#include "AnySeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + #if defined(_MSC_VER) #if (_MSC_VER >= 1200) #pragma warning(push) @@ -40,34 +50,29 @@ #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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116 +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 -#if defined (ACE_HAS_USING_KEYWORD) namespace POA_CORBA { -} // module CORBA -#endif /* ACE_HAS_USING_KEYWORD */ + -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1043 - -#if defined (__ACE_INLINE__) -#include "OctetSeqS_T.i" -#endif /* defined INLINE */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "OctetSeqS_T.cpp" -#endif /* defined REQUIRED SOURCE */ +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("OctetSeqS_T.cpp") -#endif /* defined REQUIRED PRAGMA */ +} // module CORBA #if defined(_MSC_VER) && (_MSC_VER >= 1200) #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/CharSeq.pidl b/TAO/tao/CharSeq.pidl new file mode 100644 index 00000000000..dabacd3f29a --- /dev/null +++ b/TAO/tao/CharSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in CharSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * CharSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_CHAR_SEQ_IDL +#define TAO_CORBA_CHAR_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<char> CharSeq; +}; + +#endif /* TAO_CORBA_CHAR_SEQ_IDL */ diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp new file mode 100644 index 00000000000..fb913a56024 --- /dev/null +++ b/TAO/tao/CharSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "CharSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "CharSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_CHARSEQ_CS_) +#define _CORBA_CHARSEQ_CS_ + +CORBA::CharSeq::CharSeq (void) +{} + +CORBA::CharSeq::CharSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::Char + > + (max) +{} + +CORBA::CharSeq::CharSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Char * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::Char + > + (max, length, buffer, release) +{} + +CORBA::CharSeq::CharSeq ( + const CharSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::Char + > + (seq) +{} + +CORBA::CharSeq::~CharSeq (void) +{} + +void CORBA::CharSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + CharSeq * _tao_tmp_pointer = + static_cast<CharSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_CharSeq_CPP_ +#define _TAO_CDR_OP_CORBA_CharSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::CharSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_char_array ((const char *)_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::CharSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_char_array ((char *)_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::CharSeq, + CORBA::Char + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::CharSeq, + CORBA::Char + >; + + template class + TAO_Seq_Out_T< + CORBA::CharSeq, + CORBA::CharSeq_var, + CORBA::Char + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::CharSeq, \ + CORBA::Char \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::CharSeq, \ + CORBA::Char \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::CharSeq, \ + CORBA::CharSeq_var, \ + CORBA::Char \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h new file mode 100644 index 00000000000..d37a0d789ef --- /dev/null +++ b/TAO/tao/CharSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_CHARSEQC_H_ +#define _TAO_IDL_ORIG_CHARSEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_CHARSEQ_CH_) +#define _CORBA_CHARSEQ_CH_ + + class CharSeq; + + typedef + TAO_FixedSeq_Var_T< + CharSeq, + CORBA::Char + > + CharSeq_var; + + typedef + TAO_Seq_Out_T< + CharSeq, + CharSeq_var, + CORBA::Char + > + CharSeq_out; + + class TAO_Export CharSeq + : public + TAO_Unbounded_Sequence< + CORBA::Char + > + { + public: + CharSeq (void); + CharSeq (CORBA::ULong max); + CharSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Char* buffer, + CORBA::Boolean release = 0 + ); + CharSeq (const CharSeq &); + ~CharSeq (void); + + static void _tao_any_destructor (void *); + + typedef CharSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CharSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::CharSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::CharSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::CharSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::CharSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_CharSeq_H_ +#define _TAO_CDR_OP_CORBA_CharSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::CharSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::CharSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_CharSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "CharSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/OctetSeqS_T.i b/TAO/tao/CharSeqC.inl index 38aa32569ba..38aa32569ba 100644 --- a/TAO/tao/OctetSeqS_T.i +++ b/TAO/tao/CharSeqC.inl diff --git a/TAO/tao/CharSeqS.h b/TAO/tao/CharSeqS.h new file mode 100644 index 00000000000..e0257f31304 --- /dev/null +++ b/TAO/tao/CharSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_CHARSEQS_H_ +#define _TAO_IDL_ORIG_CHARSEQS_H_ + +#include /**/ "ace/pre.h" + +#include "CharSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl new file mode 100644 index 00000000000..e1589d3d5bb --- /dev/null +++ b/TAO/tao/DoubleSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in DoubleSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * DoubleSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_DOUBLE_SEQ_IDL +#define TAO_CORBA_DOUBLE_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<double> DoubleSeq; +}; + +#endif /* TAO_CORBA_DOUBLE_SEQ_IDL */ diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp new file mode 100644 index 00000000000..a96c7b628a1 --- /dev/null +++ b/TAO/tao/DoubleSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "DoubleSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "DoubleSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_DOUBLESEQ_CS_) +#define _CORBA_DOUBLESEQ_CS_ + +CORBA::DoubleSeq::DoubleSeq (void) +{} + +CORBA::DoubleSeq::DoubleSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::Double + > + (max) +{} + +CORBA::DoubleSeq::DoubleSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Double * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::Double + > + (max, length, buffer, release) +{} + +CORBA::DoubleSeq::DoubleSeq ( + const DoubleSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::Double + > + (seq) +{} + +CORBA::DoubleSeq::~DoubleSeq (void) +{} + +void CORBA::DoubleSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + DoubleSeq * _tao_tmp_pointer = + static_cast<DoubleSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ +#define _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::DoubleSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::DoubleSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::DoubleSeq, + CORBA::Double + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::DoubleSeq, + CORBA::Double + >; + + template class + TAO_Seq_Out_T< + CORBA::DoubleSeq, + CORBA::DoubleSeq_var, + CORBA::Double + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::DoubleSeq, \ + CORBA::Double \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::DoubleSeq, \ + CORBA::Double \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::DoubleSeq, \ + CORBA::DoubleSeq_var, \ + CORBA::Double \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h new file mode 100644 index 00000000000..81d525dd756 --- /dev/null +++ b/TAO/tao/DoubleSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_DOUBLESEQC_H_ +#define _TAO_IDL_ORIG_DOUBLESEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_DOUBLESEQ_CH_) +#define _CORBA_DOUBLESEQ_CH_ + + class DoubleSeq; + + typedef + TAO_FixedSeq_Var_T< + DoubleSeq, + CORBA::Double + > + DoubleSeq_var; + + typedef + TAO_Seq_Out_T< + DoubleSeq, + DoubleSeq_var, + CORBA::Double + > + DoubleSeq_out; + + class TAO_Export DoubleSeq + : public + TAO_Unbounded_Sequence< + CORBA::Double + > + { + public: + DoubleSeq (void); + DoubleSeq (CORBA::ULong max); + DoubleSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Double* buffer, + CORBA::Boolean release = 0 + ); + DoubleSeq (const DoubleSeq &); + ~DoubleSeq (void); + + static void _tao_any_destructor (void *); + + typedef DoubleSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DoubleSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::DoubleSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::DoubleSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DoubleSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DoubleSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_DoubleSeq_H_ +#define _TAO_CDR_OP_CORBA_DoubleSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::DoubleSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::DoubleSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_DoubleSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "DoubleSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/StringSeqC.i b/TAO/tao/DoubleSeqC.inl index 38aa32569ba..38aa32569ba 100644 --- a/TAO/tao/StringSeqC.i +++ b/TAO/tao/DoubleSeqC.inl diff --git a/TAO/tao/DoubleSeqS.h b/TAO/tao/DoubleSeqS.h new file mode 100644 index 00000000000..13a025b9fee --- /dev/null +++ b/TAO/tao/DoubleSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_DOUBLESEQS_H_ +#define _TAO_IDL_ORIG_DOUBLESEQS_H_ + +#include /**/ "ace/pre.h" + +#include "DoubleSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl new file mode 100644 index 00000000000..0f9789c56ad --- /dev/null +++ b/TAO/tao/LongDoubleSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in LongDoubleSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * LongDoubleSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_LONG_DOUBLE_SEQ_IDL +#define TAO_CORBA_LONG_DOUBLE_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<long double> LongDoubleSeq; +}; + +#endif /* TAO_CORBA_LONG_DOUBLE_SEQ_IDL */ diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp new file mode 100644 index 00000000000..52273dc6abb --- /dev/null +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "LongDoubleSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "LongDoubleSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_LONGDOUBLESEQ_CS_) +#define _CORBA_LONGDOUBLESEQ_CS_ + +CORBA::LongDoubleSeq::LongDoubleSeq (void) +{} + +CORBA::LongDoubleSeq::LongDoubleSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::LongDouble + > + (max) +{} + +CORBA::LongDoubleSeq::LongDoubleSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::LongDouble * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::LongDouble + > + (max, length, buffer, release) +{} + +CORBA::LongDoubleSeq::LongDoubleSeq ( + const LongDoubleSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::LongDouble + > + (seq) +{} + +CORBA::LongDoubleSeq::~LongDoubleSeq (void) +{} + +void CORBA::LongDoubleSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + LongDoubleSeq * _tao_tmp_pointer = + static_cast<LongDoubleSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ +#define _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::LongDoubleSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::LongDoubleSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::LongDoubleSeq, + CORBA::LongDouble + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::LongDoubleSeq, + CORBA::LongDouble + >; + + template class + TAO_Seq_Out_T< + CORBA::LongDoubleSeq, + CORBA::LongDoubleSeq_var, + CORBA::LongDouble + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::LongDoubleSeq, \ + CORBA::LongDouble \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::LongDoubleSeq, \ + CORBA::LongDouble \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::LongDoubleSeq, \ + CORBA::LongDoubleSeq_var, \ + CORBA::LongDouble \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h new file mode 100644 index 00000000000..a555dd14de4 --- /dev/null +++ b/TAO/tao/LongDoubleSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_LONGDOUBLESEQC_H_ +#define _TAO_IDL_ORIG_LONGDOUBLESEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_LONGDOUBLESEQ_CH_) +#define _CORBA_LONGDOUBLESEQ_CH_ + + class LongDoubleSeq; + + typedef + TAO_FixedSeq_Var_T< + LongDoubleSeq, + CORBA::LongDouble + > + LongDoubleSeq_var; + + typedef + TAO_Seq_Out_T< + LongDoubleSeq, + LongDoubleSeq_var, + CORBA::LongDouble + > + LongDoubleSeq_out; + + class TAO_Export LongDoubleSeq + : public + TAO_Unbounded_Sequence< + CORBA::LongDouble + > + { + public: + LongDoubleSeq (void); + LongDoubleSeq (CORBA::ULong max); + LongDoubleSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::LongDouble* buffer, + CORBA::Boolean release = 0 + ); + LongDoubleSeq (const LongDoubleSeq &); + ~LongDoubleSeq (void); + + static void _tao_any_destructor (void *); + + typedef LongDoubleSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongDoubleSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongDoubleSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDoubleSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongDoubleSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongDoubleSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ +#define _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::LongDoubleSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::LongDoubleSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "LongDoubleSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/OctetSeqS.i b/TAO/tao/LongDoubleSeqC.inl index 1d2df31bd57..38aa32569ba 100644 --- a/TAO/tao/OctetSeqS.i +++ b/TAO/tao/LongDoubleSeqC.inl @@ -24,3 +24,5 @@ // // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html + + diff --git a/TAO/tao/LongDoubleSeqS.h b/TAO/tao/LongDoubleSeqS.h new file mode 100644 index 00000000000..29768eca1fc --- /dev/null +++ b/TAO/tao/LongDoubleSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_LONGDOUBLESEQS_H_ +#define _TAO_IDL_ORIG_LONGDOUBLESEQS_H_ + +#include /**/ "ace/pre.h" + +#include "LongDoubleSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl new file mode 100644 index 00000000000..18af58777e1 --- /dev/null +++ b/TAO/tao/LongLongSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in LongLongSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * LongLongSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_LONGLONG_SEQ_IDL +#define TAO_CORBA_LONGLONG_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<long long> LongLongSeq; +}; + +#endif /* TAO_CORBA_LONGLONG_SEQ_IDL */ diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp new file mode 100644 index 00000000000..500fe02c505 --- /dev/null +++ b/TAO/tao/LongLongSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "LongLongSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "LongLongSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_LONGLONGSEQ_CS_) +#define _CORBA_LONGLONGSEQ_CS_ + +CORBA::LongLongSeq::LongLongSeq (void) +{} + +CORBA::LongLongSeq::LongLongSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::LongLong + > + (max) +{} + +CORBA::LongLongSeq::LongLongSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::LongLong * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::LongLong + > + (max, length, buffer, release) +{} + +CORBA::LongLongSeq::LongLongSeq ( + const LongLongSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::LongLong + > + (seq) +{} + +CORBA::LongLongSeq::~LongLongSeq (void) +{} + +void CORBA::LongLongSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + LongLongSeq * _tao_tmp_pointer = + static_cast<LongLongSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ +#define _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::LongLongSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::LongLongSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::LongLongSeq, + CORBA::LongLong + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::LongLongSeq, + CORBA::LongLong + >; + + template class + TAO_Seq_Out_T< + CORBA::LongLongSeq, + CORBA::LongLongSeq_var, + CORBA::LongLong + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::LongLongSeq, \ + CORBA::LongLong \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::LongLongSeq, \ + CORBA::LongLong \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::LongLongSeq, \ + CORBA::LongLongSeq_var, \ + CORBA::LongLong \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h new file mode 100644 index 00000000000..bf9d6055156 --- /dev/null +++ b/TAO/tao/LongLongSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_LONGLONGSEQC_H_ +#define _TAO_IDL_ORIG_LONGLONGSEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_LONGLONGSEQ_CH_) +#define _CORBA_LONGLONGSEQ_CH_ + + class LongLongSeq; + + typedef + TAO_FixedSeq_Var_T< + LongLongSeq, + CORBA::LongLong + > + LongLongSeq_var; + + typedef + TAO_Seq_Out_T< + LongLongSeq, + LongLongSeq_var, + CORBA::LongLong + > + LongLongSeq_out; + + class TAO_Export LongLongSeq + : public + TAO_Unbounded_Sequence< + CORBA::LongLong + > + { + public: + LongLongSeq (void); + LongLongSeq (CORBA::ULong max); + LongLongSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::LongLong* buffer, + CORBA::Boolean release = 0 + ); + LongLongSeq (const LongLongSeq &); + ~LongLongSeq (void); + + static void _tao_any_destructor (void *); + + typedef LongLongSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongLongSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongLongSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLongSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongLongSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongLongSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_LongLongSeq_H_ +#define _TAO_CDR_OP_CORBA_LongLongSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::LongLongSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::LongLongSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_LongLongSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "LongLongSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/LongLongSeqC.inl b/TAO/tao/LongLongSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/LongLongSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/LongLongSeqS.h b/TAO/tao/LongLongSeqS.h new file mode 100644 index 00000000000..b8a5f3235e1 --- /dev/null +++ b/TAO/tao/LongLongSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_LONGLONGSEQS_H_ +#define _TAO_IDL_ORIG_LONGLONGSEQS_H_ + +#include /**/ "ace/pre.h" + +#include "LongLongSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/LongSeq.pidl b/TAO/tao/LongSeq.pidl new file mode 100644 index 00000000000..21b0572c14e --- /dev/null +++ b/TAO/tao/LongSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in LongSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * LongSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_LONG_SEQ_IDL +#define TAO_CORBA_LONG_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<long> LongSeq; +}; + +#endif /* TAO_CORBA_LONG_SEQ_IDL */ diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp new file mode 100644 index 00000000000..8e0bb5d1a7a --- /dev/null +++ b/TAO/tao/LongSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "LongSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "LongSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_LONGSEQ_CS_) +#define _CORBA_LONGSEQ_CS_ + +CORBA::LongSeq::LongSeq (void) +{} + +CORBA::LongSeq::LongSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::Long + > + (max) +{} + +CORBA::LongSeq::LongSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Long * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::Long + > + (max, length, buffer, release) +{} + +CORBA::LongSeq::LongSeq ( + const LongSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::Long + > + (seq) +{} + +CORBA::LongSeq::~LongSeq (void) +{} + +void CORBA::LongSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + LongSeq * _tao_tmp_pointer = + static_cast<LongSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_LongSeq_CPP_ +#define _TAO_CDR_OP_CORBA_LongSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::LongSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::LongSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::LongSeq, + CORBA::Long + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::LongSeq, + CORBA::Long + >; + + template class + TAO_Seq_Out_T< + CORBA::LongSeq, + CORBA::LongSeq_var, + CORBA::Long + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::LongSeq, \ + CORBA::Long \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::LongSeq, \ + CORBA::Long \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::LongSeq, \ + CORBA::LongSeq_var, \ + CORBA::Long \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h new file mode 100644 index 00000000000..9d6d9f5f562 --- /dev/null +++ b/TAO/tao/LongSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_LONGSEQC_H_ +#define _TAO_IDL_ORIG_LONGSEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_LONGSEQ_CH_) +#define _CORBA_LONGSEQ_CH_ + + class LongSeq; + + typedef + TAO_FixedSeq_Var_T< + LongSeq, + CORBA::Long + > + LongSeq_var; + + typedef + TAO_Seq_Out_T< + LongSeq, + LongSeq_var, + CORBA::Long + > + LongSeq_out; + + class TAO_Export LongSeq + : public + TAO_Unbounded_Sequence< + CORBA::Long + > + { + public: + LongSeq (void); + LongSeq (CORBA::ULong max); + LongSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Long* buffer, + CORBA::Boolean release = 0 + ); + LongSeq (const LongSeq &); + ~LongSeq (void); + + static void _tao_any_destructor (void *); + + typedef LongSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LongSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::LongSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_LongSeq_H_ +#define _TAO_CDR_OP_CORBA_LongSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::LongSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::LongSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "LongSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/LongSeqC.inl b/TAO/tao/LongSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/LongSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/LongSeqS.h b/TAO/tao/LongSeqS.h new file mode 100644 index 00000000000..fba787dde8d --- /dev/null +++ b/TAO/tao/LongSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_LONGSEQS_H_ +#define _TAO_IDL_ORIG_LONGSEQS_H_ + +#include /**/ "ace/pre.h" + +#include "LongSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index b726135c647..9cd587047be 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.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:303 #include "OctetSeqC.h" @@ -39,11 +39,11 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "OctetSeqC.i" -#endif /* !defined INLINE */ +#include "OctetSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:64 +// .\be\be_visitor_arg_traits.cpp:64 // Arg traits specializations. namespace TAO @@ -52,7 +52,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_sequence/sequence_cs.cpp:65 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_OCTETSEQ_CS_) #define _CORBA_OCTETSEQ_CS_ @@ -98,14 +98,14 @@ void CORBA::OctetSeq::_tao_any_destructor ( ) { OctetSeq * _tao_tmp_pointer = - ACE_static_cast (OctetSeq *, _tao_void_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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_ #define _TAO_CDR_OP_CORBA_OctetSeq_CPP_ @@ -115,7 +115,7 @@ CORBA::Boolean operator<< ( const CORBA::OctetSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len = _tao_sequence.length (); + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); if (strm << _tao_seq_len) { @@ -124,7 +124,7 @@ CORBA::Boolean operator<< ( #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence); + static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> ((CORBA::OctetSeq *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else @@ -178,7 +178,7 @@ CORBA::Boolean operator>> ( input_cdr_allocator_type_locked () == 1) { TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (&_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); strm.skip_bytes (_tao_seq_len); @@ -199,7 +199,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1628 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index c928d7a1207..918391bd520 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.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:153 #ifndef _TAO_IDL_ORIG_OCTETSEQC_H_ #define _TAO_IDL_ORIG_OCTETSEQC_H_ @@ -68,13 +68,13 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 namespace CORBA { // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_OCTETSEQ_CH_) #define _CORBA_OCTETSEQ_CH_ @@ -130,37 +130,25 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 +// w:\ace_wrappers\tao\tao_idl\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 { } -// 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_Sequence<CORBA::OctetSeq>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - // TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version @@ -168,7 +156,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); // TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_ #define _TAO_CDR_OP_CORBA_OctetSeq_H_ @@ -185,11 +173,11 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:978 +// .\be\be_codegen.cpp:958 #if defined (__ACE_INLINE__) -#include "OctetSeqC.i" -#endif /* defined INLINE */ +#include "OctetSeqC.inl" +#endif /* defined __ACE_INLINE__ */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) diff --git a/TAO/tao/OctetSeqC.inl b/TAO/tao/OctetSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/OctetSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/OctetSeqS.cpp b/TAO/tao/OctetSeqS.cpp deleted file mode 100644 index 5fb1fc5bfcb..00000000000 --- a/TAO/tao/OctetSeqS.cpp +++ /dev/null @@ -1,85 +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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:610 - -#ifndef _TAO_IDL_ORIG_OCTETSEQS_CPP_ -#define _TAO_IDL_ORIG_OCTETSEQS_CPP_ - - -#include "OctetSeqS.h" -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/Operation_Table.h" -#include "tao/TAO_Server_Request.h" -#include "tao/ORB_Core.h" -#include "tao/Profile.h" -#include "tao/Stub.h" -#include "tao/IFR_Client_Adapter.h" -#include "tao/Object_T.h" -#include "tao/Typecode.h" -#include "tao/DynamicC.h" -#include "tao/PortableInterceptor.h" -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/PICurrent.h" -#include "tao/PortableServer/ServerRequestInfo.h" -#include "tao/PortableServer/ServerInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include "ace/Dynamic_Service.h" -#include "ace/config-all.h" - -#if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus -#endif /* __BORLANDC__ */ - -#if !defined (__ACE_INLINE__) -#include "OctetSeqS.i" -#endif /* !defined INLINE */ - - - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:60 - -// Arg traits specializations. -namespace TAO -{ -}; - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1739 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* ifndef */ diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h index 6728595c020..574cbf97971 100644 --- a/TAO/tao/OctetSeqS.h +++ b/TAO/tao/OctetSeqS.h @@ -26,12 +26,13 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:390 +// .\be\be_codegen.cpp:391 #ifndef _TAO_IDL_ORIG_OCTETSEQS_H_ #define _TAO_IDL_ORIG_OCTETSEQS_H_ #include /**/ "ace/pre.h" + #include "OctetSeqC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -54,26 +55,17 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 namespace POA_CORBA { // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 } // module CORBA -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:946 - -#include "OctetSeqS_T.h" - -#if defined (__ACE_INLINE__) -#include "OctetSeqS.i" -#endif /* defined INLINE */ - #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/OctetSeqS_T.cpp b/TAO/tao/OctetSeqS_T.cpp deleted file mode 100644 index 50e54d98bc6..00000000000 --- a/TAO/tao/OctetSeqS_T.cpp +++ /dev/null @@ -1,41 +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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:684 - -#ifndef _TAO_IDL_ORIG_OCTETSEQS_T_CPP_ -#define _TAO_IDL_ORIG_OCTETSEQS_T_CPP_ - -#include "OctetSeqS_T.h" - -#if !defined (__ACE_INLINE__) -#include "OctetSeqS_T.i" -#endif /* !defined INLINE */ - - -#endif /* ifndef */ diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl index a8c7f2a50b7..d1ca2e3b097 100644 --- a/TAO/tao/StringSeq.pidl +++ b/TAO/tao/StringSeq.pidl @@ -27,7 +27,6 @@ module CORBA { typedef sequence<string> StringSeq; - typedef sequence<wstring> WStringSeq; }; #endif /* TAO_CORBA_STRING_SEQ_IDL */ diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp index 9c18619bc4a..a3e9ca18a58 100644 --- a/TAO/tao/StringSeqA.cpp +++ b/TAO/tao/StringSeqA.cpp @@ -30,28 +30,28 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:290 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:290 static const CORBA::Long _oc_CORBA_StringSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5374), - ACE_NTOHL (0x72696e67), - ACE_NTOHL (0x5365713a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5374), + ACE_NTOHL (0x72696e67), + ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0 10, - ACE_NTOHL (0x53747269), - ACE_NTOHL (0x6e675365), + ACE_NTOHL (0x53747269), + ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000), // name = StringSeq CORBA::tk_sequence, // typecode kind 16, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -71,51 +71,8 @@ namespace CORBA &_tc_TAO_tc_CORBA_StringSeq; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:290 - -static const CORBA::Long _oc_CORBA_WStringSeq[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5753), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x67536571), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0 - 11, - ACE_NTOHL (0x57537472), - ACE_NTOHL (0x696e6753), - ACE_NTOHL (0x65710000), // name = WStringSeq - CORBA::tk_sequence, // typecode kind - 16, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_wstring, - 0U, // string length - 0U, - -}; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq ( - CORBA::tk_alias, - sizeof (_oc_CORBA_WStringSeq), - (char *) &_oc_CORBA_WStringSeq, - 0, - sizeof (CORBA::WStringSeq) - ); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr _tc_WStringSeq = - &_tc_TAO_tc_CORBA_WStringSeq; -} - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -151,8 +108,8 @@ CORBA::Boolean operator>>= ( CORBA::StringSeq *&_tao_elem ) { - return _tao_any >>= ACE_const_cast ( - const CORBA::StringSeq *&, + return _tao_any >>= const_cast< + const CORBA::StringSeq *&> ( _tao_elem ); } @@ -172,64 +129,6 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::WStringSeq &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy ( - _tao_any, - CORBA::WStringSeq::_tao_any_destructor, - CORBA::_tc_WStringSeq, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::WStringSeq *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert ( - _tao_any, - CORBA::WStringSeq::_tao_any_destructor, - CORBA::_tc_WStringSeq, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::WStringSeq *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CORBA::WStringSeq *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::WStringSeq *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract ( - _tao_any, - CORBA::WStringSeq::_tao_any_destructor, - CORBA::_tc_WStringSeq, - _tao_elem - ); -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -239,11 +138,6 @@ CORBA::Boolean operator>>= ( CORBA::StringSeq >; - template class - TAO::Any_Dual_Impl_T< - CORBA::WStringSeq - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -251,10 +145,4 @@ CORBA::Boolean operator>>= ( CORBA::StringSeq \ > -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::WStringSeq \ - > - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index b4666879270..10ff244c508 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.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:303 #include "StringSeqC.h" @@ -38,11 +38,11 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "StringSeqC.i" -#endif /* !defined INLINE */ +#include "StringSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ // TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:64 +// .\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_sequence/sequence_cs.cpp:65 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_STRINGSEQ_CS_) #define _CORBA_STRINGSEQ_CS_ @@ -91,61 +91,14 @@ void CORBA::StringSeq::_tao_any_destructor ( ) { StringSeq * _tao_tmp_pointer = - ACE_static_cast (StringSeq *, _tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_CORBA_WSTRINGSEQ_CS_) -#define _CORBA_WSTRINGSEQ_CS_ - -CORBA::WStringSeq::WStringSeq (void) -{} - -CORBA::WStringSeq::WStringSeq ( - CORBA::ULong max - ) - : TAO_Unbounded_WString_Sequence - (max) -{} - -CORBA::WStringSeq::WStringSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::WChar * * buffer, - CORBA::Boolean release - ) - : TAO_Unbounded_WString_Sequence - (max, length, buffer, release) -{} - -CORBA::WStringSeq::WStringSeq ( - const WStringSeq &seq - ) - : TAO_Unbounded_WString_Sequence - (seq) -{} - -CORBA::WStringSeq::~WStringSeq (void) -{} - -void CORBA::WStringSeq::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - WStringSeq * _tao_tmp_pointer = - ACE_static_cast (WStringSeq *, _tao_void_pointer); + static_cast<StringSeq *> (_tao_void_pointer); delete _tao_tmp_pointer; } #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_cs.cpp:96 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_CORBA_StringSeq_CPP_ #define _TAO_CDR_OP_CORBA_StringSeq_CPP_ @@ -155,7 +108,7 @@ CORBA::Boolean operator<< ( const CORBA::StringSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len = _tao_sequence.length (); + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); if (strm << _tao_seq_len) { @@ -218,80 +171,7 @@ return 0; #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_cs.cpp:96 - -#if !defined _TAO_CDR_OP_CORBA_WStringSeq_CPP_ -#define _TAO_CDR_OP_CORBA_WStringSeq_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::WStringSeq &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = 1; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i].in ()); - } - - return _tao_marshal_flag; - } - - return 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::WStringSeq &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return 0; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return 1; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = 1; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - - } - - return _tao_marshal_flag; - - } - -return 0; -} - -#endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ - -// TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1628 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -314,25 +194,6 @@ return 0; TAO_SeqElem_String_Manager >; - template class - TAO_MngSeq_Var_T< - CORBA::WStringSeq, - TAO_SeqElem_WString_Manager - >; - - template class - TAO_Seq_Var_Base_T< - CORBA::WStringSeq, - TAO_SeqElem_WString_Manager - >; - - template class - TAO_MngSeq_Out_T< - CORBA::WStringSeq, - CORBA::WStringSeq_var, - TAO_SeqElem_WString_Manager - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -354,24 +215,5 @@ return 0; TAO_SeqElem_String_Manager \ > -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - CORBA::WStringSeq, \ - TAO_SeqElem_WString_Manager \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - CORBA::WStringSeq, \ - TAO_SeqElem_WString_Manager \ - > - -# pragma instantiate \ - TAO_MngSeq_Out_T< \ - CORBA::WStringSeq, \ - CORBA::WStringSeq_var, \ - TAO_SeqElem_WString_Manager \ - > - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index cf5501a439c..69ad64c2a3f 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -26,20 +26,22 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:171 +// .\be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_STRINGSEQC_H_ #define _TAO_IDL_ORIG_STRINGSEQC_H_ #include /**/ "ace/pre.h" -#include "tao/Environment.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" @@ -68,13 +70,13 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 namespace CORBA { // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_STRINGSEQ_CH_) #define _CORBA_STRINGSEQ_CH_ @@ -120,68 +122,17 @@ namespace CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq; - - // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_CORBA_WSTRINGSEQ_CH_) -#define _CORBA_WSTRINGSEQ_CH_ - - class WStringSeq; - - typedef - TAO_MngSeq_Var_T< - WStringSeq, - TAO_SeqElem_WString_Manager - > - WStringSeq_var; - - typedef - TAO_MngSeq_Out_T< - WStringSeq, - WStringSeq_var, - TAO_SeqElem_WString_Manager - > - WStringSeq_out; - - class TAO_Export WStringSeq - : public - TAO_Unbounded_WString_Sequence - { - public: - WStringSeq (void); - WStringSeq (CORBA::ULong max); - WStringSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::WChar ** buffer, - CORBA::Boolean release = 0 - ); - WStringSeq (const WStringSeq &); - ~WStringSeq (void); - - static void _tao_any_destructor (void *); - - typedef WStringSeq_var _var_type; - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 +// w:\ace_wrappers\tao\tao_idl\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 @@ -189,7 +140,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version @@ -197,15 +148,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&); // TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&); - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_ #define _TAO_CDR_OP_CORBA_StringSeq_H_ @@ -222,28 +165,11 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */ // TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_ -#define _TAO_CDR_OP_CORBA_WStringSeq_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const CORBA::WStringSeq & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - CORBA::WStringSeq & - ); - -#endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */ - -// TAO_IDL - Generated from -// be\be_codegen.cpp:978 +// .\be\be_codegen.cpp:958 #if defined (__ACE_INLINE__) -#include "StringSeqC.i" -#endif /* defined INLINE */ +#include "StringSeqC.inl" +#endif /* defined __ACE_INLINE__ */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) diff --git a/TAO/tao/StringSeqC.inl b/TAO/tao/StringSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/StringSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/StringSeqS.h b/TAO/tao/StringSeqS.h index 1d4a9a45b6f..5a31faeb7ff 100644 --- a/TAO/tao/StringSeqS.h +++ b/TAO/tao/StringSeqS.h @@ -26,12 +26,53 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// .\be\be_codegen.cpp:411 +// .\be\be_codegen.cpp:391 #ifndef _TAO_IDL_ORIG_STRINGSEQS_H_ #define _TAO_IDL_ORIG_STRINGSEQS_H_ #include /**/ "ace/pre.h" +#include "StringSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/ULongLongSeq.pidl b/TAO/tao/ULongLongSeq.pidl new file mode 100644 index 00000000000..9f3736dedf4 --- /dev/null +++ b/TAO/tao/ULongLongSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in ULongLongSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * ULongLongSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_ULONGLONG_SEQ_IDL +#define TAO_CORBA_ULONGLONG_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<unsigned long long> ULongLongSeq; +}; + +#endif /* TAO_CORBA_ULONGLONG_SEQ_IDL */ diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp new file mode 100644 index 00000000000..76ef2292145 --- /dev/null +++ b/TAO/tao/ULongLongSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "ULongLongSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "ULongLongSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_ULONGLONGSEQ_CS_) +#define _CORBA_ULONGLONGSEQ_CS_ + +CORBA::ULongLongSeq::ULongLongSeq (void) +{} + +CORBA::ULongLongSeq::ULongLongSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::ULongLong + > + (max) +{} + +CORBA::ULongLongSeq::ULongLongSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULongLong * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::ULongLong + > + (max, length, buffer, release) +{} + +CORBA::ULongLongSeq::ULongLongSeq ( + const ULongLongSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::ULongLong + > + (seq) +{} + +CORBA::ULongLongSeq::~ULongLongSeq (void) +{} + +void CORBA::ULongLongSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + ULongLongSeq * _tao_tmp_pointer = + static_cast<ULongLongSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ +#define _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::ULongLongSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::ULongLongSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::ULongLongSeq, + CORBA::ULongLong + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::ULongLongSeq, + CORBA::ULongLong + >; + + template class + TAO_Seq_Out_T< + CORBA::ULongLongSeq, + CORBA::ULongLongSeq_var, + CORBA::ULongLong + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::ULongLongSeq, \ + CORBA::ULongLong \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::ULongLongSeq, \ + CORBA::ULongLong \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::ULongLongSeq, \ + CORBA::ULongLongSeq_var, \ + CORBA::ULongLong \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h new file mode 100644 index 00000000000..01c3cb9341f --- /dev/null +++ b/TAO/tao/ULongLongSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_ULONGLONGSEQC_H_ +#define _TAO_IDL_ORIG_ULONGLONGSEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_ULONGLONGSEQ_CH_) +#define _CORBA_ULONGLONGSEQ_CH_ + + class ULongLongSeq; + + typedef + TAO_FixedSeq_Var_T< + ULongLongSeq, + CORBA::ULongLong + > + ULongLongSeq_var; + + typedef + TAO_Seq_Out_T< + ULongLongSeq, + ULongLongSeq_var, + CORBA::ULongLong + > + ULongLongSeq_out; + + class TAO_Export ULongLongSeq + : public + TAO_Unbounded_Sequence< + CORBA::ULongLong + > + { + public: + ULongLongSeq (void); + ULongLongSeq (CORBA::ULong max); + ULongLongSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULongLong* buffer, + CORBA::Boolean release = 0 + ); + ULongLongSeq (const ULongLongSeq &); + ~ULongLongSeq (void); + + static void _tao_any_destructor (void *); + + typedef ULongLongSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ULongLongSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongLongSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLongSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongLongSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_H_ +#define _TAO_CDR_OP_CORBA_ULongLongSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::ULongLongSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::ULongLongSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "ULongLongSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/ULongLongSeqC.inl b/TAO/tao/ULongLongSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/ULongLongSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/ULongLongSeqS.h b/TAO/tao/ULongLongSeqS.h new file mode 100644 index 00000000000..64d7e2feb87 --- /dev/null +++ b/TAO/tao/ULongLongSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_ULONGLONGSEQS_H_ +#define _TAO_IDL_ORIG_ULONGLONGSEQS_H_ + +#include /**/ "ace/pre.h" + +#include "ULongLongSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/WCharSeq.pidl b/TAO/tao/WCharSeq.pidl new file mode 100644 index 00000000000..7915d596a0f --- /dev/null +++ b/TAO/tao/WCharSeq.pidl @@ -0,0 +1,31 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +/** + * This file was used to generate the code in WCharSeq*.* + * The command used to generate code is: + * + * tao_idl + * -o orig -Ge 1 -Sc -GT -GA + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * WCharSeq.pidl + * + */ +// ================================================================ + +#ifndef TAO_CORBA_WCHAR_SEQ_IDL +#define TAO_CORBA_WCHAR_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<wchar> WCharSeq; +}; + +#endif /* TAO_CORBA_WCHAR_SEQ_IDL */ diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp new file mode 100644 index 00000000000..77eb0f61aca --- /dev/null +++ b/TAO/tao/WCharSeqC.cpp @@ -0,0 +1,210 @@ +// -*- 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:303 + + +#include "WCharSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "WCharSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_WCHARSEQ_CS_) +#define _CORBA_WCHARSEQ_CS_ + +CORBA::WCharSeq::WCharSeq (void) +{} + +CORBA::WCharSeq::WCharSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::WChar + > + (max) +{} + +CORBA::WCharSeq::WCharSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::WChar * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::WChar + > + (max, length, buffer, release) +{} + +CORBA::WCharSeq::WCharSeq ( + const WCharSeq &seq + ) + : TAO_Unbounded_Sequence< + CORBA::WChar + > + (seq) +{} + +CORBA::WCharSeq::~WCharSeq (void) +{} + +void CORBA::WCharSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + WCharSeq * _tao_tmp_pointer = + static_cast<WCharSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_WCharSeq_CPP_ +#define _TAO_CDR_OP_CORBA_WCharSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::WCharSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::WCharSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + return strm.read_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::WCharSeq, + CORBA::WChar + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::WCharSeq, + CORBA::WChar + >; + + template class + TAO_Seq_Out_T< + CORBA::WCharSeq, + CORBA::WCharSeq_var, + CORBA::WChar + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::WCharSeq, \ + CORBA::WChar \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::WCharSeq, \ + CORBA::WChar \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::WCharSeq, \ + CORBA::WCharSeq_var, \ + CORBA::WChar \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h new file mode 100644 index 00000000000..bde7d5ef51c --- /dev/null +++ b/TAO/tao/WCharSeqC.h @@ -0,0 +1,187 @@ +// -*- 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_WCHARSEQC_H_ +#define _TAO_IDL_ORIG_WCHARSEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_WCHARSEQ_CH_) +#define _CORBA_WCHARSEQ_CH_ + + class WCharSeq; + + typedef + TAO_FixedSeq_Var_T< + WCharSeq, + CORBA::WChar + > + WCharSeq_var; + + typedef + TAO_Seq_Out_T< + WCharSeq, + WCharSeq_var, + CORBA::WChar + > + WCharSeq_out; + + class TAO_Export WCharSeq + : public + TAO_Unbounded_Sequence< + CORBA::WChar + > + { + public: + WCharSeq (void); + WCharSeq (CORBA::ULong max); + WCharSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::WChar* buffer, + CORBA::Boolean release = 0 + ); + WCharSeq (const WCharSeq &); + ~WCharSeq (void); + + static void _tao_any_destructor (void *); + + typedef WCharSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WCharSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::WCharSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::WCharSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WCharSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WCharSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_WCharSeq_H_ +#define _TAO_CDR_OP_CORBA_WCharSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::WCharSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::WCharSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "WCharSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/WCharSeqC.inl b/TAO/tao/WCharSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/WCharSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/WCharSeqS.h b/TAO/tao/WCharSeqS.h new file mode 100644 index 00000000000..92982cb9109 --- /dev/null +++ b/TAO/tao/WCharSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_WCHARSEQS_H_ +#define _TAO_IDL_ORIG_WCHARSEQS_H_ + +#include /**/ "ace/pre.h" + +#include "WCharSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/WStringSeq.pidl b/TAO/tao/WStringSeq.pidl new file mode 100644 index 00000000000..a80088c3468 --- /dev/null +++ b/TAO/tao/WStringSeq.pidl @@ -0,0 +1,32 @@ +// -*- IDL -*- +// +// $Id$ + +// ================================================================ +// +// This file was used to generate the code in WStringSeqC.* +// The command used to generate code is: +// +// tao_idl +// -o orig -Ge 1 -GT -GA -Sc +// -Wb,export_macro=TAO_Export +// -Wb,pre_include="ace/pre.h" +// -Wb,post_include="ace/post.h" +// WStringSeq.pidl +// +// Patches for changes to the generated code are available in the +// `diffs' directory. +// ================================================================ + + +#ifndef TAO_CORBA_WSTRING_SEQ_IDL +#define TAO_CORBA_WSTRING_SEQ_IDL + +#pragma prefix "omg.org" + +module CORBA +{ + typedef sequence<wstring> WStringSeq; +}; + +#endif /* TAO_CORBA_WSTRING_SEQ_IDL */ diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp new file mode 100644 index 00000000000..04fbfbbfbf2 --- /dev/null +++ b/TAO/tao/WStringSeqC.cpp @@ -0,0 +1,219 @@ +// -*- 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:303 + + +#include "WStringSeqC.h" +#include "tao/CDR.h" +#include "tao/Typecode.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +#if !defined (__ACE_INLINE__) +#include "WStringSeqC.inl" +#endif /* !defined __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:64 + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_WSTRINGSEQ_CS_) +#define _CORBA_WSTRINGSEQ_CS_ + +CORBA::WStringSeq::WStringSeq (void) +{} + +CORBA::WStringSeq::WStringSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_WString_Sequence + (max) +{} + +CORBA::WStringSeq::WStringSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::WChar * * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_WString_Sequence + (max, length, buffer, release) +{} + +CORBA::WStringSeq::WStringSeq ( + const WStringSeq &seq + ) + : TAO_Unbounded_WString_Sequence + (seq) +{} + +CORBA::WStringSeq::~WStringSeq (void) +{} + +void CORBA::WStringSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + WStringSeq * _tao_tmp_pointer = + static_cast<WStringSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_WStringSeq_CPP_ +#define _TAO_CDR_OP_CORBA_WStringSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::WStringSeq &_tao_sequence + ) +{ + const CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm << _tao_sequence[i].in ()); + } + + return _tao_marshal_flag; + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::WStringSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + + if (strm >> _tao_seq_len) + { + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length ()) + { + return 0; + } + + // Set the length of the sequence. + _tao_sequence.length (_tao_seq_len); + + // If length is 0 we return true. + if (0 >= _tao_seq_len) + { + return 1; + } + + // Retrieve all the elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); + + } + + return _tao_marshal_flag; + + } + +return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1628 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_MngSeq_Var_T< + CORBA::WStringSeq, + TAO_SeqElem_WString_Manager + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::WStringSeq, + TAO_SeqElem_WString_Manager + >; + + template class + TAO_MngSeq_Out_T< + CORBA::WStringSeq, + CORBA::WStringSeq_var, + TAO_SeqElem_WString_Manager + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::WStringSeq, \ + TAO_SeqElem_WString_Manager \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::WStringSeq, \ + TAO_SeqElem_WString_Manager \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + CORBA::WStringSeq, \ + CORBA::WStringSeq_var, \ + TAO_SeqElem_WString_Manager \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h new file mode 100644 index 00000000000..cf60409f74e --- /dev/null +++ b/TAO/tao/WStringSeqC.h @@ -0,0 +1,185 @@ +// -*- 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_WSTRINGSEQC_H_ +#define _TAO_IDL_ORIG_WSTRINGSEQC_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/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 (TAO_EXPORT_NESTED_CLASSES) +# if defined (TAO_EXPORT_NESTED_MACRO) +# undef TAO_EXPORT_NESTED_MACRO +# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ +# define TAO_EXPORT_NESTED_MACRO TAO_Export +#endif /* TAO_EXPORT_NESTED_CLASSES */ + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_WSTRINGSEQ_CH_) +#define _CORBA_WSTRINGSEQ_CH_ + + class WStringSeq; + + typedef + TAO_MngSeq_Var_T< + WStringSeq, + TAO_SeqElem_WString_Manager + > + WStringSeq_var; + + typedef + TAO_MngSeq_Out_T< + WStringSeq, + WStringSeq_var, + TAO_SeqElem_WString_Manager + > + WStringSeq_out; + + class TAO_Export WStringSeq + : public + TAO_Unbounded_WString_Sequence + { + public: + WStringSeq (void); + WStringSeq (CORBA::ULong max); + WStringSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::WChar ** buffer, + CORBA::Boolean release = 0 + ); + WStringSeq (const WStringSeq &); + ~WStringSeq (void); + + static void _tao_any_destructor (void *); + + typedef WStringSeq_var _var_type; + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // w:\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq; + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// .\be\be_visitor_traits.cpp:59 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&); + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_ +#define _TAO_CDR_OP_CORBA_WStringSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::WStringSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::WStringSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */ + +// TAO_IDL - Generated from +// .\be\be_codegen.cpp:958 + +#if defined (__ACE_INLINE__) +#include "WStringSeqC.inl" +#endif /* defined __ACE_INLINE__ */ + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/WStringSeqC.inl b/TAO/tao/WStringSeqC.inl new file mode 100644 index 00000000000..38aa32569ba --- /dev/null +++ b/TAO/tao/WStringSeqC.inl @@ -0,0 +1,28 @@ +// -*- 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/WStringSeqS.h b/TAO/tao/WStringSeqS.h new file mode 100644 index 00000000000..6e5a50e293b --- /dev/null +++ b/TAO/tao/WStringSeqS.h @@ -0,0 +1,78 @@ +// -*- 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:391 + +#ifndef _TAO_IDL_ORIG_WSTRINGSEQS_H_ +#define _TAO_IDL_ORIG_WSTRINGSEQS_H_ + +#include /**/ "ace/pre.h" + +#include "WStringSeqC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Base.h" + +#if defined(_MSC_VER) +#if (_MSC_VER >= 1200) +#pragma warning(push) +#endif /* _MSC_VER >= 1200 */ +#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 +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49 + +namespace POA_CORBA +{ + + +// TAO_IDL - Generated from +// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80 + +} // module CORBA + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#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/orb.idl b/TAO/tao/orb.idl index 4cd6037a537..c8438735aef 100644 --- a/TAO/tao/orb.idl +++ b/TAO/tao/orb.idl @@ -8,8 +8,28 @@ #define TAO_ORB_IDL ///FUZZ: disable check_for_include/ +#include <tao/AnySeq.pidl> +#include <tao/BooleanSeq.pidl> +#include <tao/CharSeq.pidl> +#include <tao/DoubleSeq.pidl> +#include <tao/FloatSeq.pidl> +#include <tao/LongDoubleSeq.pidl> +#include <tao/LongSeq.pidl> #include <tao/OctetSeq.pidl> +#include <tao/ShortSeq.pidl> #include <tao/StringSeq.pidl> +#include <tao/ULongSeq.pidl> +#include <tao/UShortSeq.pidl> +#include <tao/WCharSeq.pidl> +#include <tao/WStringSeq.pidl> + +#if ! defined (ACE_LACKS_LONGLONG_T) +#include <tao/LongLongSeq.pidl> +#endif /* ! defined (ACE_LACKS_LONGLONG_T) */ + +#if ! defined (ACE_LACKS_U_LONGLONG_T) +#include <tao/ULongLongSeq.pidl> +#endif /* ! defined (ACE_LACKS_U_LONGLONG_T) */ #include <tao/Policy.pidl> #include <tao/Services.pidl> diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 5a78cb71a06..e0de395d74e 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -135,20 +135,38 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, extra_core { Dynamic_ParameterC.cpp Dynamic_ParameterA.cpp ParameterMode.cpp + AnySeqA.cpp + AnySeqC.cpp BooleanSeqA.cpp BooleanSeqC.cpp + CharSeqA.cpp + CharSeqC.cpp + DoubleSeqA.cpp + DoubleSeqC.cpp FloatSeqA.cpp FloatSeqC.cpp + LongDoubleSeqA.cpp + LongDoubleSeqC.cpp + LongLongSeqA.cpp + LongLongSeqC.cpp + LongSeqA.cpp + LongSeqC.cpp OctetSeqA.cpp OctetSeqC.cpp ShortSeqA.cpp ShortSeqC.cpp StringSeqA.cpp StringSeqC.cpp + ULongLongSeqA.cpp + ULongLongSeqC.cpp ULongSeqA.cpp ULongSeqC.cpp UShortSeqA.cpp UShortSeqC.cpp + WCharSeqA.cpp + WCharSeqC.cpp + WStringSeqA.cpp + WStringSeqC.cpp Codeset_Manager.cpp Codeset_Translator_Factory.cpp UTF16_BOM_Translator.cpp diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 923a101fe19..0967155b0dc 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -38,7 +38,6 @@ project(*Client): messaging, taoexe, portableserver, minimum_corba, dynamicinter objref.cpp objref_struct.cpp options.cpp - param_test_i.cpp recursive_struct.cpp recursive_union.cpp results.cpp diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 242e15a391d..42d992cd65a 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -186,7 +186,7 @@ Test_Any::reset_parameters (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Param_Test: ANY_SHORT_SEQ subtest\n")); - Param_Test::Short_Seq seq; + CORBA::ShortSeq seq; seq.length (gen->gen_short () % 16); for (size_t i = 0; i < seq.length (); i++) seq[i] = gen->gen_short (); @@ -301,7 +301,7 @@ Test_Any::check_validity (void) Coffee_ptr obj_in, obj_inout, obj_out, obj_ret; Param_Test::Fixed_Array_forany array_in, array_inout, array_out, array_ret; Param_Test::Bounded_Short_Seq *bdss_in, *bdss_inout, *bdss_out, *bdss_ret; - Param_Test::Short_Seq *ubss_in, *ubss_inout, *ubss_out, *ubss_ret; + CORBA::ShortSeq *ubss_in, *ubss_inout, *ubss_out, *ubss_ret; Param_Test::Fixed_Struct *fs_in, *fs_inout, *fs_out, *fs_ret; Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret; Param_Test::Small_Union *su_in, *su_inout, *su_out, *su_ret; diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index 7c08ea73367..c15ba6afd10 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -307,9 +307,9 @@ main (int argc, char *argv[]) { CORBA::ULong len = 3; CORBA::Any any; - Param_Test::Long_Seq *i = 0; + CORBA::LongSeq *i = 0; ACE_NEW_RETURN (i, - Param_Test::Long_Seq (len), + CORBA::LongSeq (len), -1); i->length (len); @@ -319,7 +319,7 @@ main (int argc, char *argv[]) } any <<= *i; - Param_Test::Long_Seq *o; + CORBA::LongSeq *o; if (!(any >>= o) || (*i)[0] != (*o)[0] diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index 80cc17e1707..1694db4d1a4 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -153,7 +153,7 @@ Test_Big_Union::reset_parameters (void) break; case 5: { - Param_Test::Short_Seq seq; + CORBA::ShortSeq seq; seq.length (gen->gen_short () % 50); for (size_t i = 0; i < seq.length (); i++) seq[i] = gen->gen_short (); @@ -376,13 +376,13 @@ Test_Big_Union::check_validity (void) case 5: { - const Param_Test::Short_Seq& in = + const CORBA::ShortSeq& in = this->in_.the_sequence (); - const Param_Test::Short_Seq& inout = + const CORBA::ShortSeq& inout = this->inout_.the_sequence (); - const Param_Test::Short_Seq& out = + const CORBA::ShortSeq& out = this->out_->the_sequence (); - const Param_Test::Short_Seq& ret = + const CORBA::ShortSeq& ret = this->ret_->the_sequence (); if (in.length () != out.length () diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index c9dbc510400..0dd6c1199fe 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -101,7 +101,7 @@ Test_Complex_Any::reset_parameters (void) { Generator *gen = GENERATOR::instance (); // value generator - Param_Test::AnySeq level2_seq, level3_seq; + CORBA::AnySeq level2_seq, level3_seq; level2_seq.length (LEVEL_2_LENGTH); level3_seq.length (LEVEL_3_LENGTH); @@ -191,8 +191,8 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref CORBA::Boolean Test_Complex_Any::check_validity (void) { - Param_Test::AnySeq *level2_in_seq; - Param_Test::AnySeq *level2_test_seq; + CORBA::AnySeq *level2_in_seq; + CORBA::AnySeq *level2_test_seq; if (!(this->in_ >>= level2_in_seq)) return 0; @@ -220,8 +220,8 @@ Test_Complex_Any::check_validity (void) // Private helper function for check_validity. CORBA::Boolean -Test_Complex_Any::comp_engine (const Param_Test::AnySeq *level2_in_seq, - const Param_Test::AnySeq *level2_comp_seq) +Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq, + const CORBA::AnySeq *level2_comp_seq) { if (level2_in_seq->length() != level2_comp_seq->length()) { @@ -232,8 +232,8 @@ Test_Complex_Any::comp_engine (const Param_Test::AnySeq *level2_in_seq, for (CORBA::ULong i = 0; i < level2_in_seq->length (); i++) { - Param_Test::AnySeq *level3_in_seq; - Param_Test::AnySeq *level3_test_seq; + CORBA::AnySeq *level3_in_seq; + CORBA::AnySeq *level3_test_seq; if (!((*level2_in_seq)[i] >>= level3_in_seq)) return 0; diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h index 8ad9e40be77..58763ad6761 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -78,8 +78,8 @@ private: CORBA::Any_var ret_; // return value - CORBA::Boolean comp_engine (const Param_Test::AnySeq *in_seq, - const Param_Test::AnySeq *comp_seq); + CORBA::Boolean comp_engine (const CORBA::AnySeq *in_seq, + const CORBA::AnySeq *comp_seq); // Compares the sequence extracted from in_ to one of the others. }; diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl index 8a3471ff0f6..a2023cbbede 100644 --- a/TAO/tests/Param_Test/param_test.idl +++ b/TAO/tests/Param_Test/param_test.idl @@ -108,41 +108,36 @@ interface Param_Test PathSpec test_unbounded_struct_sequence (in PathSpec s1, inout PathSpec s2, out PathSpec s3); - typedef sequence<short> Short_Seq; - - Short_Seq test_short_sequence (in Short_Seq s1, - inout Short_Seq s2, - out Short_Seq s3); + CORBA::ShortSeq test_short_sequence (in CORBA::ShortSeq s1, + inout CORBA::ShortSeq s2, + out CORBA::ShortSeq s3); typedef sequence<short,32> Bounded_Short_Seq; Bounded_Short_Seq test_bounded_short_sequence (in Bounded_Short_Seq s1, inout Bounded_Short_Seq s2, out Bounded_Short_Seq s3); - typedef sequence<long> Long_Seq; - Long_Seq test_long_sequence (in Long_Seq s1, - inout Long_Seq s2, - out Long_Seq s3); + CORBA::LongSeq test_long_sequence (in CORBA::LongSeq s1, + inout CORBA::LongSeq s2, + out CORBA::LongSeq s3); typedef sequence<long,32> Bounded_Long_Seq; Bounded_Long_Seq test_bounded_long_sequence (in Bounded_Long_Seq s1, inout Bounded_Long_Seq s2, out Bounded_Long_Seq s3); - typedef sequence<string> StrSeq; - StrSeq test_strseq (in StrSeq s1, - inout StrSeq s2, - out StrSeq s3); + CORBA::StringSeq test_strseq (in CORBA::StringSeq s1, + inout CORBA::StringSeq s2, + out CORBA::StringSeq s3); typedef sequence<string,32> Bounded_StrSeq; Bounded_StrSeq test_bounded_strseq (in Bounded_StrSeq s1, inout Bounded_StrSeq s2, out Bounded_StrSeq s3); - typedef sequence<wstring> WStrSeq; - WStrSeq test_wstrseq (in WStrSeq ws1, - inout WStrSeq ws2, - out WStrSeq ws3); + CORBA::WStringSeq test_wstrseq (in CORBA::WStringSeq ws1, + inout CORBA::WStringSeq ws2, + out CORBA::WStringSeq ws3); typedef sequence<wstring,32> Bounded_WStrSeq; Bounded_WStrSeq test_bounded_wstrseq (in Bounded_WStrSeq ws1, @@ -169,11 +164,9 @@ interface Param_Test inout Bounded_Coffee_Mix s2, out Bounded_Coffee_Mix s3); - - typedef sequence<any> AnySeq; - AnySeq test_anyseq (in AnySeq s1, - inout AnySeq s2, - out AnySeq s3); + CORBA::AnySeq test_anyseq (in CORBA::AnySeq s1, + inout CORBA::AnySeq s2, + out CORBA::AnySeq s3); /* typedef sequence<any, 32> Bounded_AnySeq; Bounded_AnySeq test_bounded_anyseq (in Bounded_AnySeq s1, @@ -190,7 +183,7 @@ interface Param_Test boolean boole; DUMMY dummy2; short shrt; - StrSeq seq; + CORBA::StringSeq seq; }; Var_Struct test_var_struct (in Var_Struct s1, @@ -285,7 +278,7 @@ interface Param_Test case 4: string the_string; case 5: - Short_Seq the_sequence; + CORBA::ShortSeq the_sequence; case 6: any the_any; case 7: diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index c315721df6e..b90cdaeaaf4 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -206,16 +206,16 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, // = Sequences -Param_Test::Long_Seq * -Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1, - Param_Test::Long_Seq & s2, - Param_Test::Long_Seq_out s3 +CORBA::LongSeq * +Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1, + CORBA::LongSeq & s2, + CORBA::LongSeq_out s3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - Param_Test::Long_Seq - *ret = new Param_Test::Long_Seq, - *out = new Param_Test::Long_Seq; + CORBA::LongSeq + *ret = new CORBA::LongSeq, + *out = new CORBA::LongSeq; s2 = s1; *out = s1; @@ -224,16 +224,16 @@ Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1, return ret; } -Param_Test::Short_Seq * -Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1, - Param_Test::Short_Seq & s2, - Param_Test::Short_Seq_out s3 +CORBA::ShortSeq * +Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1, + CORBA::ShortSeq & s2, + CORBA::ShortSeq_out s3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - Param_Test::Short_Seq - *ret = new Param_Test::Short_Seq, - *out = new Param_Test::Short_Seq; + CORBA::ShortSeq + *ret = new CORBA::ShortSeq, + *out = new CORBA::ShortSeq; s2 = s1; *out = s1; @@ -278,18 +278,18 @@ Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s return ret; } -Param_Test::StrSeq * -Param_Test_i::test_strseq (const Param_Test::StrSeq &s1, - Param_Test::StrSeq &s2, - Param_Test::StrSeq_out s3 +CORBA::StringSeq * +Param_Test_i::test_strseq (const CORBA::StringSeq &s1, + CORBA::StringSeq &s2, + CORBA::StringSeq_out s3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. - Param_Test::StrSeq - *ret = new Param_Test::StrSeq, - *out = new Param_Test::StrSeq; + CORBA::StringSeq + *ret = new CORBA::StringSeq, + *out = new CORBA::StringSeq; if (TAO_debug_level > 0) { @@ -335,18 +335,18 @@ Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, return ret; } -Param_Test::WStrSeq * -Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1, - Param_Test::WStrSeq &ws2, - Param_Test::WStrSeq_out ws3 +CORBA::WStringSeq * +Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1, + CORBA::WStringSeq &ws2, + CORBA::WStringSeq_out ws3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. - Param_Test::WStrSeq - *ret = new Param_Test::WStrSeq, - *out = new Param_Test::WStrSeq; + CORBA::WStringSeq + *ret = new CORBA::WStringSeq, + *out = new CORBA::WStringSeq; // now copy all elements of s1 into the others using the assignment operator ws2 = ws1; @@ -580,18 +580,18 @@ Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, return ret; } -Param_Test::AnySeq * -Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1, - Param_Test::AnySeq &s2, - Param_Test::AnySeq_out s3 +CORBA::AnySeq * +Param_Test_i::test_anyseq (const CORBA::AnySeq &s1, + CORBA::AnySeq &s2, + CORBA::AnySeq_out s3 ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. - Param_Test::AnySeq - *ret = new Param_Test::AnySeq, - *out = new Param_Test::AnySeq; + CORBA::AnySeq + *ret = new CORBA::AnySeq, + *out = new CORBA::AnySeq; // now copy all elements of s1 into the others using the assignment operator s2 = s1; @@ -775,7 +775,7 @@ Param_Test_i::test_any (const CORBA::Any &a1, const char *str_in; Coffee_ptr coffee; Param_Test::Fixed_Array_forany array; - Param_Test::Short_Seq *ub_short_sequence; + CORBA::ShortSeq *ub_short_sequence; Param_Test::Bounded_Short_Seq *bd_short_sequence; Param_Test::Fixed_Struct *fixed_structure; Param_Test::Big_Union *big_union; diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 219f2b2c1ea..8f9307c3266 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -111,10 +111,10 @@ public: // test for fixed structures // = Start of sequences tests... - virtual Param_Test::Long_Seq * test_long_sequence ( - const Param_Test::Long_Seq & s1, - Param_Test::Long_Seq & s2, - Param_Test::Long_Seq_out s3 + virtual CORBA::LongSeq * test_long_sequence ( + const CORBA::LongSeq & s1, + CORBA::LongSeq & s2, + CORBA::LongSeq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence ( @@ -123,10 +123,10 @@ public: Param_Test::Bounded_Long_Seq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Param_Test::Short_Seq * test_short_sequence ( - const Param_Test::Short_Seq & s1, - Param_Test::Short_Seq & s2, - Param_Test::Short_Seq_out s3 + virtual CORBA::ShortSeq * test_short_sequence ( + const CORBA::ShortSeq & s1, + CORBA::ShortSeq & s2, + CORBA::ShortSeq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence ( @@ -135,10 +135,10 @@ public: Param_Test::Bounded_Short_Seq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Param_Test::StrSeq * test_strseq ( - const Param_Test::StrSeq & s1, - Param_Test::StrSeq & s2, - Param_Test::StrSeq_out s3 + virtual CORBA::StringSeq * test_strseq ( + const CORBA::StringSeq & s1, + CORBA::StringSeq & s2, + CORBA::StringSeq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_StrSeq * test_bounded_strseq ( @@ -147,10 +147,10 @@ public: Param_Test::Bounded_StrSeq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Param_Test::WStrSeq * test_wstrseq ( - const Param_Test::WStrSeq & ws1, - Param_Test::WStrSeq & ws2, - Param_Test::WStrSeq_out ws3 + virtual CORBA::WStringSeq * test_wstrseq ( + const CORBA::WStringSeq & ws1, + CORBA::WStringSeq & ws2, + CORBA::WStringSeq_out ws3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq ( @@ -201,10 +201,10 @@ public: Param_Test::Bounded_Coffee_Mix_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual Param_Test::AnySeq * test_anyseq ( - const Param_Test::AnySeq & s1, - Param_Test::AnySeq & s2, - Param_Test::AnySeq_out s3 + virtual CORBA::AnySeq * test_anyseq ( + const CORBA::AnySeq & s1, + CORBA::AnySeq & s2, + CORBA::AnySeq_out s3 ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // = End of sequences tests.... diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index 20a0b010fd4..dd5277d5924 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -33,10 +33,10 @@ const CORBA::ULong NUM_TEST_TYPES = 4; Test_AnySeq::Test_AnySeq (void) : opname_ (CORBA::string_dup ("test_anyseq")), - in_ (new Param_Test::AnySeq (TEST_SEQ_LENGTH)), - inout_ (new Param_Test::AnySeq (TEST_SEQ_LENGTH)), - out_ (new Param_Test::AnySeq), - ret_ (new Param_Test::AnySeq) + in_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)), + inout_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)), + out_ (new CORBA::AnySeq), + ret_ (new CORBA::AnySeq) { } @@ -60,26 +60,26 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); - req->set_return_type (Param_Test::_tc_AnySeq); + req->set_return_type (CORBA::_tc_AnySeq); req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - Param_Test::AnySeq* tmp; + CORBA::AnySeq* tmp; req->return_value () >>= tmp; - this->ret_ = new Param_Test::AnySeq (*tmp); + this->ret_ = new CORBA::AnySeq (*tmp); CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; - this->inout_ = new Param_Test::AnySeq (*tmp); + this->inout_ = new CORBA::AnySeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; - this->out_ = new Param_Test::AnySeq (*tmp); + this->out_ = new CORBA::AnySeq (*tmp); } int @@ -204,7 +204,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref { ACE_TRY { - Param_Test::AnySeq_out out (this->out_.out ()); + CORBA::AnySeq_out out (this->out_.out ()); this->ret_ = objref->test_anyseq (this->in_.in (), this->inout_.inout (), @@ -329,7 +329,7 @@ Test_AnySeq::print_values (void) } void -Test_AnySeq::print_sequence (const Param_Test::AnySeq &s) +Test_AnySeq::print_sequence (const CORBA::AnySeq &s) { ACE_DEBUG ((LM_DEBUG, "maximum = %d\n" diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index 7b1efefb875..3a2d6c72577 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -60,27 +60,27 @@ public: // invoke DII request with appropriate exception handling. protected: - CORBA::Boolean compare (const Param_Test::AnySeq &s1, + CORBA::Boolean compare (const CORBA::AnySeq &s1, const Param_Test::StructSeq &s2); // compare - void print_sequence (const Param_Test::AnySeq &s); + void print_sequence (const CORBA::AnySeq &s); // print individual sequence private: char *opname_; // operation name - Param_Test::AnySeq_var in_; + CORBA::AnySeq_var in_; // in parameter - Param_Test::AnySeq_var inout_; + CORBA::AnySeq_var inout_; // inout parameter - Param_Test::AnySeq_var out_; + CORBA::AnySeq_var out_; // out parameter - Param_Test::AnySeq_var ret_; + CORBA::AnySeq_var ret_; // return value }; diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index b5dddc00240..32ef0cba131 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -29,10 +29,10 @@ ACE_RCSID (Param_Test, Test_Long_Sequence::Test_Long_Sequence (void) : opname_ (CORBA::string_dup ("test_long_sequence")), - in_ (new Param_Test::Long_Seq), - inout_ (new Param_Test::Long_Seq), - out_ (new Param_Test::Long_Seq), - ret_ (new Param_Test::Long_Seq) + in_ (new CORBA::LongSeq), + inout_ (new CORBA::LongSeq), + out_ (new CORBA::LongSeq), + ret_ (new CORBA::LongSeq) { } @@ -56,26 +56,26 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); - req->set_return_type (Param_Test::_tc_Long_Seq); + req->set_return_type (CORBA::_tc_LongSeq); req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - Param_Test::Long_Seq *tmp; + CORBA::LongSeq *tmp; req->return_value () >>= tmp; - this->ret_ = Param_Test::Long_Seq (*tmp); + this->ret_ = CORBA::LongSeq (*tmp); CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; - this->inout_ = Param_Test::Long_Seq (*tmp); + this->inout_ = CORBA::LongSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; - this->out_ = Param_Test::Long_Seq (*tmp); + this->out_ = CORBA::LongSeq (*tmp); } int @@ -102,9 +102,9 @@ Test_Long_Sequence::init_parameters (Param_Test_ptr int Test_Long_Sequence::reset_parameters (void) { - this->inout_ = new Param_Test::Long_Seq; // delete the previous ones - this->out_ = new Param_Test::Long_Seq; - this->ret_ = new Param_Test::Long_Seq; + this->inout_ = new CORBA::LongSeq; // delete the previous ones + this->out_ = new CORBA::LongSeq; + this->ret_ = new CORBA::LongSeq; return 0; } @@ -114,7 +114,7 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref { ACE_TRY { - Param_Test::Long_Seq_out out (this->out_.out ()); + CORBA::LongSeq_out out (this->out_.out ()); this->ret_ = objref->test_long_sequence (this->in_.in (), this->inout_.inout (), diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index a73f8d4adfe..6cfdef9dc3d 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -64,16 +64,16 @@ private: char *opname_; // operation name - Param_Test::Long_Seq_var in_; + CORBA::LongSeq_var in_; // in parameter - Param_Test::Long_Seq_var inout_; + CORBA::LongSeq_var inout_; // inout parameter - Param_Test::Long_Seq_var out_; + CORBA::LongSeq_var out_; // out parameter - Param_Test::Long_Seq_var ret_; + CORBA::LongSeq_var ret_; // return value }; diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index 3252540f1cd..c7740c69fdb 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -29,10 +29,10 @@ ACE_RCSID (Param_Test, Test_Short_Sequence::Test_Short_Sequence (void) : opname_ (CORBA::string_dup ("test_short_sequence")), - in_ (new Param_Test::Short_Seq), - inout_ (new Param_Test::Short_Seq), - out_ (new Param_Test::Short_Seq), - ret_ (new Param_Test::Short_Seq) + in_ (new CORBA::ShortSeq), + inout_ (new CORBA::ShortSeq), + out_ (new CORBA::ShortSeq), + ret_ (new CORBA::ShortSeq) { } @@ -56,26 +56,26 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); - req->set_return_type (Param_Test::_tc_Short_Seq); + req->set_return_type (CORBA::_tc_ShortSeq); req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - Param_Test::Short_Seq *tmp; + CORBA::ShortSeq *tmp; req->return_value () >>= tmp; - this->ret_ = new Param_Test::Short_Seq (*tmp); + this->ret_ = new CORBA::ShortSeq (*tmp); CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; - this->inout_ = new Param_Test::Short_Seq (*tmp); + this->inout_ = new CORBA::ShortSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; - this->out_ = new Param_Test::Short_Seq (*tmp); + this->out_ = new CORBA::ShortSeq (*tmp); } int @@ -104,9 +104,9 @@ Test_Short_Sequence::init_parameters (Param_Test_ptr int Test_Short_Sequence::reset_parameters (void) { - this->inout_ = new Param_Test::Short_Seq; // delete the previous ones - this->out_ = new Param_Test::Short_Seq; - this->ret_ = new Param_Test::Short_Seq; + this->inout_ = new CORBA::ShortSeq; // delete the previous ones + this->out_ = new CORBA::ShortSeq; + this->ret_ = new CORBA::ShortSeq; return 0; } @@ -116,7 +116,7 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref { ACE_TRY { - Param_Test::Short_Seq_out out (this->out_.out ()); + CORBA::ShortSeq_out out (this->out_.out ()); this->ret_ = objref->test_short_sequence (this->in_.in (), this->inout_.inout (), diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index 5f433fba4e0..7cf0a4499f5 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -64,16 +64,16 @@ private: char *opname_; // operation name - Param_Test::Short_Seq_var in_; + CORBA::ShortSeq_var in_; // in parameter - Param_Test::Short_Seq_var inout_; + CORBA::ShortSeq_var inout_; // inout parameter - Param_Test::Short_Seq_var out_; + CORBA::ShortSeq_var out_; // out parameter - Param_Test::Short_Seq_var ret_; + CORBA::ShortSeq_var ret_; // return value }; diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 952909f327d..730701506f0 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -29,10 +29,10 @@ ACE_RCSID (Param_Test, Test_String_Sequence::Test_String_Sequence (void) : opname_ (CORBA::string_dup ("test_strseq")), - in_ (new Param_Test::StrSeq), - inout_ (new Param_Test::StrSeq), - out_ (new Param_Test::StrSeq), - ret_ (new Param_Test::StrSeq) + in_ (new CORBA::StringSeq), + inout_ (new CORBA::StringSeq), + out_ (new CORBA::StringSeq), + ret_ (new CORBA::StringSeq) { } @@ -56,26 +56,26 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); - req->set_return_type (Param_Test::_tc_StrSeq); + req->set_return_type (CORBA::_tc_StringSeq); req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - Param_Test::StrSeq *tmp; + CORBA::StringSeq *tmp; req->return_value () >>= tmp; - this->ret_ = new Param_Test::StrSeq (*tmp); + this->ret_ = new CORBA::StringSeq (*tmp); CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; - this->inout_ = new Param_Test::StrSeq (*tmp); + this->inout_ = new CORBA::StringSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; - this->out_ = new Param_Test::StrSeq (*tmp); + this->out_ = new CORBA::StringSeq (*tmp); } int @@ -108,9 +108,9 @@ Test_String_Sequence::init_parameters (Param_Test_ptr int Test_String_Sequence::reset_parameters (void) { - this->inout_ = new Param_Test::StrSeq; // delete the previous ones - this->out_ = new Param_Test::StrSeq; - this->ret_ = new Param_Test::StrSeq; + this->inout_ = new CORBA::StringSeq; // delete the previous ones + this->out_ = new CORBA::StringSeq; + this->ret_ = new CORBA::StringSeq; return 0; } @@ -120,7 +120,7 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref { ACE_TRY { - Param_Test::StrSeq_out out (this->out_.out ()); + CORBA::StringSeq_out out (this->out_.out ()); this->ret_ = objref->test_strseq (this->in_.in (), this->inout_.inout (), diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index 78f9c6f60f2..069bdf2351e 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -64,16 +64,16 @@ private: char *opname_; // operation name - Param_Test::StrSeq_var in_; + CORBA::StringSeq_var in_; // in parameter - Param_Test::StrSeq_var inout_; + CORBA::StringSeq_var inout_; // inout parameter - Param_Test::StrSeq_var out_; + CORBA::StringSeq_var out_; // out parameter - Param_Test::StrSeq_var ret_; + CORBA::StringSeq_var ret_; // return value }; diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index 445bb7ccbe0..e082cc19817 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -30,10 +30,10 @@ ACE_RCSID (Param_Test, Test_WString_Sequence::Test_WString_Sequence (void) : opname_ (CORBA::string_dup ("test_wstrseq")), - in_ (new Param_Test::WStrSeq), - inout_ (new Param_Test::WStrSeq), - out_ (new Param_Test::WStrSeq), - ret_ (new Param_Test::WStrSeq) + in_ (new CORBA::WStringSeq), + inout_ (new CORBA::WStringSeq), + out_ (new CORBA::WStringSeq), + ret_ (new CORBA::WStringSeq) { } @@ -57,26 +57,26 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req req->add_inout_arg ("s2") <<= this->inout_.in (); req->add_out_arg ("s3") <<= this->out_.in (); - req->set_return_type (Param_Test::_tc_WStrSeq); + req->set_return_type (CORBA::_tc_WStringSeq); req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - Param_Test::WStrSeq *tmp; + CORBA::WStringSeq *tmp; req->return_value () >>= tmp; - this->ret_ = new Param_Test::WStrSeq (*tmp); + this->ret_ = new CORBA::WStringSeq (*tmp); CORBA::NamedValue_ptr o2 = req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o2->value () >>= tmp; - this->inout_ = new Param_Test::WStrSeq (*tmp); + this->inout_ = new CORBA::WStringSeq (*tmp); CORBA::NamedValue_ptr o3 = req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER); ACE_CHECK; *o3->value () >>= tmp; - this->out_ = new Param_Test::WStrSeq (*tmp); + this->out_ = new CORBA::WStringSeq (*tmp); } int @@ -104,9 +104,9 @@ Test_WString_Sequence::init_parameters (Param_Test_ptr int Test_WString_Sequence::reset_parameters (void) { - this->inout_ = new Param_Test::WStrSeq; // delete the previous ones - this->out_ = new Param_Test::WStrSeq; - this->ret_ = new Param_Test::WStrSeq; + this->inout_ = new CORBA::WStringSeq; // delete the previous ones + this->out_ = new CORBA::WStringSeq; + this->ret_ = new CORBA::WStringSeq; return 0; } @@ -116,7 +116,7 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref { ACE_TRY { - Param_Test::WStrSeq_out out (this->out_.out ()); + CORBA::WStringSeq_out out (this->out_.out ()); this->ret_ = objref->test_wstrseq (this->in_.in (), this->inout_.inout (), diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h index c691018765d..6c212efc388 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -65,16 +65,16 @@ private: char *opname_; // operation name - Param_Test::WStrSeq_var in_; + CORBA::WStringSeq_var in_; // in parameter - Param_Test::WStrSeq_var inout_; + CORBA::WStringSeq_var inout_; // inout parameter - Param_Test::WStrSeq_var out_; + CORBA::WStringSeq_var out_; // out parameter - Param_Test::WStrSeq_var ret_; + CORBA::WStringSeq_var ret_; // return value }; |