From 9efe4f87ec47869f2f1f88af382a9dd8a0853a2c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 8 Jan 2007 18:57:08 +0000 Subject: Mon Jan 8 18:56:55 UTC 2007 Johnny Willemsen --- TAO/ChangeLog | 25 ++ TAO/tao/AnyTypeCode.mpc | 18 +- TAO/tao/AnyTypeCode/Dynamic.pidl | 6 +- TAO/tao/AnyTypeCode/DynamicA.cpp | 291 --------------------- TAO/tao/AnyTypeCode/DynamicA.h | 146 ----------- TAO/tao/AnyTypeCode/DynamicC.cpp | 208 --------------- TAO/tao/AnyTypeCode/DynamicC.h | 259 ------------------ TAO/tao/AnyTypeCode/DynamicS.h | 28 -- .../ServantRetentionStrategyRetain.cpp | 10 + TAO/tests/IDL_Test/IDL_Test.mpc | 1 + TAO/tests/IDL_Test/typecode.idl | 25 ++ 11 files changed, 70 insertions(+), 947 deletions(-) delete mode 100644 TAO/tao/AnyTypeCode/DynamicA.cpp delete mode 100644 TAO/tao/AnyTypeCode/DynamicA.h delete mode 100644 TAO/tao/AnyTypeCode/DynamicC.cpp delete mode 100644 TAO/tao/AnyTypeCode/DynamicC.h delete mode 100644 TAO/tao/AnyTypeCode/DynamicS.h create mode 100644 TAO/tests/IDL_Test/typecode.idl diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 24acf7dba13..04f7f2ac3d9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,28 @@ +Mon Jan 8 18:56:55 UTC 2007 Johnny Willemsen + + * tao/AnyTypeCode.mpc: + Cleanup and added regeneration of Dynamic.pidl + + * tao/AnyTypeCode/Dynamic.pidl: + Removed TypeCode interface and include other pidl + file that has TypeCode + + * tao/AnyTypeCode/DynamicA.cpp: + * tao/AnyTypeCode/DynamicA.h: + * tao/AnyTypeCode/DynamicC.cpp: + * tao/AnyTypeCode/DynamicC.h: + * tao/AnyTypeCode/DynamicS.h: + Removed from the repo, they are now generated on the fly + + * tao/PortableServer/ServantRetentionStrategyRetain.cpp (servant_to_system_id_i): + Added special check for CORBA/e so that the correct exception is thrown + + * tests/IDL_Test/typecode.idl: + New idl file used to test how to regenerate Dynamic.pidl + + * IDL_Test/IDL_Test.mpc: + Added typecode.idl + Mon Jan 8 16:02:13 UTC 2007 Ciju John * docs/ORBEndpoint.html: diff --git a/TAO/tao/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode.mpc index de13ea65e18..68cf2424f57 100644 --- a/TAO/tao/AnyTypeCode.mpc +++ b/TAO/tao/AnyTypeCode.mpc @@ -3,6 +3,12 @@ project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_AnyTypeCode dynamicflags = TAO_ANYTYPECODE_BUILD_DLL + idlflags += -Gp -Gd -Sci -SS -GA \ + -Wb,export_macro=TAO_AnyTypeCode_Export \ + -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \ + -o AnyTypeCode + idlflags -= -Sa -St + Source_Files(TAO_ANYTYPECODE_COMPONENTS) { AnyTypeCode/Alias_TypeCode_Static.cpp AnyTypeCode/Any.cpp @@ -143,23 +149,15 @@ project : taolib, install, extra_anytypecode, tao_versioning_idl_defaults { } IDL_Files { - idlflags += -Gp -Gd -Sci -SS -Sorb -GA \ - -Wb,export_macro=TAO_AnyTypeCode_Export \ - -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \ - -o AnyTypeCode - idlflags -= -Sa -St + idlflags += -Sorb AnyTypeCode/AnySeq.pidl AnyTypeCode/Dynamic_Parameter.pidl AnyTypeCode/ValueModifier.pidl AnyTypeCode/Visibility.pidl + AnyTypeCode/Dynamic.pidl } IDL_Files { - idlflags += -Gp -Gd -Sci -SS -GA \ - -Wb,export_macro=TAO_AnyTypeCode_Export \ - -Wb,export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h \ - -o AnyTypeCode - idlflags -= -Sa -St AnyTypeCode/Bounds.pidl } diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl index 51c4053c75f..13ff084dd8a 100644 --- a/TAO/tao/AnyTypeCode/Dynamic.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic.pidl @@ -26,16 +26,12 @@ // Used primarily for Interceptors #include "tao/AnyTypeCode/Dynamic_Parameter.pidl" +#include "tao/Typecode_types.pidl" #include "tao/StringSeq.pidl" #ifndef _DYNAMIC_IDL_ #define _DYNAMIC_IDL_ -module CORBA -{ - interface TypeCode; -}; - module Dynamic { typeprefix Dynamic "omg.org"; diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp deleted file mode 100644 index 4f17ea24008..00000000000 --- a/TAO/tao/AnyTypeCode/DynamicA.cpp +++ /dev/null @@ -1,291 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#include "tao/AnyTypeCode/DynamicA.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/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" - -#include "tao/AnyTypeCode/StringSeqA.h" -#include "tao/AnyTypeCode/Dynamic_ParameterA.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -#ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD -#define _TAO_TYPECODE_Dynamic_ParameterList_GUARD -namespace TAO -{ - namespace TypeCode - { - TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - Dynamic_ParameterList_0 ( - CORBA::tk_sequence, - &Dynamic::_tc_Parameter, - 0U); - - ::CORBA::TypeCode_ptr const tc_Dynamic_ParameterList_0 = - &Dynamic_ParameterList_0; - - } -} - - -#endif /* _TAO_TYPECODE_Dynamic_ParameterList_GUARD */ - -static TAO::TypeCode::Alias - _tao_tc_Dynamic_ParameterList ( - CORBA::tk_alias, - "IDL:omg.org/Dynamic/ParameterList:1.0", - "ParameterList", - &TAO::TypeCode::tc_Dynamic_ParameterList_0); - -namespace Dynamic -{ - ::CORBA::TypeCode_ptr const _tc_ParameterList = - &_tao_tc_Dynamic_ParameterList; -} - -// TAO_IDL - Generated from -// be\be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias - _tao_tc_Dynamic_ContextList ( - CORBA::tk_alias, - "IDL:omg.org/Dynamic/ContextList:1.0", - "ContextList", - &CORBA::_tc_StringSeq); - -namespace Dynamic -{ - ::CORBA::TypeCode_ptr const _tc_ContextList = - &_tao_tc_Dynamic_ContextList; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/alias_typecode.cpp:50 - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:937 - -namespace CORBA -{ - extern ::CORBA::TypeCode_ptr const _tc_TypeCode; -} - - -#ifndef _TAO_TYPECODE_Dynamic_ExceptionList_GUARD -#define _TAO_TYPECODE_Dynamic_ExceptionList_GUARD -namespace TAO -{ - namespace TypeCode - { - TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - Dynamic_ExceptionList_0 ( - CORBA::tk_sequence, - &CORBA::_tc_TypeCode, - 0U); - - ::CORBA::TypeCode_ptr const tc_Dynamic_ExceptionList_0 = - &Dynamic_ExceptionList_0; - - } -} - - -#endif /* _TAO_TYPECODE_Dynamic_ExceptionList_GUARD */ - -static TAO::TypeCode::Alias - _tao_tc_Dynamic_ExceptionList ( - CORBA::tk_alias, - "IDL:omg.org/Dynamic/ExceptionList:1.0", - "ExceptionList", - &TAO::TypeCode::tc_Dynamic_ExceptionList_0); - -namespace Dynamic -{ - ::CORBA::TypeCode_ptr const _tc_ExceptionList = - &_tao_tc_Dynamic_ExceptionList; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias - _tao_tc_Dynamic_RequestContext ( - CORBA::tk_alias, - "IDL:omg.org/Dynamic/RequestContext:1.0", - "RequestContext", - &CORBA::_tc_StringSeq); - -namespace Dynamic -{ - ::CORBA::TypeCode_ptr const _tc_RequestContext = - &_tao_tc_Dynamic_RequestContext; -} - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_cs.cpp:54 - - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const Dynamic::ParameterList &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert_copy ( - _tao_any, - Dynamic::ParameterList::_tao_any_destructor, - TAO::TypeCode::tc_Dynamic_ParameterList_0, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - Dynamic::ParameterList *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert ( - _tao_any, - Dynamic::ParameterList::_tao_any_destructor, - TAO::TypeCode::tc_Dynamic_ParameterList_0, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - Dynamic::ParameterList *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const Dynamic::ParameterList *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const Dynamic::ParameterList *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T::extract ( - _tao_any, - Dynamic::ParameterList::_tao_any_destructor, - TAO::TypeCode::tc_Dynamic_ParameterList_0, - _tao_elem - ); -} - - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_cs.cpp:54 - - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const Dynamic::ExceptionList &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert_copy ( - _tao_any, - Dynamic::ExceptionList::_tao_any_destructor, - TAO::TypeCode::tc_Dynamic_ExceptionList_0, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - Dynamic::ExceptionList *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert ( - _tao_any, - Dynamic::ExceptionList::_tao_any_destructor, - TAO::TypeCode::tc_Dynamic_ExceptionList_0, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - Dynamic::ExceptionList *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const Dynamic::ExceptionList *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const Dynamic::ExceptionList *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T::extract ( - _tao_any, - Dynamic::ExceptionList::_tao_any_destructor, - TAO::TypeCode::tc_Dynamic_ExceptionList_0, - _tao_elem - ); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicA.h b/TAO/tao/AnyTypeCode/DynamicA.h deleted file mode 100644 index a327a5a461a..00000000000 --- a/TAO/tao/AnyTypeCode/DynamicA.h +++ /dev/null @@ -1,146 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:153 - -#ifndef _TAO_IDL_ORIG_DYNAMICA_H_ -#define _TAO_IDL_ORIG_DYNAMICA_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/DynamicC.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 -{ -} // module CORBA - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 - -namespace Dynamic -{ - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_ParameterList; - - extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_ContextList; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_ExceptionList; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_RequestContext; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 - -} // module Dynamic - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&); - -// TAO_IDL - Generated from -// be\be_visitor_interface_fwd/any_op_ch.cpp:63 - -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr); // copying -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr *); // non-copying -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeCode *&); - -// TAO_IDL - Generated from -// be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version -TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated -TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&); - -// TAO_IDL - Generated from -// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66 - -TAO_AnyTypeCode_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypeCode_ptr ); -TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCode_ptr &); - - -// 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/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp deleted file mode 100644 index 4cd49b59b28..00000000000 --- a/TAO/tao/AnyTypeCode/DynamicC.cpp +++ /dev/null @@ -1,208 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:291 - - -#include "tao/AnyTypeCode/DynamicC.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 (_DYNAMIC_PARAMETERLIST_CS_) -#define _DYNAMIC_PARAMETERLIST_CS_ - -Dynamic::ParameterList::ParameterList (void) -{} - -Dynamic::ParameterList::ParameterList ( - CORBA::ULong max - ) - : TAO::unbounded_value_sequence< - Dynamic::Parameter - > - (max) -{} - -Dynamic::ParameterList::ParameterList ( - CORBA::ULong max, - CORBA::ULong length, - Dynamic::Parameter * buffer, - CORBA::Boolean release - ) - : TAO::unbounded_value_sequence< - Dynamic::Parameter - > - (max, length, buffer, release) -{} - -Dynamic::ParameterList::ParameterList ( - const ParameterList &seq - ) - : TAO::unbounded_value_sequence< - Dynamic::Parameter - > - (seq) -{} - -Dynamic::ParameterList::~ParameterList (void) -{} - -void Dynamic::ParameterList::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - ParameterList * _tao_tmp_pointer = - static_cast (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_DYNAMIC_EXCEPTIONLIST_CS_) -#define _DYNAMIC_EXCEPTIONLIST_CS_ - -Dynamic::ExceptionList::ExceptionList (void) -{} - -Dynamic::ExceptionList::ExceptionList ( - CORBA::ULong max - ) - : TAO::unbounded_object_reference_sequence< - CORBA::TypeCode, - CORBA::TypeCode_var - > - (max) -{} - -Dynamic::ExceptionList::ExceptionList ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::TypeCode_ptr * buffer, - CORBA::Boolean release - ) - : TAO::unbounded_object_reference_sequence< - CORBA::TypeCode, - CORBA::TypeCode_var - > - (max, length, buffer, release) -{} - -Dynamic::ExceptionList::ExceptionList ( - const ExceptionList &seq - ) - : TAO::unbounded_object_reference_sequence< - CORBA::TypeCode, - CORBA::TypeCode_var - > - (seq) -{} - -Dynamic::ExceptionList::~ExceptionList (void) -{} - -void Dynamic::ExceptionList::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - ExceptionList * _tao_tmp_pointer = - static_cast (_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_Dynamic_ParameterList_CPP_ -#define _TAO_CDR_OP_Dynamic_ParameterList_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Dynamic::ParameterList &_tao_sequence - ) -{ - return TAO::marshal_sequence(strm, _tao_sequence); -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - Dynamic::ParameterList &_tao_sequence - ) -{ - return TAO::demarshal_sequence(strm, _tao_sequence); -} - -#endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */ - - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_cs.cpp:96 - -#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ -#define _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Dynamic::ExceptionList &_tao_sequence - ) -{ - return TAO::marshal_sequence(strm, _tao_sequence); -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - Dynamic::ExceptionList &_tao_sequence - ) -{ - return TAO::demarshal_sequence(strm, _tao_sequence); -} - -#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h deleted file mode 100644 index c345eb2c66d..00000000000 --- a/TAO/tao/AnyTypeCode/DynamicC.h +++ /dev/null @@ -1,259 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:153 - -#ifndef _TAO_IDL_ORIG_DYNAMICC_H_ -#define _TAO_IDL_ORIG_DYNAMICC_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/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Dynamic_ParameterC.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "tao/Sequence_T.h" -#include "tao/Objref_VarOut_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" - -#include "tao/StringSeqC.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_interface.cpp:598 - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 - -namespace Dynamic -{ - // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_DYNAMIC_PARAMETERLIST_CH_) -#define _DYNAMIC_PARAMETERLIST_CH_ - - class ParameterList; - - typedef - TAO_VarSeq_Var_T< - ParameterList - > - ParameterList_var; - - typedef - TAO_Seq_Out_T< - ParameterList - > - ParameterList_out; - - class TAO_AnyTypeCode_Export ParameterList - : public - TAO::unbounded_value_sequence< - Parameter - > - { - public: - ParameterList (void); - ParameterList (CORBA::ULong max); - ParameterList ( - CORBA::ULong max, - CORBA::ULong length, - Parameter* buffer, - CORBA::Boolean release = false - ); - ParameterList (const ParameterList &); - ~ParameterList (void); - - static void _tao_any_destructor (void *); - - typedef ParameterList_var _var_type; - typedef ParameterList_out _out_type; - }; - -#endif /* end #if !defined */ - - - // TAO_IDL - Generated from - // be\be_visitor_typedef/typedef_ch.cpp:472 - - typedef CORBA::StringSeq ContextList; - typedef CORBA::StringSeq_var ContextList_var; - typedef CORBA::StringSeq_out ContextList_out; - - // TAO_IDL - Generated from - // be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_DYNAMIC_EXCEPTIONLIST_CH_) -#define _DYNAMIC_EXCEPTIONLIST_CH_ - - class ExceptionList; - - typedef - TAO_VarSeq_Var_T< - ExceptionList - > - ExceptionList_var; - - typedef - TAO_Seq_Out_T< - ExceptionList - > - ExceptionList_out; - - class TAO_AnyTypeCode_Export ExceptionList - : public - TAO::unbounded_object_reference_sequence< - CORBA::TypeCode, - CORBA::TypeCode_var - > - { - public: - ExceptionList (void); - ExceptionList (CORBA::ULong max); - ExceptionList ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::TypeCode_ptr* buffer, - CORBA::Boolean release = false - ); - ExceptionList (const ExceptionList &); - ~ExceptionList (void); - - static void _tao_any_destructor (void *); - - typedef ExceptionList_var _var_type; - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_typedef/typedef_ch.cpp:472 - - typedef CORBA::StringSeq RequestContext; - typedef CORBA::StringSeq_var RequestContext_var; - typedef CORBA::StringSeq_out RequestContext_out; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 - -} // module Dynamic - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 - -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_ -#define _TAO_CDR_OP_Dynamic_ParameterList_H_ - -TAO_AnyTypeCode_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const Dynamic::ParameterList & - ); -TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - Dynamic::ParameterList & - ); - -#endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */ - - -// Traits specializations. -// TAO_IDL - Generated from -// be\be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_ -#define _TAO_CDR_OP_Dynamic_ExceptionList_H_ - -TAO_AnyTypeCode_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const Dynamic::ExceptionList & - ); -TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - Dynamic::ExceptionList & - ); - -#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_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/AnyTypeCode/DynamicS.h b/TAO/tao/AnyTypeCode/DynamicS.h deleted file mode 100644 index 17b1360599e..00000000000 --- a/TAO/tao/AnyTypeCode/DynamicS.h +++ /dev/null @@ -1,28 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index fb660291d17..b12a5e5b324 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -646,6 +646,15 @@ namespace TAO PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)) { +#if defined (CORBA_E_COMPACT) || defined (CORBA_E_MICRO) + if (this->poa_->allow_multiple_activations () || + this->poa_->allow_implicit_activation ()) + { + ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (), + 0); + } + +#else // This operation requires the RETAIN and either the UNIQUE_ID or // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy // exception is raised. @@ -655,6 +664,7 @@ namespace TAO ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (), 0); } +#endif // This operation has three possible behaviors. diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc index 3e58b5b00c5..605c9b51fbf 100644 --- a/TAO/tests/IDL_Test/IDL_Test.mpc +++ b/TAO/tests/IDL_Test/IDL_Test.mpc @@ -40,6 +40,7 @@ project(*Main): taoserver, messaging { typedef.idl valuetype.idl array_only.idl + typecode.idl } Source_Files { diff --git a/TAO/tests/IDL_Test/typecode.idl b/TAO/tests/IDL_Test/typecode.idl new file mode 100644 index 00000000000..c3dee7f5c70 --- /dev/null +++ b/TAO/tests/IDL_Test/typecode.idl @@ -0,0 +1,25 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO/tests/IDL_Test +// +// = FILENAME +// typecode.idl +// +// = DESCRIPTION +// Test a sequence of typecodes +// +// = AUTHORS +// Johnny Willemsen +// +// ============================================================================ + +#include "orb.idl" + +module MyModule +{ + typedef sequence TypeCodeList; +}; + -- cgit v1.2.1