diff options
Diffstat (limited to 'TAO/tao')
58 files changed, 1741 insertions, 1014 deletions
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 56528db0c81..0a0b9ef54ee 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -490,11 +490,11 @@ CORBA::NVList::_lazy_has_arguments (void) const { if (this->incoming_ != 0) { - return this->incoming_->length () <= 1 ? false : true; + return this->incoming_->length () == 0 ? 0 : 1; } else { - return this->count () <= 1 ? false : true; + return this->count () == 0 ? 0 : 1; } } diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp new file mode 100644 index 00000000000..dd6b7864968 --- /dev/null +++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp @@ -0,0 +1,146 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "tao/AnyTypeCode/OctetSeqA.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:50 + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:937 + + +#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD +#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD +namespace TAO +{ + namespace TypeCode + { + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + CORBA_OctetSeq_0 ( + CORBA::tk_sequence, + &CORBA::_tc_octet, + 0U); + + ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 = + &CORBA_OctetSeq_0; + + } +} + + +#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */ + +static TAO::TypeCode::Alias<char const *, + CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_OctetSeq ( + CORBA::tk_alias, + "IDL:omg.org/CORBA/OctetSeq:1.0", + "OctetSeq", + &TAO::TypeCode::tc_CORBA_OctetSeq_0); + +namespace CORBA +{ + ::CORBA::TypeCode_ptr const _tc_OctetSeq = + &_tao_tc_CORBA_OctetSeq; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 + + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::OctetSeq &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy ( + _tao_any, + CORBA::OctetSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_OctetSeq_0, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::OctetSeq *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert ( + _tao_any, + CORBA::OctetSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_OctetSeq_0, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::OctetSeq *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const CORBA::OctetSeq *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::OctetSeq *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract ( + _tao_any, + CORBA::OctetSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_OctetSeq_0, + _tao_elem + ); +} + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h new file mode 100644 index 00000000000..8b94976cb20 --- /dev/null +++ b/TAO/tao/AnyTypeCode/OctetSeqA.h @@ -0,0 +1,71 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:788 + +#ifndef _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_ +#define _TAO_IDL_ANYTYPECODE_OCTETSEQA_H_ + +#include /**/ "ace/pre.h" + +#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/OctetSeqC.h" + + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:59 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:49 + + extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq; + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:86 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_ch.cpp:53 + +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); + +TAO_END_VERSIONED_NAMESPACE_DECL + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp new file mode 100644 index 00000000000..582d15d69d0 --- /dev/null +++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp @@ -0,0 +1,146 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "tao/AnyTypeCode/UShortSeqA.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:50 + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:937 + + +#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD +#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD +namespace TAO +{ + namespace TypeCode + { + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + CORBA_UShortSeq_0 ( + CORBA::tk_sequence, + &CORBA::_tc_ushort, + 0U); + + ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 = + &CORBA_UShortSeq_0; + + } +} + + +#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */ + +static TAO::TypeCode::Alias<char const *, + CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_UShortSeq ( + CORBA::tk_alias, + "IDL:omg.org/CORBA/UShortSeq:1.0", + "UShortSeq", + &TAO::TypeCode::tc_CORBA_UShortSeq_0); + +namespace CORBA +{ + ::CORBA::TypeCode_ptr const _tc_UShortSeq = + &_tao_tc_CORBA_UShortSeq; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 + + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::UShortSeq &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy ( + _tao_any, + CORBA::UShortSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_UShortSeq_0, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::UShortSeq *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert ( + _tao_any, + CORBA::UShortSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_UShortSeq_0, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::UShortSeq *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const CORBA::UShortSeq *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::UShortSeq *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract ( + _tao_any, + CORBA::UShortSeq::_tao_any_destructor, + TAO::TypeCode::tc_CORBA_UShortSeq_0, + _tao_elem + ); +} + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h new file mode 100644 index 00000000000..824246509de --- /dev/null +++ b/TAO/tao/AnyTypeCode/UShortSeqA.h @@ -0,0 +1,112 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:153 + +#ifndef _TAO_IDL_ORIG_USHORTSEQA_H_ +#define _TAO_IDL_ORIG_USHORTSEQA_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/UShortSeqC.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq; + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:61 + +// Traits specializations. +namespace TAO +{ +} + +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + + diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index a1078da179e..da573662bc7 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -18,6 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { +namespace details +{ + template<typename charT, CORBA::ULong MAX> class bounded_basic_string_sequence { @@ -106,6 +109,8 @@ public: private: implementation_type impl_; }; + +} // namespace details } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h index adfd7e1cea1..70d1480f1ba 100644 --- a/TAO/tao/Bounded_Sequence_CDR_T.h +++ b/TAO/tao/Bounded_Sequence_CDR_T.h @@ -282,8 +282,8 @@ namespace TAO { } template <typename stream, typename charT, CORBA::ULong MAX> - bool demarshal_sequence(stream & strm, TAO::bounded_basic_string_sequence <charT, MAX> & target) { - typedef typename TAO::bounded_basic_string_sequence <charT, MAX> sequence; + bool demarshal_sequence(stream & strm, TAO::details::bounded_basic_string_sequence <charT, MAX> & target) { + typedef typename TAO::details::bounded_basic_string_sequence <charT, MAX> sequence; typedef typename sequence::element_traits::string_var string_var; ::CORBA::ULong new_length = 0; if (!(strm >> new_length)) { @@ -482,7 +482,7 @@ namespace TAO { } template <typename stream, typename charT, CORBA::ULong MAX> - bool marshal_sequence(stream & strm, const TAO::bounded_basic_string_sequence <charT, MAX> & source) { + bool marshal_sequence(stream & strm, const TAO::details::bounded_basic_string_sequence <charT, MAX> & source) { if (0 == &source) ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false); ::CORBA::ULong const length = source.length (); diff --git a/TAO/tao/Bounded_String_Sequence_T.h b/TAO/tao/Bounded_String_Sequence_T.h new file mode 100644 index 00000000000..9f6373343b6 --- /dev/null +++ b/TAO/tao/Bounded_String_Sequence_T.h @@ -0,0 +1,42 @@ +#ifndef guard_bounded_string_sequence_hpp +#define guard_bounded_string_sequence_hpp +/** + * @file + * + * @brief Implement bounded sequences for strings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ + +#include "tao/Bounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +template<CORBA::ULong MAX> +class bounded_string_sequence + : public details::bounded_basic_string_sequence<char,MAX> +{ +public: + inline bounded_string_sequence() + : details::bounded_basic_string_sequence<char,MAX>() + {} + inline bounded_string_sequence( + CORBA::ULong length, + char * * data, + CORBA::Boolean release = false) + : details::bounded_basic_string_sequence<char,MAX>( + length, data, release) + {} +}; + + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_bounded_string_sequence_hpp diff --git a/TAO/tao/Bounded_Wstring_Sequence_T.h b/TAO/tao/Bounded_Wstring_Sequence_T.h new file mode 100644 index 00000000000..c0ed84f289e --- /dev/null +++ b/TAO/tao/Bounded_Wstring_Sequence_T.h @@ -0,0 +1,42 @@ +#ifndef guard_bounded_wstring_sequence_hpp +#define guard_bounded_wstring_sequence_hpp +/** + * @file + * + * @brief Implement bounded sequences for wstrings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ + +#include "tao/Bounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +template<CORBA::ULong MAX> +class bounded_wstring_sequence + : public details::bounded_basic_string_sequence<CORBA::WChar,MAX> +{ +public: + inline bounded_wstring_sequence() + : details::bounded_basic_string_sequence<CORBA::WChar,MAX>() + {} + inline bounded_wstring_sequence( + CORBA::ULong length, + CORBA::WChar * * data, + CORBA::Boolean release = false) + : details::bounded_basic_string_sequence<CORBA::WChar,MAX>( + length, data, release) + {} +}; + + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_bounded_wstring_sequence_hpp diff --git a/TAO/tao/FlResource/FlResource_Factory.cpp b/TAO/tao/FlResource/FlResource_Factory.cpp index 2071a22c25c..a280383b065 100644 --- a/TAO/tao/FlResource/FlResource_Factory.cpp +++ b/TAO/tao/FlResource/FlResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/FlResource/FlResource_Factory.h" #include "tao/debug.h" -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" ACE_RCSID( TAO_FlResource, FlResource_Factory, diff --git a/TAO/tao/FlResource/FlResource_Factory.h b/TAO/tao/FlResource/FlResource_Factory.h index 7d70cf7c5bd..28da6ab9341 100644 --- a/TAO/tao/FlResource/FlResource_Factory.h +++ b/TAO/tao/FlResource/FlResource_Factory.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FlReactor/FlReactor.h" +#include "ace/FlReactor.h" #include "tao/GUIResource_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp index 33695590b87..a94f2e97302 100644 --- a/TAO/tao/GUIResource_Factory.cpp +++ b/TAO/tao/GUIResource_Factory.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { GUIResource_Factory::GUIResource_Factory (void) - : dynamically_allocated_reactor_ (false) + : dynamically_allocated_reactor_ (0) { } @@ -41,7 +41,7 @@ namespace TAO reactor = 0; } else - this->dynamically_allocated_reactor_ = true; + this->dynamically_allocated_reactor_ = 1; return reactor; } @@ -51,7 +51,7 @@ namespace TAO { ACE_GUARD ( TAO_SYNCH_MUTEX, ace_mon, this->lock_ ); - if (this->dynamically_allocated_reactor_) + if (this->dynamically_allocated_reactor_ == 1) delete reactor; } } diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index e0f2dab0543..aae6da6ba35 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -59,8 +59,7 @@ namespace TAO */ virtual ACE_Reactor *get_reactor (void) ; - /** - * Reclaim the reactor if allocated by this factory. + /** Reclaim the reactor if allocated by this factory. * Please note that this call is NOT synchronized. Left to the * higher level versions to synchronize access. */ @@ -68,8 +67,7 @@ namespace TAO protected: - /** - * Create or return current reactor instance. + /** Create or return current reactor instance. * Please note that this call is NOT synchronized. Left to the * get_reactor to synchronize access. */ @@ -78,9 +76,9 @@ namespace TAO private: /** - * Flag that is set to true if the reactor obtained from the + * Flag that is set to 1 if the reactor obtained from the * get_reactor() method is dynamically allocated. If this flag is - * set to true, then the reclaim_reactor() method with call the delete + * set to 1, then the reclaim_reactor() method with call the delete * operator on the given reactor. This flag is necessary to make * sure that a reactor not allocated by the default resource factory * is not reclaimed by the default resource factory. Such a @@ -88,7 +86,7 @@ namespace TAO * default one overrides the get_reactor() method but does not * override the reclaim_reactor() method. */ - bool dynamically_allocated_reactor_; + int dynamically_allocated_reactor_; /// for internal locking. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp deleted file mode 100644 index a1091b80858..00000000000 --- a/TAO/tao/HTTP_Client.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ - -#include "tao/HTTP_Client.h" -#include "tao/HTTP_Handler.h" -#include "ace/OS_NS_string.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_HTTP_Client::TAO_HTTP_Client (void) -{ -} - -TAO_HTTP_Client::~TAO_HTTP_Client (void) -{ - this->close (); -} - -int -TAO_HTTP_Client::open (const ACE_TCHAR *filename, - const ACE_TCHAR *hostname, - u_short port) -{ - this->filename_ = ACE_OS::strdup (filename); - this->inet_addr_.set (port, hostname); - return 0; -} - -int -TAO_HTTP_Client::read (ACE_Message_Block *mb) -{ - // Create a HTTP_Client Reader - TAO_HTTP_Reader HTTP_reader (mb, this->filename_); - TAO_HTTP_Handler *brp = &HTTP_reader; - - // Connect to the server - if (connector_.connect (brp, this->inet_addr_) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Client::read(): Connector error\n"), -1); - } - - return HTTP_reader.byte_count (); - -} - -int -TAO_HTTP_Client::close (void) -{ - if (this->filename_) - { - ACE_OS::free ((void *) this->filename_); - this->filename_ = 0; - } - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/HTTP_Client.h b/TAO/tao/HTTP_Client.h deleted file mode 100644 index 75e3b8da646..00000000000 --- a/TAO/tao/HTTP_Client.h +++ /dev/null @@ -1,75 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file HTTP_Client.h - * - * $Id$ - * - * This is the HTTP_Client class, which is the API for doing file - * uploads/downloads. - * - * @author Stoyan Paunov - */ -//============================================================================= - - -#ifndef TAO_HTTP_CLIENT_H -#define TAO_HTTP_CLIENT_H - -#include "ace/INET_Addr.h" -#include "ace/Svc_Handler.h" -#include "ace/SOCK_Connector.h" -#include "ace/Connector.h" -#include "ace/Message_Block.h" -#include "tao/HTTP_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_HTTP_Client - * - * @brief HTTP_Client is intended to provide application API to - * classes that wish to do network i/o at a very - * high level of abstraction. - * - * This class provides the ability to retrieve data from - * the network, of specified length and offset, and potentially - * use any protocol "under the hood" to do so. It currently - * uses HTTP. See HTTP_Handler also. - */ -class TAO_HTTP_Client -{ -public: - TAO_HTTP_Client (void); - ~TAO_HTTP_Client (void); - - /// Initializes the class with the given filename, hostname and port. - /// it should be called with the filename, before any read/write calls - int open (const ACE_TCHAR *filename, - const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST, - u_short port = 80); - - /// Starts a connection, and reads a file from the server into - /// Message_Block mb - int read (ACE_Message_Block *mb); - - /// Frees memory allocated for filename. - int close (); - -private: - /// Store the internet address of the server - ACE_INET_Addr inet_addr_; - - /// The filename - ACE_TCHAR *filename_; - - /// The connector endpoint to initiate the client connection - ACE_Connector<TAO_HTTP_Handler, ACE_SOCK_CONNECTOR> connector_; - -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HTTP_CLIENT_H */ diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp deleted file mode 100644 index 16e3c2c70c0..00000000000 --- a/TAO/tao/HTTP_Handler.cpp +++ /dev/null @@ -1,197 +0,0 @@ -// $Id$ - -#include "tao/HTTP_Handler.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_strings.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_HTTP_Handler::TAO_HTTP_Handler (void) -{ -} - -TAO_HTTP_Handler::TAO_HTTP_Handler (ACE_Message_Block * mb, - ACE_TCHAR *filename) : - mb_ (mb), - filename_ (ACE_OS::strdup (filename)), - bytecount_ (0) -{ -} - -TAO_HTTP_Handler::~TAO_HTTP_Handler (void) -{ - if (this->filename_) - { - ACE_OS::free (this->filename_); - filename_ = 0; - } -} - -int -TAO_HTTP_Handler::open (void *) -{ - if (this->send_request () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Handler::open():send_request failed\n"), -1); - - if (this->receive_reply () != 0) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "TAO_HTTP_Handler::open():receive_reply failed\n"), -1); - return 0; - -} - -int -TAO_HTTP_Handler::close (u_long) -{ - return 0; -} - -int -TAO_HTTP_Handler::send_request (void) -{ - return -1; -} - -int -TAO_HTTP_Handler::receive_reply (void) -{ - return -1; -} - -size_t -TAO_HTTP_Handler::byte_count (void) const -{ - return bytecount_; -} - -// Reader ************************************************** - -TAO_HTTP_Reader::TAO_HTTP_Reader (ACE_Message_Block * mb, - ACE_TCHAR *filename, - const char *request_prefix, - const char *request_suffix) : - TAO_HTTP_Handler (mb, filename), - request_prefix_ (request_prefix), - request_suffix_ (request_suffix) -{ -} - -int -TAO_HTTP_Reader::send_request (void) -{ - char mesg [MAX_HEADER_SIZE]; - - // Check to see if the request is too big - if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_) - + ACE_OS::strlen (filename_) - + ACE_OS::strlen (request_suffix_) + 4)) - ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1); - - // Create a message to send to the server requesting retrieval of the file - int const len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_); - - // Send the message to server - if (peer ().send_n (mesg, len) != len) - ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1); - - return 0; -} - -int -TAO_HTTP_Reader::receive_reply (void) -{ - size_t num_recvd = 0; - char buf [MTU+1]; - char *buf_ptr = 0; - size_t bytes_read = 0; - - // Receive the first MTU bytes and strip the header off. - // Note that we assume that the header will fit into MTU bytes. - if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0) - { - //Make sure that response type is 200 OK - if (ACE_OS::strstr (buf,"200 OK") == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1); - - // Search for the header termination string "\r\n\r\n", or "\n\n". If - // found, move past it to get to the data portion. - if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0) - buf_ptr += 4; - else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0) //for compatibility with JAWS - buf_ptr += 2; - else - buf_ptr = buf; - - // Determine number of data bytes read. This is equal to the - // total bytes read minus number of header bytes. - bytes_read = num_recvd - (buf_ptr - buf); - - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "HTTP_Reader::receiveReply():Error while reading header\n"), -1); - } - - // *************************************************************** - // At this point, we have stripped off the header and are ready to - // process data. buf_ptr points to the data - - ACE_Message_Block* temp = 0; - ACE_Message_Block* curr = this->mb_; - - ACE_NEW_RETURN (temp, - ACE_Message_Block (bytes_read), - -1); - curr->cont (temp); - curr = curr->cont (); - - // Copy over all the data bytes into our message buffer. - if (curr->copy (buf_ptr, bytes_read) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1); - } - - // read the rest of the data into a number of ACE_Message_Blocks and - // chain them together in a link list fashion - num_recvd = 0; - - do - { - if (curr->space () == 0) - { - ACE_NEW_RETURN (temp, - ACE_Message_Block (MTU), - -1); - curr->cont (temp); - curr = curr->cont (); - } - - if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0) - { - // Move the write pointer - curr->wr_ptr (num_recvd); - - // Increment bytes_read - bytes_read += num_recvd; - - } - else - { - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "TAO_HTTP_Reader::receive_reply(): Error while reading header\n"), -1); - } - } while (num_recvd != 0); - - // Set the byte count to number of bytes received - this->bytecount_ = bytes_read; - - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h deleted file mode 100644 index b2b510f9381..00000000000 --- a/TAO/tao/HTTP_Handler.h +++ /dev/null @@ -1,88 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file HTTP_Handler.h - * - * $Id$ - * - * HTTP_Handler is a base class for HTTP_Reader and - * HTTP_Writer which are created in response to calls to - * read/write, as appropriate - */ -//============================================================================= - - -#ifndef TAO_HTTP_HANDLER_H -#define TAO_HTTP_HANDLER_H - -#include "ace/SOCK_Stream.h" -#include "ace/Svc_Handler.h" -#include "ace/Message_Block.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_HTTP_Handler - * class to retrieve data via HTTP - */ -class TAO_HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH> -{ -public: - /// Null constructor, insures that it works properly with Connector - TAO_HTTP_Handler (void); - - /// Always use this constructor to make HTTP_Handlers - TAO_HTTP_Handler (ACE_Message_Block *mb, - ACE_TCHAR *filename); - - /// returns the number of bytes read/written in the last operation. - size_t byte_count (void) const; - - /// Activate this instance of the <HTTP_Handler> - virtual int open (void * = 0); - - /// Close down the Blob - virtual int close (u_long flags = 0); - - ~TAO_HTTP_Handler (void); - -protected: - virtual int send_request (void); - virtual int receive_reply (void); - - ACE_Message_Block *mb_; - ACE_TCHAR *filename_; - size_t bytecount_; - enum - { - /// The handler assumes that the first 2048 bytes of a server response - /// contains the header - MAX_HEADER_SIZE = 2048, - - /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS - MTU = BUFSIZ - }; -}; - -class TAO_HTTP_Reader : public TAO_HTTP_Handler -{ -public: - TAO_HTTP_Reader (ACE_Message_Block *mb, - ACE_TCHAR *filename, - const char *request_prefix = "GET", - const char *request_suffix = "HTTP/1.0\r\nAccept: HTTP/1.0\r\n\r\n"); - -private: - //NOTE: these functions return -1 on error - int send_request (void); - int receive_reply (void); - const char *request_prefix_; - const char *request_suffix_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HTTP_HANDLER_H */ diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp deleted file mode 100644 index 496734e91b0..00000000000 --- a/TAO/tao/HTTP_Parser.cpp +++ /dev/null @@ -1,150 +0,0 @@ -// $Id$ - -#include "tao/HTTP_Parser.h" -#include "tao/HTTP_Client.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "tao/Object.h" - -#include "ace/Read_Buffer.h" -#include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" - -ACE_RCSID (tao, - HTTP_Parser, - "$Id$") - -static const char file_prefix[] = "http:"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_HTTP_Parser::~TAO_HTTP_Parser (void) -{ -} - - -bool -TAO_HTTP_Parser::match_prefix (const char *ior_string) const -{ - return (ACE_OS::strncmp (ior_string, - ::file_prefix, - sizeof (::file_prefix) - 1) == 0); -} - -CORBA::Object_ptr -TAO_HTTP_Parser::parse_string (const char *ior, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Skip the prefix, we know it is there because this method in only - // called if <match_prefix> returns 1. - const char *http_url = - ior + sizeof (::file_prefix) + 1; - - ACE_TCHAR *hostname = 0; - ACE_TCHAR *filename = 0; - const ACE_TCHAR *ptr = 0; - u_short port = 80; - - if (http_url[0] == '/') - { - filename = ACE_OS::strdup (http_url); - } - else - { - ptr = ACE_OS::strstr (http_url, ":"); - if (ptr) - port = ACE_OS::atoi (ptr + 1); - else - ptr = ACE_OS::strstr (http_url, "/"); - - if(!ptr) - return 0; - else - { - size_t const host_len = ptr - http_url; - ACE_NEW_RETURN (hostname, char [host_len + 1], 0 ); - ACE_OS::strncpy (hostname, http_url, host_len); - hostname [host_len] = '\0'; - ptr = ACE_OS::strstr (ptr, "/"); - if (ptr) - { - filename = ACE_OS::strdup(ptr); - } - else - return 0; - } - } - - ACE_Message_Block* mb = 0; - ACE_NEW_THROW_EX (mb, - ACE_Message_Block (), - CORBA::INTERNAL ()); - - // Create a client - TAO_HTTP_Client client; - - if (TAO_debug_level > 4) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) HTTP_Parser::parse_string, getting IOR from <%s> <%s> <%d>\n"), - hostname, filename, port)); - } - - // Open the client - if (client.open (filename, - hostname, - port) == -1) - { - client.close (); - return 0; - } - - delete [] hostname; - ACE_OS::free (filename); - - // Read from it - if (client.read (mb) <= 0) - { - client.close (); - return 0; - } - - // We get multiple message blocks back, concatenate them to - // one large string - ACE_CString string; - for (ACE_Message_Block * curr = mb; curr != 0; curr = curr->cont ()) - string += curr->rd_ptr(); - - CORBA::Object_ptr object = CORBA::Object::_nil (); - ACE_TRY - { - object = orb->string_to_object (string.c_str() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK_RETURN (CORBA::Object::_nil ()); - - return object; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE (TAO_HTTP_Parser, - ACE_TEXT ("HTTP_Parser"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_HTTP_Parser), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_DEFINE (TAO, TAO_HTTP_Parser) - - diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h deleted file mode 100644 index 8396039e864..00000000000 --- a/TAO/tao/HTTP_Parser.h +++ /dev/null @@ -1,62 +0,0 @@ - -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file HTTP_Parser.h - * - * $Id$ - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - - -#ifndef TAO_HTTP_PARSER_H -#define TAO_HTTP_PARSER_H - -#include /**/ "ace/pre.h" -#include "ace/Service_Config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/IOR_Parser.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_HTTP_Parser - * - * @brief Implements the <http:> IOR format - * - * This class implements the <http:> IOR format. - * It is dynamically loaded by the ORB and used to get an IOR - * from a http server and then interprete the data as an IOR (that - * can be in any valid format). - */ -class TAO_HTTP_Parser : public TAO_IOR_Parser -{ -public: - - /// The destructor - virtual ~TAO_HTTP_Parser (void); - - // = The IOR_Parser methods, please read the documentation in - // IOR_Parser.h - virtual bool match_prefix (const char *ior_string) const; - virtual CORBA::Object_ptr parse_string (const char *ior, - CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_HTTP_Parser) -ACE_FACTORY_DECLARE (TAO, TAO_HTTP_Parser) - -#include /**/ "ace/post.h" -#endif /* TAO_HTTP_PARSER_H */ - diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 30758b60b00..f9cc17a103c 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -1190,7 +1190,15 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, ACE_TEXT ("TAO (%P|%t) Zero length IIOP ") ACE_TEXT ("option name.\n")), -1); - if (name == "portspan") + if (name == "priority") + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ") + ACE_TEXT ("endpoint priorities no longer supported. \n"), + value.c_str ()), + -1); + } + else if (name == "portspan") { int range = static_cast <int> (ACE_OS::atoi (value.c_str ())); // @@ What's the lower bound on the range? zero, or one? diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h index 453af96fb24..453af96fb24 100644..100755 --- a/TAO/tao/Incoming_Message_Stack.h +++ b/TAO/tao/Incoming_Message_Stack.h diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl index fd13e03a54e..fd13e03a54e 100644..100755 --- a/TAO/tao/Incoming_Message_Stack.inl +++ b/TAO/tao/Incoming_Message_Stack.inl diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index a543b2f5d6f..93002192097 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -48,7 +48,49 @@ CLEANFILES += \ AnyTypeCode/GIOPA.cpp AnyTypeCode/GIOPA.h GIOPC.cpp GIOPC.h GIOPC.inl GIOPS.h: GIOP-stamp GIOP-stamp: $(srcdir)/GIOP.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/GIOP.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/BooleanSeqA.cpp \ + AnyTypeCode/BooleanSeqA.h \ + BooleanSeqC.cpp \ + BooleanSeqC.h \ + BooleanSeqS.h + +CLEANFILES += \ + BooleanSeq-stamp \ + AnyTypeCode/BooleanSeqA.cpp \ + AnyTypeCode/BooleanSeqA.h \ + BooleanSeqC.cpp \ + BooleanSeqC.h \ + BooleanSeqS.h + +AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp + +BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/BooleanSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/CharSeqA.cpp \ + AnyTypeCode/CharSeqA.h \ + CharSeqC.cpp \ + CharSeqC.h \ + CharSeqS.h + +CLEANFILES += \ + CharSeq-stamp \ + AnyTypeCode/CharSeqA.cpp \ + AnyTypeCode/CharSeqA.h \ + CharSeqC.cpp \ + CharSeqC.h \ + CharSeqS.h + +AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp + +CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CharSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -69,7 +111,7 @@ CLEANFILES += \ AnyTypeCode/CONV_FRAMEA.cpp AnyTypeCode/CONV_FRAMEA.h CONV_FRAMEC.cpp CONV_FRAMEC.h CONV_FRAMES.h: CONV_FRAME-stamp CONV_FRAME-stamp: $(srcdir)/CONV_FRAME.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/CONV_FRAME.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/CONV_FRAME.pidl @touch $@ BUILT_SOURCES += \ @@ -90,7 +132,49 @@ CLEANFILES += \ AnyTypeCode/CurrentA.cpp AnyTypeCode/CurrentA.h CurrentC.cpp CurrentC.h CurrentS.h: Current-stamp Current-stamp: $(srcdir)/Current.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Current.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Current.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/DoubleSeqA.cpp \ + AnyTypeCode/DoubleSeqA.h \ + DoubleSeqC.cpp \ + DoubleSeqC.h \ + DoubleSeqS.h + +CLEANFILES += \ + DoubleSeq-stamp \ + AnyTypeCode/DoubleSeqA.cpp \ + AnyTypeCode/DoubleSeqA.h \ + DoubleSeqC.cpp \ + DoubleSeqC.h \ + DoubleSeqS.h + +AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp + +DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/DoubleSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/FloatSeqA.cpp \ + AnyTypeCode/FloatSeqA.h \ + FloatSeqC.cpp \ + FloatSeqC.h \ + FloatSeqS.h + +CLEANFILES += \ + FloatSeq-stamp \ + AnyTypeCode/FloatSeqA.cpp \ + AnyTypeCode/FloatSeqA.h \ + FloatSeqC.cpp \ + FloatSeqC.h \ + FloatSeqS.h + +AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp + +FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/FloatSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -109,7 +193,7 @@ CLEANFILES += \ AnyTypeCode/IIOPA.cpp AnyTypeCode/IIOPA.h IIOPC.cpp IIOPC.h: IIOP-stamp IIOP-stamp: $(srcdir)/IIOP.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP.pidl @touch $@ BUILT_SOURCES += \ @@ -130,7 +214,7 @@ CLEANFILES += \ AnyTypeCode/IIOP_EndpointsA.cpp AnyTypeCode/IIOP_EndpointsA.h IIOP_EndpointsC.cpp IIOP_EndpointsC.h IIOP_EndpointsS.h: IIOP_Endpoints-stamp IIOP_Endpoints-stamp: $(srcdir)/IIOP_Endpoints.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IIOP_Endpoints.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IIOP_Endpoints.pidl @touch $@ BUILT_SOURCES += \ @@ -151,7 +235,7 @@ CLEANFILES += \ AnyTypeCode/IOPA.cpp AnyTypeCode/IOPA.h IOPC.cpp IOPC.h IOPS.h: IOP-stamp IOP-stamp: $(srcdir)/IOP.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP.pidl @touch $@ BUILT_SOURCES += \ @@ -170,7 +254,70 @@ CLEANFILES += \ AnyTypeCode/IOP_IORA.cpp AnyTypeCode/IOP_IORA.h IOP_IORC.cpp IOP_IORC.h: IOP_IOR-stamp IOP_IOR-stamp: $(srcdir)/IOP_IOR.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/IOP_IOR.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/IOP_IOR.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/LongDoubleSeqA.cpp \ + AnyTypeCode/LongDoubleSeqA.h \ + LongDoubleSeqC.cpp \ + LongDoubleSeqC.h \ + LongDoubleSeqS.h + +CLEANFILES += \ + LongDoubleSeq-stamp \ + AnyTypeCode/LongDoubleSeqA.cpp \ + AnyTypeCode/LongDoubleSeqA.h \ + LongDoubleSeqC.cpp \ + LongDoubleSeqC.h \ + LongDoubleSeqS.h + +AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp + +LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongDoubleSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/LongLongSeqA.cpp \ + AnyTypeCode/LongLongSeqA.h \ + LongLongSeqC.cpp \ + LongLongSeqC.h \ + LongLongSeqS.h + +CLEANFILES += \ + LongLongSeq-stamp \ + AnyTypeCode/LongLongSeqA.cpp \ + AnyTypeCode/LongLongSeqA.h \ + LongLongSeqC.cpp \ + LongLongSeqC.h \ + LongLongSeqS.h + +AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp + +LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongLongSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/LongSeqA.cpp \ + AnyTypeCode/LongSeqA.h \ + LongSeqC.cpp \ + LongSeqC.h \ + LongSeqS.h + +CLEANFILES += \ + LongSeq-stamp \ + AnyTypeCode/LongSeqA.cpp \ + AnyTypeCode/LongSeqA.h \ + LongSeqC.cpp \ + LongSeqC.h \ + LongSeqS.h + +AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp + +LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/LongSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -189,7 +336,7 @@ CLEANFILES += \ AnyTypeCode/Messaging_PolicyValueA.cpp AnyTypeCode/Messaging_PolicyValueA.h Messaging_PolicyValueC.cpp Messaging_PolicyValueC.h: Messaging_PolicyValue-stamp Messaging_PolicyValue-stamp: $(srcdir)/Messaging_PolicyValue.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_PolicyValue.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_PolicyValue.pidl @touch $@ BUILT_SOURCES += \ @@ -208,7 +355,7 @@ CLEANFILES += \ AnyTypeCode/Messaging_SyncScopeA.cpp AnyTypeCode/Messaging_SyncScopeA.h Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h: Messaging_SyncScope-stamp Messaging_SyncScope-stamp: $(srcdir)/Messaging_SyncScope.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Messaging_SyncScope.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Messaging_SyncScope.pidl @touch $@ BUILT_SOURCES += \ @@ -227,7 +374,7 @@ CLEANFILES += \ AnyTypeCode/ObjectIdListA.cpp AnyTypeCode/ObjectIdListA.h ObjectIdListC.cpp ObjectIdListC.h: ObjectIdList-stamp ObjectIdList-stamp: $(srcdir)/ObjectIdList.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ObjectIdList.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ObjectIdList.pidl @touch $@ BUILT_SOURCES += \ @@ -248,7 +395,7 @@ CLEANFILES += \ AnyTypeCode/orb_typesA.cpp AnyTypeCode/orb_typesA.h orb_typesC.cpp orb_typesC.h orb_typesS.h: orb_types-stamp orb_types-stamp: $(srcdir)/orb_types.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/orb_types.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/orb_types.pidl @touch $@ BUILT_SOURCES += \ @@ -269,7 +416,7 @@ CLEANFILES += \ AnyTypeCode/ParameterModeA.cpp AnyTypeCode/ParameterModeA.h ParameterModeC.cpp ParameterModeC.h ParameterModeS.h: ParameterMode-stamp ParameterMode-stamp: $(srcdir)/ParameterMode.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ParameterMode.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ParameterMode.pidl @touch $@ BUILT_SOURCES += \ @@ -290,7 +437,7 @@ CLEANFILES += \ AnyTypeCode/Policy_ForwardA.cpp AnyTypeCode/Policy_ForwardA.h Policy_ForwardC.cpp Policy_ForwardC.h Policy_ForwardS.h: Policy_Forward-stamp Policy_Forward-stamp: $(srcdir)/Policy_Forward.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Policy_Forward.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Policy_Forward.pidl @touch $@ BUILT_SOURCES += \ @@ -309,7 +456,7 @@ CLEANFILES += \ AnyTypeCode/PI_ForwardA.cpp AnyTypeCode/PI_ForwardA.h PI_ForwardC.cpp PI_ForwardC.h: PI_Forward-stamp PI_Forward-stamp: $(srcdir)/PI_Forward.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PI_Forward.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PI_Forward.pidl @touch $@ BUILT_SOURCES += \ @@ -330,7 +477,7 @@ CLEANFILES += \ AnyTypeCode/PortableInterceptorA.cpp AnyTypeCode/PortableInterceptorA.h PortableInterceptorC.cpp PortableInterceptorC.h PortableInterceptorS.h: PortableInterceptor-stamp PortableInterceptor-stamp: $(srcdir)/PortableInterceptor.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/PortableInterceptor.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/PortableInterceptor.pidl @touch $@ BUILT_SOURCES += \ @@ -351,7 +498,49 @@ CLEANFILES += \ AnyTypeCode/ServicesA.cpp AnyTypeCode/ServicesA.h ServicesC.cpp ServicesC.h ServicesS.h: Services-stamp Services-stamp: $(srcdir)/Services.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/Services.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/Services.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/ShortSeqA.cpp \ + AnyTypeCode/ShortSeqA.h \ + ShortSeqC.cpp \ + ShortSeqC.h \ + ShortSeqS.h + +CLEANFILES += \ + ShortSeq-stamp \ + AnyTypeCode/ShortSeqA.cpp \ + AnyTypeCode/ShortSeqA.h \ + ShortSeqC.cpp \ + ShortSeqC.h \ + ShortSeqS.h + +AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h ShortSeqS.h: ShortSeq-stamp + +ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ShortSeq.pidl + @touch $@ + +BUILT_SOURCES += \ + AnyTypeCode/StringSeqA.cpp \ + AnyTypeCode/StringSeqA.h \ + StringSeqC.cpp \ + StringSeqC.h \ + StringSeqS.h + +CLEANFILES += \ + StringSeq-stamp \ + AnyTypeCode/StringSeqA.cpp \ + AnyTypeCode/StringSeqA.h \ + StringSeqC.cpp \ + StringSeqC.h \ + StringSeqS.h + +AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeqS.h: StringSeq-stamp + +StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/StringSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -372,7 +561,7 @@ CLEANFILES += \ AnyTypeCode/TAOA.cpp AnyTypeCode/TAOA.h TAOC.cpp TAOC.h TAOS.h: TAO-stamp TAO-stamp: $(srcdir)/TAO.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TAO.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TAO.pidl @touch $@ BUILT_SOURCES += \ @@ -393,217 +582,28 @@ CLEANFILES += \ AnyTypeCode/TimeBaseA.cpp AnyTypeCode/TimeBaseA.h TimeBaseC.cpp TimeBaseC.h TimeBaseS.h: TimeBase-stamp TimeBase-stamp: $(srcdir)/TimeBase.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/TimeBase.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/TimeBase.pidl @touch $@ BUILT_SOURCES += \ - AnyTypeCode/BooleanSeqA.cpp \ - AnyTypeCode/BooleanSeqA.h \ - BooleanSeqC.cpp \ - BooleanSeqC.h \ - BooleanSeqS.h - -CLEANFILES += \ - BooleanSeq-stamp \ - AnyTypeCode/BooleanSeqA.cpp \ - AnyTypeCode/BooleanSeqA.h \ - BooleanSeqC.cpp \ - BooleanSeqC.h \ - BooleanSeqS.h - -AnyTypeCode/BooleanSeqA.cpp AnyTypeCode/BooleanSeqA.h BooleanSeqC.cpp BooleanSeqC.h BooleanSeqS.h: BooleanSeq-stamp - -BooleanSeq-stamp: $(srcdir)/BooleanSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/BooleanSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/CharSeqA.cpp \ - AnyTypeCode/CharSeqA.h \ - CharSeqC.cpp \ - CharSeqC.h \ - CharSeqS.h - -CLEANFILES += \ - CharSeq-stamp \ - AnyTypeCode/CharSeqA.cpp \ - AnyTypeCode/CharSeqA.h \ - CharSeqC.cpp \ - CharSeqC.h \ - CharSeqS.h - -AnyTypeCode/CharSeqA.cpp AnyTypeCode/CharSeqA.h CharSeqC.cpp CharSeqC.h CharSeqS.h: CharSeq-stamp - -CharSeq-stamp: $(srcdir)/CharSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/CharSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/DoubleSeqA.cpp \ - AnyTypeCode/DoubleSeqA.h \ - DoubleSeqC.cpp \ - DoubleSeqC.h \ - DoubleSeqS.h - -CLEANFILES += \ - DoubleSeq-stamp \ - AnyTypeCode/DoubleSeqA.cpp \ - AnyTypeCode/DoubleSeqA.h \ - DoubleSeqC.cpp \ - DoubleSeqC.h \ - DoubleSeqS.h - -AnyTypeCode/DoubleSeqA.cpp AnyTypeCode/DoubleSeqA.h DoubleSeqC.cpp DoubleSeqC.h DoubleSeqS.h: DoubleSeq-stamp - -DoubleSeq-stamp: $(srcdir)/DoubleSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/DoubleSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/FloatSeqA.cpp \ - AnyTypeCode/FloatSeqA.h \ - FloatSeqC.cpp \ - FloatSeqC.h \ - FloatSeqS.h - -CLEANFILES += \ - FloatSeq-stamp \ - AnyTypeCode/FloatSeqA.cpp \ - AnyTypeCode/FloatSeqA.h \ - FloatSeqC.cpp \ - FloatSeqC.h \ - FloatSeqS.h - -AnyTypeCode/FloatSeqA.cpp AnyTypeCode/FloatSeqA.h FloatSeqC.cpp FloatSeqC.h FloatSeqS.h: FloatSeq-stamp - -FloatSeq-stamp: $(srcdir)/FloatSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/FloatSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/LongDoubleSeqA.cpp \ - AnyTypeCode/LongDoubleSeqA.h \ - LongDoubleSeqC.cpp \ - LongDoubleSeqC.h \ - LongDoubleSeqS.h - -CLEANFILES += \ - LongDoubleSeq-stamp \ - AnyTypeCode/LongDoubleSeqA.cpp \ - AnyTypeCode/LongDoubleSeqA.h \ - LongDoubleSeqC.cpp \ - LongDoubleSeqC.h \ - LongDoubleSeqS.h - -AnyTypeCode/LongDoubleSeqA.cpp AnyTypeCode/LongDoubleSeqA.h LongDoubleSeqC.cpp LongDoubleSeqC.h LongDoubleSeqS.h: LongDoubleSeq-stamp - -LongDoubleSeq-stamp: $(srcdir)/LongDoubleSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongDoubleSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/LongLongSeqA.cpp \ - AnyTypeCode/LongLongSeqA.h \ - LongLongSeqC.cpp \ - LongLongSeqC.h \ - LongLongSeqS.h - -CLEANFILES += \ - LongLongSeq-stamp \ - AnyTypeCode/LongLongSeqA.cpp \ - AnyTypeCode/LongLongSeqA.h \ - LongLongSeqC.cpp \ - LongLongSeqC.h \ - LongLongSeqS.h - -AnyTypeCode/LongLongSeqA.cpp AnyTypeCode/LongLongSeqA.h LongLongSeqC.cpp LongLongSeqC.h LongLongSeqS.h: LongLongSeq-stamp - -LongLongSeq-stamp: $(srcdir)/LongLongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongLongSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/LongSeqA.cpp \ - AnyTypeCode/LongSeqA.h \ - LongSeqC.cpp \ - LongSeqC.h \ - LongSeqS.h - -CLEANFILES += \ - LongSeq-stamp \ - AnyTypeCode/LongSeqA.cpp \ - AnyTypeCode/LongSeqA.h \ - LongSeqC.cpp \ - LongSeqC.h \ - LongSeqS.h - -AnyTypeCode/LongSeqA.cpp AnyTypeCode/LongSeqA.h LongSeqC.cpp LongSeqC.h LongSeqS.h: LongSeq-stamp - -LongSeq-stamp: $(srcdir)/LongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/LongSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/OctetSeqA.cpp \ - AnyTypeCode/OctetSeqA.h \ - OctetSeqC.cpp \ - OctetSeqC.h \ - OctetSeqS.h - -CLEANFILES += \ - OctetSeq-stamp \ - AnyTypeCode/OctetSeqA.cpp \ - AnyTypeCode/OctetSeqA.h \ - OctetSeqC.cpp \ - OctetSeqC.h \ - OctetSeqS.h - -AnyTypeCode/OctetSeqA.cpp AnyTypeCode/OctetSeqA.h OctetSeqC.cpp OctetSeqC.h OctetSeqS.h: OctetSeq-stamp - -OctetSeq-stamp: $(srcdir)/OctetSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/OctetSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/ShortSeqA.cpp \ - AnyTypeCode/ShortSeqA.h \ - ShortSeqC.cpp \ - ShortSeqC.h \ - ShortSeqS.h - -CLEANFILES += \ - ShortSeq-stamp \ - AnyTypeCode/ShortSeqA.cpp \ - AnyTypeCode/ShortSeqA.h \ - ShortSeqC.cpp \ - ShortSeqC.h \ - ShortSeqS.h - -AnyTypeCode/ShortSeqA.cpp AnyTypeCode/ShortSeqA.h ShortSeqC.cpp ShortSeqC.h ShortSeqS.h: ShortSeq-stamp - -ShortSeq-stamp: $(srcdir)/ShortSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ShortSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/StringSeqA.cpp \ - AnyTypeCode/StringSeqA.h \ - StringSeqC.cpp \ - StringSeqC.h \ - StringSeqS.h + AnyTypeCode/ULongLongSeqA.cpp \ + AnyTypeCode/ULongLongSeqA.h \ + ULongLongSeqC.cpp \ + ULongLongSeqC.h \ + ULongLongSeqS.h CLEANFILES += \ - StringSeq-stamp \ - AnyTypeCode/StringSeqA.cpp \ - AnyTypeCode/StringSeqA.h \ - StringSeqC.cpp \ - StringSeqC.h \ - StringSeqS.h + ULongLongSeq-stamp \ + AnyTypeCode/ULongLongSeqA.cpp \ + AnyTypeCode/ULongLongSeqA.h \ + ULongLongSeqC.cpp \ + ULongLongSeqC.h \ + ULongLongSeqS.h -AnyTypeCode/StringSeqA.cpp AnyTypeCode/StringSeqA.h StringSeqC.cpp StringSeqC.h StringSeqS.h: StringSeq-stamp +AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp -StringSeq-stamp: $(srcdir)/StringSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/StringSeq.pidl +ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongLongSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -624,28 +624,7 @@ CLEANFILES += \ AnyTypeCode/ULongSeqA.cpp AnyTypeCode/ULongSeqA.h ULongSeqC.cpp ULongSeqC.h ULongSeqS.h: ULongSeq-stamp ULongSeq-stamp: $(srcdir)/ULongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/ULongSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/UShortSeqA.cpp \ - AnyTypeCode/UShortSeqA.h \ - UShortSeqC.cpp \ - UShortSeqC.h \ - UShortSeqS.h - -CLEANFILES += \ - UShortSeq-stamp \ - AnyTypeCode/UShortSeqA.cpp \ - AnyTypeCode/UShortSeqA.h \ - UShortSeqC.cpp \ - UShortSeqC.h \ - UShortSeqS.h - -AnyTypeCode/UShortSeqA.cpp AnyTypeCode/UShortSeqA.h UShortSeqC.cpp UShortSeqC.h UShortSeqS.h: UShortSeq-stamp - -UShortSeq-stamp: $(srcdir)/UShortSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/UShortSeq.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/ULongSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -666,7 +645,7 @@ CLEANFILES += \ AnyTypeCode/WCharSeqA.cpp AnyTypeCode/WCharSeqA.h WCharSeqC.cpp WCharSeqC.h WCharSeqS.h: WCharSeq-stamp WCharSeq-stamp: $(srcdir)/WCharSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WCharSeq.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WCharSeq.pidl @touch $@ BUILT_SOURCES += \ @@ -687,28 +666,7 @@ CLEANFILES += \ AnyTypeCode/WStringSeqA.cpp AnyTypeCode/WStringSeqA.h WStringSeqC.cpp WStringSeqC.h WStringSeqS.h: WStringSeq-stamp WStringSeq-stamp: $(srcdir)/WStringSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci -Gse $(srcdir)/WStringSeq.pidl - @touch $@ - -BUILT_SOURCES += \ - AnyTypeCode/ULongLongSeqA.cpp \ - AnyTypeCode/ULongLongSeqA.h \ - ULongLongSeqC.cpp \ - ULongLongSeqC.h \ - ULongLongSeqS.h - -CLEANFILES += \ - ULongLongSeq-stamp \ - AnyTypeCode/ULongLongSeqA.cpp \ - AnyTypeCode/ULongLongSeqA.h \ - ULongLongSeqC.cpp \ - ULongLongSeqC.h \ - ULongLongSeqS.h - -AnyTypeCode/ULongLongSeqA.cpp AnyTypeCode/ULongLongSeqA.h ULongLongSeqC.cpp ULongLongSeqC.h ULongLongSeqS.h: ULongLongSeq-stamp - -ULongLongSeq-stamp: $(srcdir)/ULongLongSeq.pidl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h -Sci $(srcdir)/ULongLongSeq.pidl + $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode -Wb,export_macro=TAO_Export -Wb,export_include=tao/TAO_Export.h -Wb,anyop_export_macro=TAO_AnyTypeCode_Export -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h $(srcdir)/WStringSeq.pidl @touch $@ lib_LTLIBRARIES += libTAO.la @@ -792,9 +750,6 @@ libTAO_la_SOURCES = \ GIOP_Message_State.cpp \ GIOP_Message_Version.cpp \ GUIResource_Factory.cpp \ - HTTP_Client.cpp \ - HTTP_Handler.cpp \ - HTTP_Parser.cpp \ IFR_Client_Adapter.cpp \ IIOPC.cpp \ IIOP_Acceptor.cpp \ @@ -986,7 +941,6 @@ nobase_include_HEADERS = \ AnyTypeCode/Messaging_PolicyValueA.h \ AnyTypeCode/Messaging_SyncScopeA.h \ AnyTypeCode/ObjectIdListA.h \ - AnyTypeCode/OctetSeqA.h \ AnyTypeCode/PI_ForwardA.h \ AnyTypeCode/ParameterModeA.h \ AnyTypeCode/Policy_ForwardA.h \ @@ -998,7 +952,6 @@ nobase_include_HEADERS = \ AnyTypeCode/TimeBaseA.h \ AnyTypeCode/ULongLongSeqA.h \ AnyTypeCode/ULongSeqA.h \ - AnyTypeCode/UShortSeqA.h \ AnyTypeCode/WCharSeqA.h \ AnyTypeCode/WStringSeqA.h \ AnyTypeCode/orb_typesA.h \ @@ -1039,8 +992,10 @@ nobase_include_HEADERS = \ Bounded_Object_Reference_Sequence_T.h \ Bounded_Reference_Allocation_Traits_T.h \ Bounded_Sequence_CDR_T.h \ + Bounded_String_Sequence_T.h \ Bounded_Value_Allocation_Traits_T.h \ Bounded_Value_Sequence_T.h \ + Bounded_Wstring_Sequence_T.h \ Buffer_Allocator_T.cpp \ Buffer_Allocator_T.h \ Buffering_Constraint_Policy.h \ @@ -1154,9 +1109,6 @@ nobase_include_HEADERS = \ GIOP_Utils.h \ GUIResource_Factory.h \ Generic_Sequence_T.h \ - HTTP_Client.h \ - HTTP_Handler.h \ - HTTP_Parser.h \ IFR_Client_Adapter.h \ IIOP.pidl \ IIOP.pidl \ @@ -1292,7 +1244,6 @@ nobase_include_HEADERS = \ Objref_VarOut_T.cpp \ Objref_VarOut_T.h \ OctetSeq.pidl \ - OctetSeq.pidl \ OctetSeqC.h \ OctetSeqS.h \ On_Demand_Fragmentation_Strategy.h \ @@ -1457,7 +1408,6 @@ nobase_include_HEADERS = \ ULongSeqC.h \ ULongSeqS.h \ UShortSeq.pidl \ - UShortSeq.pidl \ UShortSeqC.h \ UShortSeqS.h \ Unbounded_Array_Allocation_Traits_T.h \ @@ -1467,8 +1417,10 @@ nobase_include_HEADERS = \ Unbounded_Octet_Sequence_T.h \ Unbounded_Reference_Allocation_Traits_T.h \ Unbounded_Sequence_CDR_T.h \ + Unbounded_String_Sequence_T.h \ Unbounded_Value_Allocation_Traits_T.h \ Unbounded_Value_Sequence_T.h \ + Unbounded_Wstring_Sequence_T.h \ UserException.h \ UserException.inl \ Value_Traits_T.h \ @@ -1842,6 +1794,7 @@ nobase_include_HEADERS += \ AnyTypeCode/Objref_TypeCode.inl \ AnyTypeCode/Objref_TypeCode_Static.h \ AnyTypeCode/Objref_TypeCode_Static.inl \ + AnyTypeCode/OctetSeqA.h \ AnyTypeCode/PolicyA.h \ AnyTypeCode/Recursive_Type_TypeCode.cpp \ AnyTypeCode/Recursive_Type_TypeCode.h \ @@ -1888,6 +1841,7 @@ nobase_include_HEADERS += \ AnyTypeCode/TypeCode_Traits.h \ AnyTypeCode/TypeCode_Value_Field.h \ AnyTypeCode/Typecode_typesA.h \ + AnyTypeCode/UShortSeqA.h \ AnyTypeCode/Union_TypeCode.cpp \ AnyTypeCode/Union_TypeCode.h \ AnyTypeCode/Union_TypeCode.inl \ @@ -5360,6 +5314,7 @@ EXTRA_DIST += \ ## Makefile.Strategies.am if BUILD_EXCEPTIONS +if !BUILD_ACE_FOR_TAO BUILT_SOURCES += \ Strategies/uiop_endpointsC.cpp \ @@ -5486,6 +5441,7 @@ nobase_include_HEADERS += \ Strategies/COIOP_Endpoint.h \ Strategies/COIOP_Endpoint.inl \ Strategies/COIOP_Endpoints.pidl \ + Strategies/COIOP_Endpoints.pidl \ Strategies/COIOP_EndpointsC.h \ Strategies/COIOP_EndpointsS.h \ Strategies/COIOP_Factory.h \ @@ -5537,10 +5493,12 @@ nobase_include_HEADERS += \ Strategies/UIOP_Transport.h \ Strategies/advanced_resource.h \ Strategies/sciop_endpoints.pidl \ + Strategies/sciop_endpoints.pidl \ Strategies/sciop_endpointsC.h \ Strategies/sciop_endpointsS.h \ Strategies/strategies_export.h \ Strategies/uiop_endpoints.pidl \ + Strategies/uiop_endpoints.pidl \ Strategies/uiop_endpointsC.h \ Strategies/uiop_endpointsS.h @@ -5553,6 +5511,7 @@ CLEANFILES += \ TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in +endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS EXTRA_DIST += \ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index da12853bf47..4b33583f878 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -250,11 +250,11 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) tm_ (), tss_cleanup_funcs_ (), tss_resources_ (), - has_shutdown_ (true), // Start the ORB in a "shutdown" state. Only - // after CORBA::ORB_init() is called will the - // ORB no longer be shutdown. This does not - // mean that the ORB can be reinitialized. It - // can only be initialized once. + has_shutdown_ (1), // Start the ORB in a "shutdown" state. Only + // after CORBA::ORB_init() is called will the + // ORB no longer be shutdown. This does not + // mean that the ORB can be reinitialized. It + // can only be initialized once. thread_per_connection_use_timeout_ (1), open_lock_ (), endpoint_selector_factory_ (0), @@ -1345,7 +1345,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // The ORB has been initialized, meaning that the ORB is no longer // in the shutdown state. - this->has_shutdown_ = false; + this->has_shutdown_ = 0; return 0; } @@ -2178,7 +2178,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, // We don't need to do this because we use the Reactor // mechanisms to shutdown in a thread-safe way. - while (this->has_shutdown () == false) + while (this->has_shutdown () == 0) { // Every time we perform an interation we have to become the // leader again, because it is possible that a client has @@ -2250,7 +2250,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, // Otherwise just continue.. } - if (this->has_shutdown () == true && + if (this->has_shutdown () == 1 && this->server_factory_->activate_server_connections ()) this->tm_.wait (); @@ -2273,7 +2273,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); - if (this->has_shutdown () == true) + if (this->has_shutdown () != 0) return; // Check if we are on the right state, i.e. do not accept @@ -2285,7 +2285,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion // Set the 'has_shutdown' flag, so any further attempt to shutdown // becomes a noop. - this->has_shutdown_ = true; + this->has_shutdown_ = 1; // need to release the mutex, because some of the shutdown // operations invoke application code, that could (and in practice diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 6c4403358d4..d114ef39412 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -596,7 +596,7 @@ public: ACE_ENV_ARG_DECL); /// Get the shutdown flag value - bool has_shutdown (void) const; + int has_shutdown (void); /// Shutdown the ORB and free resources void destroy (ACE_ENV_SINGLE_ARG_DECL); @@ -1183,7 +1183,7 @@ protected: ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_; /// Flag which denotes that the ORB has been shutdown. - bool has_shutdown_; + int has_shutdown_; /// The value of the timeout if the flag above is not zero. //@{ diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 480a0df637c..ca3defce178 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -346,8 +346,8 @@ TAO_ORB_Core::tss_cleanup_funcs (void) return &(this->tss_cleanup_funcs_); } -ACE_INLINE bool -TAO_ORB_Core::has_shutdown (void) const +ACE_INLINE int +TAO_ORB_Core::has_shutdown (void) { return this->has_shutdown_; } diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index 30589312738..19ad732f38c 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -17,6 +17,9 @@ * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h * OctetSeq.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp new file mode 100644 index 00000000000..93c712762cb --- /dev/null +++ b/TAO/tao/OctetSeqC.cpp @@ -0,0 +1,124 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:288 + + +#include "tao/OctetSeqC.h" +#include "tao/CDR.h" +#include "tao/ORB_Core.h" + +// TAO_IDL - Generated from +// be\be_visitor_arg_traits.cpp:70 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_OCTETSEQ_CS_) +#define _CORBA_OCTETSEQ_CS_ + +CORBA::OctetSeq::OctetSeq (void) +{} + +CORBA::OctetSeq::OctetSeq ( + CORBA::ULong max + ) + : TAO::unbounded_value_sequence< + CORBA::Octet + > + (max) +{} + +CORBA::OctetSeq::OctetSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet * buffer, + CORBA::Boolean release + ) + : TAO::unbounded_value_sequence< + CORBA::Octet + > + (max, length, buffer, release) +{} + +CORBA::OctetSeq::OctetSeq ( + const OctetSeq &seq + ) + : TAO::unbounded_value_sequence< + CORBA::Octet + > + (seq) +{} + +CORBA::OctetSeq::~OctetSeq (void) +{} + +void CORBA::OctetSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + OctetSeq * _tao_tmp_pointer = + static_cast<OctetSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_ +#define _TAO_CDR_OP_CORBA_OctetSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::OctetSeq &_tao_sequence + ) +{ + return TAO::marshal_sequence(strm, _tao_sequence); +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::OctetSeq &_tao_sequence + ) +{ + return TAO::demarshal_sequence(strm, _tao_sequence); +} + +#endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h new file mode 100644 index 00000000000..ab093f703bd --- /dev/null +++ b/TAO/tao/OctetSeqC.h @@ -0,0 +1,175 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:154 + +#ifndef _TAO_IDL_OCTETSEQC_H_ +#define _TAO_IDL_OCTETSEQC_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "tao/TAO_Export.h" +#include "tao/Environment.h" +#include "tao/Sequence_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:49 + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_OCTETSEQ_CH_) +#define _CORBA_OCTETSEQ_CH_ + + class OctetSeq; + + typedef + TAO_FixedSeq_Var_T< + OctetSeq + > + OctetSeq_var; + + typedef + TAO_Seq_Out_T< + OctetSeq + > + OctetSeq_out; + + class TAO_Export OctetSeq + : public + TAO::unbounded_value_sequence< + CORBA::Octet + > + { + public: + OctetSeq (void); + OctetSeq (CORBA::ULong max); + OctetSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet* buffer, + CORBA::Boolean release = false + ); + OctetSeq (const OctetSeq &); + ~OctetSeq (void); + + static void _tao_any_destructor (void *); + + typedef OctetSeq_var _var_type; + typedef OctetSeq_out _out_type; + +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + OctetSeq ( + CORBA::ULong length, + const ACE_Message_Block* mb + ) + : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {} +#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ + }; + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:78 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:61 + +// Traits specializations. +namespace TAO +{ +} + +// Workaround for a Visual Studio .NET bug where this class is not +// properly imported by an application if typedef'd or subclassed, +// resulting in 'multiply defined' link errors. The export macro +// here forces an explicit import by the application. Please see +// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 +// The problem stems from use of the type below in PortableServer, +// but we put the instantiation here because the application will +// need to see it in *C.h to avoid the error. +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_ +#define _TAO_CDR_OP_CORBA_OctetSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::OctetSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::OctetSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ + +// TAO_IDL - Generated from +// be\be_codegen.cpp:1062 + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h new file mode 100644 index 00000000000..17b1360599e --- /dev/null +++ b/TAO/tao/OctetSeqS.h @@ -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 + +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index e51f5208e3d..d0530021af4 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -39,6 +39,10 @@ #include "tao/AnyTypeCode_Adapter.h" #include "ace/Dynamic_Service.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + #if !defined (__ACE_INLINE__) #include "tao/PolicyC.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp index e5fca921aaa..e5fca921aaa 100644..100755 --- a/TAO/tao/PortableServer/Servant_var.cpp +++ b/TAO/tao/PortableServer/Servant_var.cpp diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 5004ae93159..5004ae93159 100644..100755 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl index 66796f4499a..66796f4499a 100644..100755 --- a/TAO/tao/PortableServer/Servant_var.inl +++ b/TAO/tao/PortableServer/Servant_var.inl diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp index d8ba19c57d0..e14004464f1 100644 --- a/TAO/tao/QtResource/QtResource_Factory.cpp +++ b/TAO/tao/QtResource/QtResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/QtResource/QtResource_Factory.h" #include "tao/debug.h" -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" ACE_RCSID (TAO_QtResource, QtResource_Factory, @@ -25,7 +25,7 @@ namespace TAO { ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - QApplication is undefined.", - " Cannot create ACE_QtReactor \n")); + " Cannot create ACE_XtReactor \n")); return 0; } diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h index 8c63bc68f18..8af126b607a 100644 --- a/TAO/tao/QtResource/QtResource_Factory.h +++ b/TAO/tao/QtResource/QtResource_Factory.h @@ -21,7 +21,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include <qapplication.h> -#include "ace/QtReactor/QtReactor.h" +#include "ace/QtReactor.h" #include "tao/GUIResource_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index f4ee888505b..5105a76b7df 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -2,12 +2,14 @@ #include "tao/Unbounded_Octet_Sequence_T.h" #include "tao/Unbounded_Value_Sequence_T.h" -#include "tao/Unbounded_Basic_String_Sequence_T.h" +#include "tao/Unbounded_Wstring_Sequence_T.h" +#include "tao/Unbounded_String_Sequence_T.h" #include "tao/Unbounded_Object_Reference_Sequence_T.h" #include "tao/Unbounded_Array_Sequence_T.h" #include "tao/Unbounded_Sequence_CDR_T.h" #include "tao/Bounded_Value_Sequence_T.h" -#include "tao/Bounded_Basic_String_Sequence_T.h" +#include "tao/Bounded_Wstring_Sequence_T.h" +#include "tao/Bounded_String_Sequence_T.h" #include "tao/Bounded_Object_Reference_Sequence_T.h" #include "tao/Bounded_Array_Sequence_T.h" #include "tao/Bounded_Sequence_CDR_T.h" diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 0085c0e009e..15a60e3197b 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,6 +1,7 @@ //$Id$ -project : taolib, core, core_anytypecode, core_strategies, tao_versioning_idl_defaults { +project : taolib, core, core_anytypecode, tao_versioning_idl_defaults { + avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL @@ -25,6 +26,7 @@ project : taolib, core, core_anytypecode, core_strategies, tao_versioning_idl_de } PIDL_Files { + Strategies } IDL_Files { diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index df0e1fe9ecb..567542945ca 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -263,7 +263,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, // Get the number of elements - CORBA::ULong const count = profiles.profile_count (); + CORBA::ULong count = profiles.profile_count (); // Set the number of elements in the sequence of tagged_profile ior_info->profiles.length (count); @@ -413,6 +413,53 @@ TAO_Stub::forward_back_one (void) // routines need only ensure that the data being passed in is not // being modified by any other thread. // +// As an _experiment_ (to estimate the performance cost) remote calls +// are currently deemed "cancel-safe". That means that they can be +// called by threads when they're in asynchronous cancellation mode. +// The only effective way to do this is to disable async cancellation +// for the duration of the call. There are numerous rude interactions +// with code generators for C++ ... cancellation handlers just do +// normal stack unwinding like exceptions, but exceptions are purely +// synchronous and sophisticated code generators rely on that to +// generate better code, which in some cases may be very hard to +// unwind. + +class TAO_Synchronous_Cancellation_Required +// = TITLE +// Stick one of these at the beginning of a block that can't +// support asynchronous cancellation, and which must be +// cancel-safe. +// +// = EXAMPLE +// somefunc() +// { +// TAO_Synchronous_Cancellation_Required NOT_USED; +// ... +// } +{ +public: + // These should probably be in a separate inline file, but they're + // only used within this one file right now, and we always want them + // inlined, so here they sit. + TAO_Synchronous_Cancellation_Required (void) + : old_type_ (0) + { +#if !defined (VXWORKS) + ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_); +#endif /* ! VXWORKS */ + } + + ~TAO_Synchronous_Cancellation_Required (void) + { +#if !defined (VXWORKS) + int dont_care; + ACE_OS::thr_setcanceltype(old_type_, &dont_care); +#endif /* ! VXWORKS */ + } +private: + int old_type_; +}; + // **************************************************************** #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -540,20 +587,10 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types ACE_ENV_ARG_DECL) { if (this->policies_ == 0) - { - CORBA::PolicyList *policy_list_ptr = 0; - ACE_NEW_THROW_EX (policy_list_ptr, - CORBA::PolicyList (), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); + return 0; - return policy_list_ptr; - } - else - { - return this->policies_->get_policy_overrides (types - ACE_ENV_ARG_PARAMETER); - } + return this->policies_->get_policy_overrides (types + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -592,7 +629,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) { const TAO_MProfile& mprofile = this->base_profiles_; - CORBA::ULong const profile_count = mprofile.profile_count (); + CORBA::ULong profile_count = mprofile.profile_count (); if ((cdr << profile_count) == 0) return 0; @@ -621,7 +658,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr) ? *(this->forward_profiles_perm_) : this->base_profiles_; - CORBA::ULong const profile_count = mprofile.profile_count (); + CORBA::ULong profile_count = mprofile.profile_count (); if ((cdr << profile_count) == 0) return 0; diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 8873a811a89..5c8582c2f82 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -10,7 +10,6 @@ #include "tao/CORBANAME_Parser.h" #include "tao/CORBALOC_Parser.h" #include "tao/FILE_Parser.h" -#include "tao/HTTP_Parser.h" #include "tao/DLL_Parser.h" #include "tao/ORB_Core.h" #include "tao/Adapter_Factory.h" @@ -540,7 +539,6 @@ namespace pcfg->process_directive (ace_svc_desc_TAO_CORBALOC_Parser); pcfg->process_directive (ace_svc_desc_TAO_FILE_Parser); pcfg->process_directive (ace_svc_desc_TAO_DLL_Parser); - pcfg->process_directive (ace_svc_desc_TAO_HTTP_Parser); pcfg->process_directive (ace_svc_desc_TAO_Default_Stub_Factory); pcfg->process_directive ( ace_svc_desc_TAO_Default_Endpoint_Selector_Factory); diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp index 32ad31eacb2..622a0fb45cf 100644 --- a/TAO/tao/TkResource/TkResource_Factory.cpp +++ b/TAO/tao/TkResource/TkResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/TkResource/TkResource_Factory.h" #include "tao/debug.h" -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" ACE_RCSID( TAO_TkResource, TkResource_Factory, diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h index fd2f5461556..f4aab08db60 100644 --- a/TAO/tao/TkResource/TkResource_Factory.h +++ b/TAO/tao/TkResource/TkResource_Factory.h @@ -13,7 +13,7 @@ #ifndef TAO_TKRESOURCE_FACTORY_H #define TAO_TKRESOURCE_FACTORY_H #include /**/ "ace/pre.h" -#include "ace/TkReactor/TkReactor.h" +#include "ace/TkReactor.h" #include "tao/TkResource/TAO_TkResource_Export.h" #include "tao/GUIResource_Factory.h" diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl index b8fb7df4f34..9a6e6bd9667 100644 --- a/TAO/tao/UShortSeq.pidl +++ b/TAO/tao/UShortSeq.pidl @@ -14,6 +14,9 @@ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" * UShortSeq.pidl + * + * Patches for changes to the generated code are available in the + * `diffs' directory. */ // ================================================================ diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp new file mode 100644 index 00000000000..53db618d251 --- /dev/null +++ b/TAO/tao/UShortSeqC.cpp @@ -0,0 +1,127 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:291 + + +#include "tao/UShortSeqC.h" +#include "tao/CDR.h" + +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_arg_traits.cpp:70 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +// Arg traits specializations. +namespace TAO +{ +} + + +// TAO_IDL - Generated from +// be\be_visitor_sequence/sequence_cs.cpp:65 + +#if !defined (_CORBA_USHORTSEQ_CS_) +#define _CORBA_USHORTSEQ_CS_ + +CORBA::UShortSeq::UShortSeq (void) +{} + +CORBA::UShortSeq::UShortSeq ( + CORBA::ULong max + ) + : TAO::unbounded_value_sequence< + CORBA::UShort + > + (max) +{} + +CORBA::UShortSeq::UShortSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::UShort * buffer, + CORBA::Boolean release + ) + : TAO::unbounded_value_sequence< + CORBA::UShort + > + (max, length, buffer, release) +{} + +CORBA::UShortSeq::UShortSeq ( + const UShortSeq &seq + ) + : TAO::unbounded_value_sequence< + CORBA::UShort + > + (seq) +{} + +CORBA::UShortSeq::~UShortSeq (void) +{} + +void CORBA::UShortSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + UShortSeq * _tao_tmp_pointer = + static_cast<UShortSeq *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_cs.cpp:96 + +#if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_ +#define _TAO_CDR_OP_CORBA_UShortSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::UShortSeq &_tao_sequence + ) +{ + return TAO::marshal_sequence(strm, _tao_sequence); +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::UShortSeq &_tao_sequence + ) +{ + return TAO::demarshal_sequence(strm, _tao_sequence); +} + +#endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h new file mode 100644 index 00000000000..71584f71a87 --- /dev/null +++ b/TAO/tao/UShortSeqC.h @@ -0,0 +1,177 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be\be_codegen.cpp:153 + +#ifndef _TAO_IDL_ORIG_USHORTSEQC_H_ +#define _TAO_IDL_ORIG_USHORTSEQC_H_ + +#include /**/ "ace/pre.h" + + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "tao/TAO_Export.h" +#include "tao/ORB.h" +#include "tao/Environment.h" +#include "tao/Sequence_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace CORBA +{ + + // TAO_IDL - Generated from + // be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_USHORTSEQ_CH_) +#define _CORBA_USHORTSEQ_CH_ + + class UShortSeq; + + typedef + TAO_FixedSeq_Var_T< + UShortSeq + > + UShortSeq_var; + + typedef + TAO_Seq_Out_T< + UShortSeq + > + UShortSeq_out; + + class TAO_Export UShortSeq + : public + TAO::unbounded_value_sequence< + CORBA::UShort + > + { + public: + UShortSeq (void); + UShortSeq (CORBA::ULong max); + UShortSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::UShort* buffer, + CORBA::Boolean release = false + ); + UShortSeq (const UShortSeq &); + ~UShortSeq (void); + + static void _tao_any_destructor (void *); + + typedef UShortSeq_var _var_type; + typedef UShortSeq_out _out_type; + }; + +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA + +// TAO_IDL - Generated from +// be\be_visitor_traits.cpp:61 + +// Traits specializations. +namespace TAO +{ +} + +// Workaround for a Visual Studio .NET bug where this class is not +// properly imported by an application if typedef'd or subclassed, +// resulting in 'multiply defined' link errors. The export macro +// here forces an explicit import by the application. Please see +// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 +// The problem stems from use of the type below in DsLogAdmin, +// but we put the instantiation here because the application will +// need to see it in *C.h to avoid the error. +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + template class TAO_Export TAO::unbounded_value_sequence<CORBA::UShortSeq>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + +// TAO_IDL - Generated from +// be\be_visitor_sequence/cdr_op_ch.cpp:71 + +#if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_ +#define _TAO_CDR_OP_CORBA_UShortSeq_H_ + +TAO_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const CORBA::UShortSeq & + ); +TAO_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + CORBA::UShortSeq & + ); + +#endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */ + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +TAO_END_VERSIONED_NAMESPACE_DECL + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + + diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h new file mode 100644 index 00000000000..17b1360599e --- /dev/null +++ b/TAO/tao/UShortSeqS.h @@ -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 + +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h index 69ce15dfd58..79aed91cb64 100644 --- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h @@ -18,6 +18,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { +namespace details +{ + template<typename charT> class unbounded_basic_string_sequence { @@ -100,6 +103,8 @@ public: private: implementation_type impl_; }; + +} // namespace details } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index a9a22457e65..519a1a1b989 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -317,8 +317,8 @@ namespace TAO { } template <typename stream, typename charT> - bool demarshal_sequence(stream & strm, TAO::unbounded_basic_string_sequence <charT> & target) { - typedef TAO::unbounded_basic_string_sequence <charT> sequence; + bool demarshal_sequence(stream & strm, TAO::details::unbounded_basic_string_sequence <charT> & target) { + typedef TAO::details::unbounded_basic_string_sequence <charT> sequence; typedef typename sequence::element_traits::string_var string_var; ::CORBA::ULong new_length = 0; if (!(strm >> new_length)) { @@ -533,7 +533,7 @@ namespace TAO { } template <typename stream, typename charT> - bool marshal_sequence(stream & strm, const TAO::unbounded_basic_string_sequence <charT> & source) { + bool marshal_sequence(stream & strm, const TAO::details::unbounded_basic_string_sequence <charT> & source) { if (0 == &source) ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false); ::CORBA::ULong const length = source.length (); diff --git a/TAO/tao/Unbounded_String_Sequence_T.h b/TAO/tao/Unbounded_String_Sequence_T.h new file mode 100644 index 00000000000..9b126308dcd --- /dev/null +++ b/TAO/tao/Unbounded_String_Sequence_T.h @@ -0,0 +1,43 @@ +#ifndef guard_unbounded_string_sequence_hpp +#define guard_unbounded_string_sequence_hpp +/** + * @file + * + * @brief Implement unbounded sequences for strings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ +#include "tao/Unbounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +class unbounded_string_sequence + : public details::unbounded_basic_string_sequence<char> +{ +public: + inline unbounded_string_sequence() + : details::unbounded_basic_string_sequence<char>() + {} + inline explicit unbounded_string_sequence(CORBA::ULong maximum) + : details::unbounded_basic_string_sequence<char>(maximum) + {} + inline unbounded_string_sequence( + CORBA::ULong maximum, + CORBA::ULong length, + value_type * data, + CORBA::Boolean release = false) + : details::unbounded_basic_string_sequence<char>( + maximum, length, data, release) + {} +}; + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_unbounded_string_sequence_hpp diff --git a/TAO/tao/Unbounded_Wstring_Sequence_T.h b/TAO/tao/Unbounded_Wstring_Sequence_T.h new file mode 100644 index 00000000000..fe8bd1d14b2 --- /dev/null +++ b/TAO/tao/Unbounded_Wstring_Sequence_T.h @@ -0,0 +1,43 @@ +#ifndef guard_unbounded_wstring_sequence_hpp +#define guard_unbounded_wstring_sequence_hpp +/** + * @file + * + * @brief Implement unbounded sequences for wide strings. + * + * $Id$ + * + * @author Carlos O'Ryan + */ +#include "tao/Unbounded_Basic_String_Sequence_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace TAO +{ + +class unbounded_wstring_sequence + : public details::unbounded_basic_string_sequence<CORBA::WChar> +{ +public: + inline unbounded_wstring_sequence() + : details::unbounded_basic_string_sequence<CORBA::WChar>() + {} + inline /* explicit */ unbounded_wstring_sequence(CORBA::ULong maximum) + : details::unbounded_basic_string_sequence<CORBA::WChar>(maximum) + {} + inline unbounded_wstring_sequence( + CORBA::ULong maximum, + CORBA::ULong length, + value_type * data, + CORBA::Boolean release = false) + : details::unbounded_basic_string_sequence<CORBA::WChar>( + maximum, length, data, release) + {} +}; + +} // namespace TAO + +TAO_END_VERSIONED_NAMESPACE_DECL + +#endif // guard_unbounded_wstring_sequence_hpp diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 5afc6af0025..50229951b3c 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -191,10 +191,10 @@ namespace CORBA public: // otherwise these cannot be called from a static function - /// During marshal jump to the most derived part + /// during marshal jump to the most derived part virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const = 0; - /// Called after obtaining the fresh object from create_for_unmarshal () + /// called after obtaining the fresh object from create_for_unmarshal () virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0; /// Notify the truncated parent valuetype to skip the rest of the chunks diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index 40bc92b1281..f4a6272d3c0 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -6,4 +6,4 @@ #define TAO_MAJOR_VERSION 1 #define TAO_MINOR_VERSION 5 #define TAO_BETA_VERSION 4 -#define TAO_VERSION "1.5.4" +#define TAO_VERSION " 1.5.4" diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp index 3a3ad30376e..0bd2f417292 100644 --- a/TAO/tao/XtResource/XtResource_Factory.cpp +++ b/TAO/tao/XtResource/XtResource_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/XtResource/XtResource_Factory.h" #include "tao/debug.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" ACE_RCSID( TAO_XtResource, XtResource_Factory, diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h index 85f184ae631..5099969e25c 100644 --- a/TAO/tao/XtResource/XtResource_Factory.h +++ b/TAO/tao/XtResource/XtResource_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include /**/ <X11/Intrinsic.h> #include "tao/XtResource/TAO_XtResource_Export.h" -#include "ace/XtReactor/XtReactor.h" +#include "ace/XtReactor.h" #include "tao/GUIResource_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 29082bada75..34418e1b0d5 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -601,7 +601,7 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names, } // OK fallback on the hardcoded ones.... - this->parser_names_count_ = 6; // HOW MANY DO WE HAVE? + this->parser_names_count_ = 5; // HOW MANY DO WE HAVE? ACE_NEW_RETURN (this->parser_names_, char *[this->parser_names_count_], -1); @@ -623,9 +623,6 @@ TAO_Default_Resource_Factory::get_parser_names (char **&names, this->parser_names_[index] = CORBA::string_dup ("MCAST_Parser"); ++index; - this->parser_names_[index] = CORBA::string_dup ("HTTP_Parser"); - ++index; - names = this->parser_names_; number_of_names = index; diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff new file mode 100644 index 00000000000..fb15f742a61 --- /dev/null +++ b/TAO/tao/diffs/OctetSeq.diff @@ -0,0 +1,21 @@ +--- orig/OctetSeqC.h 2005-04-08 10:17:34.108726400 +0200 ++++ OctetSeqC.h 2005-04-08 10:17:41.829828800 +0200 +@@ -141,6 +141,18 @@ + { + } + ++// Workaround for a Visual Studio .NET bug where this class is not ++// properly imported by an application if typedef'd or subclassed, ++// resulting in 'multiply defined' link errors. The export macro ++// here forces an explicit import by the application. Please see ++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 ++// The problem stems from use of the type below in PortableServer, ++// but we put the instantiation here because the application will ++// need to see it in *C.h to avoid the error. ++#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT ++ template class TAO_Export TAO::unbounded_value_sequence<CORBA::OctetSeq>; ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ ++ + // TAO_IDL - Generated from + // be\be_visitor_sequence/any_op_ch.cpp:52 + diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff new file mode 100644 index 00000000000..1938744506a --- /dev/null +++ b/TAO/tao/diffs/UShortSeq.diff @@ -0,0 +1,21 @@ +--- orig/UShortSeqC.h 2005-04-08 10:17:34.909878400 +0200 ++++ UShortSeqC.h 2005-04-08 10:17:41.759728000 +0200 +@@ -133,6 +133,18 @@ + { + } + ++// Workaround for a Visual Studio .NET bug where this class is not ++// properly imported by an application if typedef'd or subclassed, ++// resulting in 'multiply defined' link errors. The export macro ++// here forces an explicit import by the application. Please see ++// http://support.microsoft.com/default.aspx?scid=kb;en-us;309801 ++// The problem stems from use of the type below in DsLogAdmin, ++// but we put the instantiation here because the application will ++// need to see it in *C.h to avoid the error. ++#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT ++ template class TAO_Export TAO_Unbounded_Sequence<CORBA::UShortSeq>; ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ ++ + // TAO_IDL - Generated from + // be\be_visitor_sequence/any_op_ch.cpp:52 + diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index d6523c3cc66..8caf8dfac31 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -4,13 +4,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers sharedname = TAO dynamicflags = TAO_BUILD_DLL - idlflags += -SS -Sorb -GA -Ge 1 -Gp -Gd -oA AnyTypeCode \ - -Wb,export_macro=TAO_Export \ - -Wb,export_include=tao/TAO_Export.h \ - -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ - -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - idlflags -= -Sa -St - Source_Files(TAO_COMPONENTS) { Abstract_Servant_Base.cpp Acceptor_Filter.cpp @@ -85,9 +78,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers GIOP_Message_State.cpp GIOP_Message_Version.cpp GIOPC.cpp - HTTP_Client.cpp - HTTP_Handler.cpp - HTTP_Parser.cpp IFR_Client_Adapter.cpp IIOP_Acceptor.cpp IIOP_Connection_Handler.cpp @@ -278,8 +268,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers Bounded_Object_Reference_Sequence_T.h Bounded_Reference_Allocation_Traits_T.h Bounded_Sequence_CDR_T.h + Bounded_String_Sequence_T.h Bounded_Value_Allocation_Traits_T.h Bounded_Value_Sequence_T.h + Bounded_Wstring_Sequence_T.h Buffer_Allocator_T.h Buffering_Constraint_Policy.h Cache_Entries.h @@ -357,9 +349,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers GIOPS.h GIOP_Utils.h GUIResource_Factory.h - HTTP_Client.h - HTTP_Handler.h - HTTP_Parser.h IFR_Client_Adapter.h IIOP_Acceptor.h IIOPC.h @@ -548,8 +537,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers Unbounded_Octet_Sequence_T.h Unbounded_Reference_Allocation_Traits_T.h Unbounded_Sequence_CDR_T.h + Unbounded_String_Sequence_T.h Unbounded_Value_Allocation_Traits_T.h Unbounded_Value_Sequence_T.h + Unbounded_Wstring_Sequence_T.h UserException.h UShortSeqC.h UShortSeqS.h @@ -591,17 +582,35 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers } IDL_Files { + idlflags += -Gp -Gd -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ + -Wb,export_macro=TAO_Export \ + -Wb,export_include=tao/TAO_Export.h \ + -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ + -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h + idlflags -= -Sa -St GIOP.pidl >> AnyTypeCode/GIOPA.h AnyTypeCode/GIOPA.cpp } IDL_Files { - idlflags += -Sci + idlflags += -Gp -Gd -Sci -SS -Sorb -GA -Ge 1 -oA AnyTypeCode \ + -Wb,export_macro=TAO_Export \ + -Wb,export_include=tao/TAO_Export.h \ + -Wb,anyop_export_macro=TAO_AnyTypeCode_Export \ + -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h + idlflags -= -Sa -St + BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp + CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp CONV_FRAME.pidl >> AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CONV_FRAMEA.cpp Current.pidl >> AnyTypeCode/CurrentA.h AnyTypeCode/CurrentA.cpp + DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp + FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp IIOP.pidl >> AnyTypeCode/IIOPA.h AnyTypeCode/IIOPA.cpp IIOP_Endpoints.pidl >> AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IIOP_EndpointsA.cpp IOP.pidl >> AnyTypeCode/IOPA.h AnyTypeCode/IOPA.cpp IOP_IOR.pidl >> AnyTypeCode/IOP_IORA.h AnyTypeCode/IOP_IORA.cpp + LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp + LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp + LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp Messaging_PolicyValue.pidl >> AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_PolicyValueA.cpp Messaging_SyncScope.pidl >> AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/Messaging_SyncScopeA.cpp ObjectIdList.pidl >> AnyTypeCode/ObjectIdListA.h AnyTypeCode/ObjectIdListA.cpp @@ -611,43 +620,25 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers PI_Forward.pidl >> AnyTypeCode/PI_ForwardA.h AnyTypeCode/PI_ForwardA.cpp PortableInterceptor.pidl >> AnyTypeCode/PortableInterceptorA.h AnyTypeCode/PortableInterceptorA.cpp Services.pidl >> AnyTypeCode/ServicesA.h AnyTypeCode/ServicesA.cpp - TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp - TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp - } - - IDL_Files { - idlflags += -Sci -Gse - BooleanSeq.pidl >> AnyTypeCode/BooleanSeqA.h AnyTypeCode/BooleanSeqA.cpp - CharSeq.pidl >> AnyTypeCode/CharSeqA.h AnyTypeCode/CharSeqA.cpp - DoubleSeq.pidl >> AnyTypeCode/DoubleSeqA.h AnyTypeCode/DoubleSeqA.cpp - FloatSeq.pidl >> AnyTypeCode/FloatSeqA.h AnyTypeCode/FloatSeqA.cpp - LongDoubleSeq.pidl >> AnyTypeCode/LongDoubleSeqA.h AnyTypeCode/LongDoubleSeqA.cpp - LongLongSeq.pidl >> AnyTypeCode/LongLongSeqA.h AnyTypeCode/LongLongSeqA.cpp - LongSeq.pidl >> AnyTypeCode/LongSeqA.h AnyTypeCode/LongSeqA.cpp - OctetSeq.pidl >> AnyTypeCode/OctetSeqA.h AnyTypeCode/OctetSeqA.cpp ShortSeq.pidl >> AnyTypeCode/ShortSeqA.h AnyTypeCode/ShortSeqA.cpp StringSeq.pidl >> AnyTypeCode/StringSeqA.h AnyTypeCode/StringSeqA.cpp + TAO.pidl >> AnyTypeCode/TAOA.h AnyTypeCode/TAOA.cpp + TimeBase.pidl >> AnyTypeCode/TimeBaseA.h AnyTypeCode/TimeBaseA.cpp + ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp ULongSeq.pidl >> AnyTypeCode/ULongSeqA.h AnyTypeCode/ULongSeqA.cpp - UShortSeq.pidl >> AnyTypeCode/UShortSeqA.h AnyTypeCode/UShortSeqA.cpp WCharSeq.pidl >> AnyTypeCode/WCharSeqA.h AnyTypeCode/WCharSeqA.cpp WStringSeq.pidl >> AnyTypeCode/WStringSeqA.h AnyTypeCode/WStringSeqA.cpp } - IDL_Files { - idlflags += -Sci - ULongLongSeq.pidl >> AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongLongSeqA.cpp - } - // These headers are generated by the above *.pidl files. Header_Files { AnyTypeCode/GIOPA.h - AnyTypeCode/BooleanSeqA.h + AnyTypeCode/BooleanSeqA.h AnyTypeCode/CONV_FRAMEA.h AnyTypeCode/CharSeqA.h AnyTypeCode/CurrentA.h AnyTypeCode/DoubleSeqA.h AnyTypeCode/FloatSeqA.h - AnyTypeCode/LongSeqA.h AnyTypeCode/IIOPA.h AnyTypeCode/IIOP_EndpointsA.h AnyTypeCode/IOPA.h @@ -658,7 +649,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/Messaging_PolicyValueA.h AnyTypeCode/Messaging_SyncScopeA.h AnyTypeCode/ObjectIdListA.h - AnyTypeCode/OctetSeqA.h AnyTypeCode/PI_ForwardA.h AnyTypeCode/ParameterModeA.h AnyTypeCode/Policy_ForwardA.h @@ -670,11 +660,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core, tao_vers AnyTypeCode/TimeBaseA.h AnyTypeCode/ULongLongSeqA.h AnyTypeCode/ULongSeqA.h - AnyTypeCode/UShortSeqA.h AnyTypeCode/WCharSeqA.h AnyTypeCode/WStringSeqA.h AnyTypeCode/orb_typesA.h - } + } Pkgconfig_Files { TAO.pc.in |