diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-18 10:41:45 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-18 10:41:45 +0000 |
| commit | e9609066a1435af63d609372e26cd9dc93c5075c (patch) | |
| tree | a1d17cb211c0fbc5a5e90dbe072022cdb6466d9e /TAO | |
| parent | d8af3c8dea81b49ab7ee008c1ca8e22835cfea76 (diff) | |
| download | ATCD-e9609066a1435af63d609372e26cd9dc93c5075c.tar.gz | |
ChangeLogTag: Fri Feb 18 10:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
54 files changed, 707 insertions, 2659 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index c7d63afe8a9..f2616ee02e1 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,6 +1,7 @@ Fri Feb 18 10:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/ciao/Servant_Activator.h: + * ciao/Servant_Activator.h: Added missing includes because of POA refactoring Thu Feb 17 14:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/CIAO/ciao/Servant_Activator.h b/TAO/CIAO/ciao/Servant_Activator.h index a9f75028a67..27ed074b1b7 100644 --- a/TAO/CIAO/ciao/Servant_Activator.h +++ b/TAO/CIAO/ciao/Servant_Activator.h @@ -22,6 +22,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/ServantActivatorC.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl index 475f22faf45..35490999997 100644 --- a/TAO/tao/ImR_Client/ImplRepo.pidl +++ b/TAO/tao/ImR_Client/ImplRepo.pidl @@ -15,6 +15,7 @@ */ //============================================================================= +///FUZZ: disable check_for_include/ #include <tao/ImR_Client/ServerObject.pidl> module ImplementationRepository diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp index 741bb0a51d5..2abe8eecf91 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.cpp +++ b/TAO/tao/ImR_Client/ImplRepoC.cpp @@ -209,7 +209,7 @@ CORBA::Exception *ImplementationRepository::AlreadyRegistered::_alloc (void) CORBA::Exception * ImplementationRepository::AlreadyRegistered::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::ImplementationRepository::AlreadyRegistered (*this), @@ -359,7 +359,7 @@ CORBA::Exception *ImplementationRepository::CannotActivate::_alloc (void) CORBA::Exception * ImplementationRepository::CannotActivate::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::ImplementationRepository::CannotActivate (*this), @@ -526,7 +526,7 @@ CORBA::Exception *ImplementationRepository::NotFound::_alloc (void) CORBA::Exception * ImplementationRepository::NotFound::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::ImplementationRepository::NotFound (*this), @@ -975,7 +975,7 @@ ImplementationRepository::ServerInformationIterator::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -1677,7 +1677,7 @@ ImplementationRepository::Administration::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -2090,7 +2090,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp index cdc16592d52..6c4d05c7cf5 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.cpp +++ b/TAO/tao/ImR_Client/ImplRepoS.cpp @@ -184,7 +184,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POAmerge\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1365,7 +1365,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POAmerge\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -5033,7 +5033,7 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1683 +// be\be_visitor_root/root.cpp:1563 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp index 5ba981694ba..dbb3565410a 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.cpp +++ b/TAO/tao/ImR_Client/ServerObjectC.cpp @@ -265,7 +265,7 @@ ImplementationRepository::ServerObject::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { @@ -324,7 +324,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp index f8ebdd3ea44..50d246e52c0 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.cpp +++ b/TAO/tao/ImR_Client/ServerObjectS.cpp @@ -89,7 +89,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POAmerge\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1190,7 +1190,7 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1683 +// be\be_visitor_root/root.cpp:1563 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl index f252872229e..d040d036790 100644 --- a/TAO/tao/PortableServer/AdapterActivator.pidl +++ b/TAO/tao/PortableServer/AdapterActivator.pidl @@ -20,6 +20,7 @@ #ifndef _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_ #define _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_ +///FUZZ: disable check_for_include/ #include <tao/PortableServer/PS_Forward.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index e04c08a9822..0a325fd9dd7 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -172,11 +172,11 @@ PortableServer::AdapterActivator::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -188,11 +188,11 @@ const char* PortableServer::AdapterActivator::_interface_repository_id (void) co CORBA::Boolean PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index 5fa76eb34a7..2e4ad351639 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -115,7 +115,7 @@ CORBA::Exception *PortableServer::ForwardRequest::_alloc (void) CORBA::Exception * PortableServer::ForwardRequest::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::ForwardRequest (*this), @@ -274,7 +274,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl index 908388bc2a6..2e1397bdb4a 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_ #define _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index ba6b3a547b1..c4ff80cb39d 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -174,11 +174,11 @@ PortableServer::IdAssignmentPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,7 +190,7 @@ const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) CORBA::Boolean PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -216,7 +216,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolic } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl index 80fdd4f2a1a..5c07905daa3 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_ #define _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index 3c1de6ba8fc..6229c1f6250 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -174,11 +174,11 @@ PortableServer::IdUniquenessPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,7 +190,7 @@ const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) CORBA::Boolean PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -216,7 +216,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolic } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl index ed0f8b58393..6fb021d858d 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_ #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index 7238d4075f5..a7aec1b47bb 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -176,11 +176,11 @@ PortableServer::ImplicitActivationPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -192,7 +192,7 @@ const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id ( CORBA::Boolean PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -218,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivatio } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl index ef459cdc4cb..b90c3d1842b 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.pidl +++ b/TAO/tao/PortableServer/LifespanPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_LIFESPANPOLICY_IDL_ #define _PORTABLESERVER_LIFESPANPOLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index 782618d6a53..dd6e1882355 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -174,11 +174,11 @@ PortableServer::LifespanPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -190,7 +190,7 @@ const char* PortableServer::LifespanPolicy::_interface_repository_id (void) cons CORBA::Boolean PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -216,7 +216,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyVal } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index 19778a4437e..42d794701ed 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -150,7 +150,7 @@ CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void) CORBA::Exception * PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POAManager::AdapterInactive (*this), @@ -307,11 +307,11 @@ PortableServer::POAManager::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -323,11 +323,11 @@ const char* PortableServer::POAManager::_interface_repository_id (void) const CORBA::Boolean PortableServer::POAManager::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl index 6fa66b44751..b6c888542a6 100644 --- a/TAO/tao/PortableServer/PS_Current.pidl +++ b/TAO/tao/PortableServer/PS_Current.pidl @@ -20,6 +20,7 @@ #ifndef _PORTABLESERVER_CURRENT_IDL_ #define _PORTABLESERVER_CURRENT_IDL_ +///FUZZ: disable check_for_include/ #include <tao/PortableServer/PS_Forward.pidl> #include <tao/Current.pidl> diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 7e5d186e784..838252b2232 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -150,7 +150,7 @@ CORBA::Exception *PortableServer::Current::NoContext::_alloc (void) CORBA::Exception * PortableServer::Current::NoContext::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::Current::NoContext (*this), @@ -308,11 +308,11 @@ PortableServer::Current::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -324,11 +324,11 @@ const char* PortableServer::Current::_interface_repository_id (void) const CORBA::Boolean PortableServer::Current::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl index 4dd9aa54e6e..626ebe22a7b 100644 --- a/TAO/tao/PortableServer/PS_Forward.pidl +++ b/TAO/tao/PortableServer/PS_Forward.pidl @@ -24,6 +24,7 @@ #ifndef _PORTABLESERVER_PS_FORWARD_IDL_ #define _PORTABLESERVER_PS_FORWARD_IDL_ +///FUZZ: disable check_for_include/ #include <tao/OctetSeq.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index aa47f1adf1c..bac32a7e17c 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -51,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 8e891c9fd1f..92ca576d177 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -80,41 +80,41 @@ class TAO_DynamicImplementation; namespace PortableServer { - typedef TAO_ServantBase ServantBase; - typedef TAO_ServantBase_var ServantBase_var; - typedef TAO_RefCountServantBase RefCountServantBase; - typedef ServantBase *Servant; - - typedef TAO_Local_ServantBase LocalServantBase; - typedef TAO_DynamicImplementation DynamicImplementation; - + typedef TAO_ServantBase ServantBase; + typedef TAO_ServantBase_var ServantBase_var; + typedef TAO_RefCountServantBase RefCountServantBase; + typedef ServantBase *Servant; + + typedef TAO_Local_ServantBase LocalServantBase; + typedef TAO_DynamicImplementation DynamicImplementation; + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 - + typedef CORBA::OctetSeq ObjectId; typedef CORBA::OctetSeq_var ObjectId_var; typedef CORBA::OctetSeq_out ObjectId_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_) #define _PORTABLESERVER_POA__VAR_OUT_CH_ - + class POA; typedef POA *POA_ptr; - + typedef TAO_Objref_Var_T< POA > POA_var; - + typedef TAO_Objref_Out_T< POA diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 86291ec1cf4..613b9afe230 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -44,9 +44,10 @@ #ifndef _PORTABLE_SERVER_IDL_ #define _PORTABLE_SERVER_IDL_ -#include <orb_types.pidl> -#include <Policy_Forward.pidl> -#include <OctetSeq.pidl> +///FUZZ: disable check_for_include/ +#include <tao/Policy_Forward.pidl> +#include <tao/OctetSeq.pidl> +#include <tao/orb_types.pidl> #include <tao/PortableServer/PS_Forward.pidl> #include <tao/PortableServer/IdAssignmentPolicy.pidl> #include <tao/PortableServer/IdUniquenessPolicy.pidl> diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 7abbd382fa2..e7d22f613ea 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -52,7 +52,7 @@ namespace TAO { #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_) #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_PortableServer_Export Arg_Traits<PortableServer::AdapterActivator> : public @@ -68,7 +68,7 @@ namespace TAO #endif /* end #if !defined */ } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_PORTABLESERVER_POALIST_CS_) @@ -164,7 +164,7 @@ TAO::Objref_Traits<PortableServer::POA>::marshal ( return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void) @@ -223,7 +223,7 @@ CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void) CORBA::Exception * PortableServer::POA::AdapterAlreadyExists::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::AdapterAlreadyExists (*this), @@ -266,26 +266,26 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] = { TAO_ENCAP_BYTE_ORDER, // byte order 56, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f41), - ACE_NTOHL (0x64617074), - ACE_NTOHL (0x6572416c), - ACE_NTOHL (0x72656164), - ACE_NTOHL (0x79457869), - ACE_NTOHL (0x7374733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f41), + ACE_NTOHL (0x64617074), + ACE_NTOHL (0x6572416c), + ACE_NTOHL (0x72656164), + ACE_NTOHL (0x79457869), + ACE_NTOHL (0x7374733a), ACE_NTOHL (0x322e3300), // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3 21, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657241), - ACE_NTOHL (0x6c726561), - ACE_NTOHL (0x64794578), - ACE_NTOHL (0x69737473), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x74657241), + ACE_NTOHL (0x6c726561), + ACE_NTOHL (0x64794578), + ACE_NTOHL (0x69737473), ACE_NTOHL (0x0), // name = AdapterAlreadyExists 0, // member count }; @@ -301,7 +301,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void) @@ -360,7 +360,7 @@ CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void) CORBA::Exception * PortableServer::POA::AdapterNonExistent::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::AdapterNonExistent (*this), @@ -403,25 +403,25 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] = { TAO_ENCAP_BYTE_ORDER, // byte order 54, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f41), - ACE_NTOHL (0x64617074), - ACE_NTOHL (0x65724e6f), - ACE_NTOHL (0x6e457869), - ACE_NTOHL (0x7374656e), - ACE_NTOHL (0x743a322e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f41), + ACE_NTOHL (0x64617074), + ACE_NTOHL (0x65724e6f), + ACE_NTOHL (0x6e457869), + ACE_NTOHL (0x7374656e), + ACE_NTOHL (0x743a322e), ACE_NTOHL (0x33000000), // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3 19, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724e), - ACE_NTOHL (0x6f6e4578), - ACE_NTOHL (0x69737465), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465724e), + ACE_NTOHL (0x6f6e4578), + ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e740000), // name = AdapterNonExistent 0, // member count }; @@ -437,7 +437,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::InvalidPolicy::InvalidPolicy (void) @@ -498,7 +498,7 @@ CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void) CORBA::Exception * PortableServer::POA::InvalidPolicy::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::InvalidPolicy (*this), @@ -557,27 +557,27 @@ static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f49), - ACE_NTOHL (0x6e76616c), - ACE_NTOHL (0x6964506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a322e33), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f49), + ACE_NTOHL (0x6e76616c), + ACE_NTOHL (0x6964506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a322e33), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3 14, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696450), - ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696450), + ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = InvalidPolicy 1, // member count 6, - ACE_NTOHL (0x696e6465), + ACE_NTOHL (0x696e6465), ACE_NTOHL (0x78000000), // name = index CORBA::tk_ushort, @@ -594,7 +594,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = &_tc_TAO_tc_PortableServer_POA_InvalidPolicy; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 #if (TAO_HAS_MINIMUM_POA == 0) @@ -655,7 +655,7 @@ CORBA::Exception *PortableServer::POA::NoServant::_alloc (void) CORBA::Exception * PortableServer::POA::NoServant::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::NoServant (*this), @@ -698,21 +698,21 @@ static const CORBA::Long _oc_PortableServer_POA_NoServant[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f4e), - ACE_NTOHL (0x6f536572), - ACE_NTOHL (0x76616e74), - ACE_NTOHL (0x3a322e33), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f4e), + ACE_NTOHL (0x6f536572), + ACE_NTOHL (0x76616e74), + ACE_NTOHL (0x3a322e33), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3 10, - ACE_NTOHL (0x4e6f5365), - ACE_NTOHL (0x7276616e), + ACE_NTOHL (0x4e6f5365), + ACE_NTOHL (0x7276616e), ACE_NTOHL (0x74000000), // name = NoServant 0, // member count }; @@ -730,7 +730,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant ( #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void) @@ -789,7 +789,7 @@ CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void) CORBA::Exception * PortableServer::POA::ObjectAlreadyActive::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::ObjectAlreadyActive (*this), @@ -832,25 +832,25 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f4f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x74416c72), - ACE_NTOHL (0x65616479), - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76653a32), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f4f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x74416c72), + ACE_NTOHL (0x65616479), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76653a32), ACE_NTOHL (0x2e330000), // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3 20, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x6374416c), - ACE_NTOHL (0x72656164), - ACE_NTOHL (0x79416374), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x6374416c), + ACE_NTOHL (0x72656164), + ACE_NTOHL (0x79416374), ACE_NTOHL (0x69766500), // name = ObjectAlreadyActive 0, // member count }; @@ -866,7 +866,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::ObjectNotActive::ObjectNotActive (void) @@ -925,7 +925,7 @@ CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void) CORBA::Exception * PortableServer::POA::ObjectNotActive::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::ObjectNotActive (*this), @@ -968,23 +968,23 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f4f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x744e6f74), - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76653a32), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f4f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x744e6f74), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76653a32), ACE_NTOHL (0x2e330000), // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3 16, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744e6f), - ACE_NTOHL (0x74416374), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744e6f), + ACE_NTOHL (0x74416374), ACE_NTOHL (0x69766500), // name = ObjectNotActive 0, // member count }; @@ -1000,7 +1000,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = &_tc_TAO_tc_PortableServer_POA_ObjectNotActive; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void) @@ -1059,7 +1059,7 @@ CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void) CORBA::Exception * PortableServer::POA::ServantAlreadyActive::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::ServantAlreadyActive (*this), @@ -1102,26 +1102,26 @@ static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order 56, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f53), - ACE_NTOHL (0x65727661), - ACE_NTOHL (0x6e74416c), - ACE_NTOHL (0x72656164), - ACE_NTOHL (0x79416374), - ACE_NTOHL (0x6976653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f53), + ACE_NTOHL (0x65727661), + ACE_NTOHL (0x6e74416c), + ACE_NTOHL (0x72656164), + ACE_NTOHL (0x79416374), + ACE_NTOHL (0x6976653a), ACE_NTOHL (0x322e3300), // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3 21, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x616e7441), - ACE_NTOHL (0x6c726561), - ACE_NTOHL (0x64794163), - ACE_NTOHL (0x74697665), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x616e7441), + ACE_NTOHL (0x6c726561), + ACE_NTOHL (0x64794163), + ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = ServantAlreadyActive 0, // member count }; @@ -1137,7 +1137,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::ServantNotActive::ServantNotActive (void) @@ -1196,7 +1196,7 @@ CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void) CORBA::Exception * PortableServer::POA::ServantNotActive::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::ServantNotActive (*this), @@ -1239,24 +1239,24 @@ static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order 52, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f53), - ACE_NTOHL (0x65727661), - ACE_NTOHL (0x6e744e6f), - ACE_NTOHL (0x74416374), - ACE_NTOHL (0x6976653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f53), + ACE_NTOHL (0x65727661), + ACE_NTOHL (0x6e744e6f), + ACE_NTOHL (0x74416374), + ACE_NTOHL (0x6976653a), ACE_NTOHL (0x322e3300), // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:2.3 17, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x616e744e), - ACE_NTOHL (0x6f744163), - ACE_NTOHL (0x74697665), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x616e744e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = ServantNotActive 0, // member count }; @@ -1272,7 +1272,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = &_tc_TAO_tc_PortableServer_POA_ServantNotActive; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::WrongAdapter::WrongAdapter (void) @@ -1331,7 +1331,7 @@ CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void) CORBA::Exception * PortableServer::POA::WrongAdapter::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::WrongAdapter (*this), @@ -1374,22 +1374,22 @@ static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f57), - ACE_NTOHL (0x726f6e67), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465723a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f57), + ACE_NTOHL (0x726f6e67), + ACE_NTOHL (0x41646170), + ACE_NTOHL (0x7465723a), ACE_NTOHL (0x322e3300), // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3 13, - ACE_NTOHL (0x57726f6e), - ACE_NTOHL (0x67416461), - ACE_NTOHL (0x70746572), + ACE_NTOHL (0x57726f6e), + ACE_NTOHL (0x67416461), + ACE_NTOHL (0x70746572), ACE_NTOHL (0x0), // name = WrongAdapter 0, // member count }; @@ -1405,7 +1405,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter ( ::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = &_tc_TAO_tc_PortableServer_POA_WrongAdapter; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POA::WrongPolicy::WrongPolicy (void) @@ -1464,7 +1464,7 @@ CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void) CORBA::Exception * PortableServer::POA::WrongPolicy::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::POA::WrongPolicy (*this), @@ -1507,21 +1507,21 @@ static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65722f50), - ACE_NTOHL (0x4f412f57), - ACE_NTOHL (0x726f6e67), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a32), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f412f57), + ACE_NTOHL (0x726f6e67), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a32), ACE_NTOHL (0x2e330000), // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3 12, - ACE_NTOHL (0x57726f6e), - ACE_NTOHL (0x67506f6c), + ACE_NTOHL (0x57726f6e), + ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900), // name = WrongPolicy 0, // member count }; @@ -1543,7 +1543,7 @@ PortableServer::POA::POA (void) PortableServer::POA::~POA (void) {} -void +void PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer) { POA *_tao_tmp_pointer = @@ -1561,10 +1561,10 @@ PortableServer::POA::_narrow ( { return POA::_nil (); } - + POA_ptr proxy = dynamic_cast<POA_ptr> (_tao_objref); - + return POA::_duplicate (proxy); } @@ -1578,10 +1578,10 @@ PortableServer::POA::_unchecked_narrow ( { return POA::_nil (); } - + POA_ptr proxy = dynamic_cast<POA_ptr> (_tao_objref); - + return POA::_duplicate (proxy); } @@ -1592,7 +1592,7 @@ PortableServer::POA::_duplicate (POA_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1617,11 +1617,11 @@ PortableServer::POA::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -1633,11 +1633,11 @@ const char* PortableServer::POA::_interface_repository_id (void) const CORBA::Boolean PortableServer::POA::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -1650,7 +1650,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< PortableServer::POA >; - + template class TAO_Objref_Out_T< PortableServer::POA @@ -1730,7 +1730,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ PortableServer::POA > - + # pragma instantiate \ TAO_Objref_Out_T< \ PortableServer::POA @@ -1793,4 +1793,4 @@ PortableServer::POA::marshal (TAO_OutputCDR &) #endif /* end #if !defined */ -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 899bf4cf465..62d6cd62b01 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -56,6 +56,7 @@ #include "tao/Policy_ForwardC.h" #include "tao/OctetSeqC.h" +#include "tao/orb_typesC.h" #include "tao/PortableServer/PS_ForwardC.h" #include "tao/PortableServer/IdAssignmentPolicyC.h" #include "tao/PortableServer/IdUniquenessPolicyC.h" @@ -86,13 +87,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -102,15 +103,15 @@ namespace TAO namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_PORTABLESERVER_POALIST_CH_) #define _PORTABLESERVER_POALIST_CH_ - + class POAList; - + typedef TAO_MngSeq_Var_T< POAList, @@ -120,7 +121,7 @@ namespace PortableServer > > POAList_var; - + typedef TAO_MngSeq_Out_T< POAList, @@ -131,7 +132,7 @@ namespace PortableServer > > POAList_out; - + class TAO_PortableServer_Export POAList : public TAO_Unbounded_Object_Sequence< @@ -145,74 +146,74 @@ namespace PortableServer POAList ( CORBA::ULong max, CORBA::ULong length, - POA_ptr* buffer, + POA_ptr* buffer, CORBA::Boolean release = 0 ); POAList (const POAList &); ~POAList (void); - + static void _tao_any_destructor (void *); - + typedef POAList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAList; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType THREAD_POLICY_ID = 16U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_) #define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_ - + class POAManager; typedef POAManager *POAManager_ptr; - + typedef TAO_Objref_Var_T< POAManager > POAManager_var; - + typedef TAO_Objref_Out_T< POAManager @@ -220,22 +221,22 @@ namespace PortableServer POAManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_ - + class AdapterActivator; typedef AdapterActivator *AdapterActivator_ptr; - + typedef TAO_Objref_Var_T< AdapterActivator > AdapterActivator_var; - + typedef TAO_Objref_Out_T< AdapterActivator @@ -243,22 +244,22 @@ namespace PortableServer AdapterActivator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_) #define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_ - + class ServantManager; typedef ServantManager *ServantManager_ptr; - + typedef TAO_Objref_Var_T< ServantManager > ServantManager_var; - + typedef TAO_Objref_Out_T< ServantManager @@ -266,22 +267,22 @@ namespace PortableServer ServantManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_) #define _PORTABLESERVER_POA__VAR_OUT_CH_ - + class POA; typedef POA *POA_ptr; - + typedef TAO_Objref_Var_T< POA > POA_var; - + typedef TAO_Objref_Out_T< POA @@ -289,63 +290,63 @@ namespace PortableServer POA_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_POA_CH_) #define _PORTABLESERVER_POA_CH_ - + class TAO_PortableServer_Export POA : public virtual CORBA::Object { public: typedef POA_ptr _ptr_type; typedef POA_var _var_type; - + // The static operations. static POA_ptr _duplicate (POA_ptr obj); - + static POA_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static POA_ptr _nil (void) { return static_cast<POA_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_) #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_ - + class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException { public: - + AdapterAlreadyExists (void); AdapterAlreadyExists (const AdapterAlreadyExists &); ~AdapterAlreadyExists (void); AdapterAlreadyExists &operator= (const AdapterAlreadyExists &); - + static void _tao_any_destructor (void *); - + static AdapterAlreadyExists *_downcast (CORBA::Exception *); static const AdapterAlreadyExists *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -354,48 +355,48 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_AdapterAlreadyExists; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_) #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_ - + class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException { public: - + AdapterNonExistent (void); AdapterNonExistent (const AdapterNonExistent &); ~AdapterNonExistent (void); AdapterNonExistent &operator= (const AdapterNonExistent &); - + static void _tao_any_destructor (void *); - + static AdapterNonExistent *_downcast (CORBA::Exception *); static const AdapterNonExistent *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -404,49 +405,49 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_AdapterNonExistent; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_) #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_ - + class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException { public: - + CORBA::UShort index; InvalidPolicy (void); InvalidPolicy (const InvalidPolicy &); ~InvalidPolicy (void); InvalidPolicy &operator= (const InvalidPolicy &); - + static void _tao_any_destructor (void *); - + static InvalidPolicy *_downcast (CORBA::Exception *); static const InvalidPolicy *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -455,32 +456,32 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + InvalidPolicy ( CORBA::UShort _tao_index ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_InvalidPolicy; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -488,24 +489,24 @@ namespace PortableServer #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) #define _PORTABLESERVER_POA_NOSERVANT_CH_ - + class TAO_PortableServer_Export NoServant : public CORBA::UserException { public: - + NoServant (void); NoServant (const NoServant &); ~NoServant (void); NoServant &operator= (const NoServant &); - + static void _tao_any_destructor (void *); - + static NoServant *_downcast (CORBA::Exception *); static const NoServant *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -514,25 +515,25 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_NoServant; #endif /* end #if !defined */ - + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from @@ -540,24 +541,24 @@ namespace PortableServer #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_ - + class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException { public: - + ObjectAlreadyActive (void); ObjectAlreadyActive (const ObjectAlreadyActive &); ~ObjectAlreadyActive (void); ObjectAlreadyActive &operator= (const ObjectAlreadyActive &); - + static void _tao_any_destructor (void *); - + static ObjectAlreadyActive *_downcast (CORBA::Exception *); static const ObjectAlreadyActive *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -566,48 +567,48 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_ObjectAlreadyActive; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_ - + class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException { public: - + ObjectNotActive (void); ObjectNotActive (const ObjectNotActive &); ~ObjectNotActive (void); ObjectNotActive &operator= (const ObjectNotActive &); - + static void _tao_any_destructor (void *); - + static ObjectNotActive *_downcast (CORBA::Exception *); static const ObjectNotActive *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -616,48 +617,48 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_ObjectNotActive; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_ - + class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException { public: - + ServantAlreadyActive (void); ServantAlreadyActive (const ServantAlreadyActive &); ~ServantAlreadyActive (void); ServantAlreadyActive &operator= (const ServantAlreadyActive &); - + static void _tao_any_destructor (void *); - + static ServantAlreadyActive *_downcast (CORBA::Exception *); static const ServantAlreadyActive *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -666,48 +667,48 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_ServantAlreadyActive; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_ - + class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException { public: - + ServantNotActive (void); ServantNotActive (const ServantNotActive &); ~ServantNotActive (void); ServantNotActive &operator= (const ServantNotActive &); - + static void _tao_any_destructor (void *); - + static ServantNotActive *_downcast (CORBA::Exception *); static const ServantNotActive *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -716,48 +717,48 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_ServantNotActive; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_) #define _PORTABLESERVER_POA_WRONGADAPTER_CH_ - + class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException { public: - + WrongAdapter (void); WrongAdapter (const WrongAdapter &); ~WrongAdapter (void); WrongAdapter &operator= (const WrongAdapter &); - + static void _tao_any_destructor (void *); - + static WrongAdapter *_downcast (CORBA::Exception *); static const WrongAdapter *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -766,48 +767,48 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_WrongAdapter; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_) #define _PORTABLESERVER_POA_WRONGPOLICY_CH_ - + class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException { public: - + WrongPolicy (void); WrongPolicy (const WrongPolicy &); ~WrongPolicy (void); WrongPolicy &operator= (const WrongPolicy &); - + static void _tao_any_destructor (void *); - + static WrongPolicy *_downcast (CORBA::Exception *); static const WrongPolicy *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -816,28 +817,28 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_WrongPolicy; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::POA_ptr create_POA ( const char * adapter_name, ::PortableServer::POAManager_ptr a_POAManager, @@ -849,10 +850,10 @@ namespace PortableServer ::PortableServer::POA::AdapterAlreadyExists, ::PortableServer::POA::InvalidPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::POA_ptr find_POA ( const char * adapter_name, ::CORBA::Boolean activate_it @@ -862,10 +863,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::POA::AdapterNonExistent )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ::CORBA::Boolean etherealize_objects, ::CORBA::Boolean wait_for_completion @@ -874,10 +875,10 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( ::PortableServer::ThreadPolicyValue value @@ -887,10 +888,10 @@ namespace PortableServer CORBA::SystemException )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy ( ::PortableServer::LifespanPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -898,10 +899,10 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( ::PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -909,10 +910,10 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( ::PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -920,10 +921,10 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( ::PortableServer::ImplicitActivationPolicyValue value @@ -933,10 +934,10 @@ namespace PortableServer CORBA::SystemException )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( ::PortableServer::ServantRetentionPolicyValue value @@ -946,10 +947,10 @@ namespace PortableServer CORBA::SystemException )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( ::PortableServer::RequestProcessingPolicyValue value @@ -959,50 +960,50 @@ namespace PortableServer CORBA::SystemException )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * the_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::POA_ptr the_parent ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::POAList * the_children ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::POAManager_ptr the_POAManager ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::AdapterActivator_ptr the_activator ( @@ -1011,10 +1012,10 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void the_activator ( ::PortableServer::AdapterActivator_ptr the_activator ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1023,10 +1024,10 @@ namespace PortableServer CORBA::SystemException )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::ServantManager_ptr get_servant_manager ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1035,10 +1036,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_servant_manager ( ::PortableServer::ServantManager_ptr imgr ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1048,10 +1049,10 @@ namespace PortableServer ::PortableServer::POA::WrongPolicy )) = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + #if (TAO_HAS_MINIMUM_POA == 0) virtual ::PortableServer::Servant get_servant ( @@ -1062,10 +1063,10 @@ namespace PortableServer ::PortableServer::POA::NoServant, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_servant ( ::PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1074,12 +1075,12 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::POA::WrongPolicy )) = 0; - + #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ObjectId * activate_object ( ::PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1089,10 +1090,10 @@ namespace PortableServer ::PortableServer::POA::ServantAlreadyActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void activate_object_with_id ( const ::PortableServer::ObjectId & id, ::PortableServer::Servant p_servant @@ -1104,10 +1105,10 @@ namespace PortableServer ::PortableServer::POA::ObjectAlreadyActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void deactivate_object ( const ::PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1117,10 +1118,10 @@ namespace PortableServer ::PortableServer::POA::ObjectNotActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr create_reference ( const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1129,10 +1130,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr create_reference_with_id ( const ::PortableServer::ObjectId & oid, const char * intf @@ -1141,10 +1142,10 @@ namespace PortableServer ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ObjectId * servant_to_id ( ::PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1154,10 +1155,10 @@ namespace PortableServer ::PortableServer::POA::ServantNotActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr servant_to_reference ( ::PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1167,10 +1168,10 @@ namespace PortableServer ::PortableServer::POA::ServantNotActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::Servant reference_to_servant ( ::CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1181,10 +1182,10 @@ namespace PortableServer ::PortableServer::POA::WrongAdapter, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ObjectId * reference_to_id ( ::CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1194,10 +1195,10 @@ namespace PortableServer ::PortableServer::POA::WrongAdapter, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::Servant id_to_servant ( const ::PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1207,10 +1208,10 @@ namespace PortableServer ::PortableServer::POA::ObjectNotActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr id_to_reference ( const ::PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1220,46 +1221,46 @@ namespace PortableServer ::PortableServer::POA::ObjectNotActive, ::PortableServer::POA::WrongPolicy )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. POA (void); - + virtual ~POA (void); - + private: // Private and unimplemented for concrete interfaces. POA (const POA &); - + void operator= (const POA &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA; // TAO_IDL - Generated from @@ -1276,7 +1277,7 @@ namespace TAO #if !defined (_PORTABLESERVER_POA__TRAITS_CH_) #define _PORTABLESERVER_POA__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA> { diff --git a/TAO/tao/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl index 93ffd96b5bc..31f1319c167 100644 --- a/TAO/tao/PortableServer/PortableServer_include.pidl +++ b/TAO/tao/PortableServer/PortableServer_include.pidl @@ -34,6 +34,7 @@ #ifndef _PORTABLESERVER_INCLUDE_IDL_ #define _PORTABLESERVER_INCLUDE_IDL_ -#include "tao/PortableServer/PortableServer.pidl" +///FUZZ: disable check_for_include/ +#include <tao/PortableServer/PortableServer.pidl> #endif /* _PORTABLESERVER_INCLUDE_IDL_ */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl index 00f67b45234..36df91c56cd 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_ #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index 1083cf4458d..1fba677be14 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -176,11 +176,11 @@ PortableServer::RequestProcessingPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -192,7 +192,7 @@ const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (v CORBA::Boolean PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -218,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl index 52052f2df94..94792e28695 100644 --- a/TAO/tao/PortableServer/ServantActivator.pidl +++ b/TAO/tao/PortableServer/ServantActivator.pidl @@ -20,6 +20,7 @@ #ifndef _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_ #define _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_ +///FUZZ: disable check_for_include/ #include <tao/PortableServer/PS_Forward.pidl> #include <tao/PortableServer/ServantManager.pidl> #include <tao/PortableServer/ForwardRequest.pidl> diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index 7b0a64955f5..d06f1e7ed09 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -177,11 +177,11 @@ PortableServer::ServantActivator::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -193,11 +193,11 @@ const char* PortableServer::ServantActivator::_interface_repository_id (void) co CORBA::Boolean PortableServer::ServantActivator::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl index 2d452f7d2ba..32dd748ab2d 100644 --- a/TAO/tao/PortableServer/ServantLocator.pidl +++ b/TAO/tao/PortableServer/ServantLocator.pidl @@ -24,7 +24,8 @@ #ifndef _PORTABLESERVER_SERVANTLOCATOR_IDL_ #define _PORTABLESERVER_SERVANTLOCATOR_IDL_ -#include <orb_types.pidl> +///FUZZ: disable check_for_include/ +#include <tao/orb_types.pidl> #include <tao/PortableServer/PS_Forward.pidl> #include <tao/PortableServer/ServantManager.pidl> #include <tao/PortableServer/ForwardRequest.pidl> diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index 43534ae51f8..bc1a048d7bb 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -177,11 +177,11 @@ PortableServer::ServantLocator::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -193,11 +193,11 @@ const char* PortableServer::ServantLocator::_interface_repository_id (void) cons CORBA::Boolean PortableServer::ServantLocator::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index a642e7009c9..a539a5da9b6 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -47,6 +47,7 @@ #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" +#include "tao/orb_typesC.h" #include "tao/PortableServer/PS_ForwardC.h" #include "tao/PortableServer/ServantManagerC.h" #include "tao/PortableServer/ForwardRequestC.h" diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index 1af6cda1ead..6aa545e7372 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -171,11 +171,11 @@ PortableServer::ServantManager::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -187,11 +187,11 @@ const char* PortableServer::ServantManager::_interface_repository_id (void) cons CORBA::Boolean PortableServer::ServantManager::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl index 5aeea72071d..f11b949bd3e 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_ #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index 34d1af7196e..2c837f10f80 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -176,11 +176,11 @@ PortableServer::ServantRetentionPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -192,7 +192,7 @@ const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (vo CORBA::Boolean PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -218,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionP } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl index b20ec71d065..21cc5d2cc40 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.pidl +++ b/TAO/tao/PortableServer/ThreadPolicy.pidl @@ -17,6 +17,7 @@ #ifndef _PORTABLESERVER_THREAD_POLICY_IDL_ #define _PORTABLESERVER_THREAD_POLICY_IDL_ +///FUZZ: disable check_for_include/ #include <tao/Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index be20856a29a..4e4e02be038 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -176,11 +176,11 @@ PortableServer::ThreadPolicy::_is_a ( ) ) { - return 1; // success using local knowledge + return true; // success using local knowledge } else { - return 0; + return false; } } @@ -192,7 +192,7 @@ const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const CORBA::Boolean PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &) { - return 0; + return false; } // TAO_IDL - Generated from @@ -218,7 +218,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1629 +// be\be_visitor_root/root.cpp:1509 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff index 3c81a5f2fa3..312cecb9fb0 100644 --- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff +++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff @@ -1,8 +1,8 @@ ---- orig/AdapterActivatorC.h 2004-11-17 09:21:58.954374400 +0100 -+++ AdapterActivatorC.h 2004-11-17 09:22:10.591107200 +0100 +--- orig/AdapterActivatorC.h 2005-02-18 11:19:44.306534400 +0100 ++++ AdapterActivatorC.h 2005-02-18 11:19:48.512582400 +0100 @@ -73,6 +73,8 @@ // TAO_IDL - Generated from - // be\be_visitor_root/root_ch.cpp:63 + // be\be_visitor_root/root_ch.cpp:62 +#if (TAO_HAS_MINIMUM_POA == 0) + @@ -16,28 +16,28 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/AdapterActivatorC.cpp 2004-11-17 09:21:58.954374400 +0100 -+++ AdapterActivatorC.cpp 2004-11-17 09:22:10.731308800 +0100 -@@ -45,6 +45,8 @@ +--- orig/AdapterActivatorC.cpp 2005-02-18 11:19:44.306534400 +0100 ++++ AdapterActivatorC.cpp 2005-02-18 11:19:48.522596800 +0100 +@@ -44,6 +44,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -234,3 +236,5 @@ +@@ -227,3 +229,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/AdapterActivatorA.cpp 2004-11-17 09:21:58.974403200 +0100 -+++ AdapterActivatorA.cpp 2004-11-17 09:22:10.841467200 +0100 -@@ -32,6 +32,8 @@ +--- orig/AdapterActivatorA.cpp 2005-02-18 11:19:44.306534400 +0100 ++++ AdapterActivatorA.cpp 2005-02-18 11:19:48.532611200 +0100 +@@ -34,6 +34,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -46,7 +46,7 @@ static const CORBA::Long _oc_PortableServer_AdapterActivator[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -154,3 +156,5 @@ +@@ -156,3 +158,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff index 03b758513c6..6fac58626c0 100644 --- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff +++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff @@ -1,5 +1,5 @@ ---- orig/ForwardRequestC.h 2005-01-27 13:51:06.723408000 +0100 -+++ ForwardRequestC.h 2005-01-27 13:53:01.788864000 +0100 +--- orig/ForwardRequestC.h 2005-02-18 11:19:47.210710400 +0100 ++++ ForwardRequestC.h 2005-02-18 11:19:49.133475200 +0100 @@ -66,6 +66,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ @@ -9,17 +9,17 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -@@ -158,6 +160,8 @@ +@@ -160,6 +162,8 @@ // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + #if defined (__ACE_INLINE__) #include "ForwardRequestC.inl" #endif /* defined INLINE */ ---- orig/ForwardRequestC.cpp 2005-01-27 13:51:06.723408000 +0100 -+++ ForwardRequestC.cpp 2005-01-27 13:52:38.184923200 +0100 +--- orig/ForwardRequestC.cpp 2005-02-18 11:19:47.210710400 +0100 ++++ ForwardRequestC.cpp 2005-02-18 11:19:49.143489600 +0100 @@ -43,6 +43,8 @@ #include "ForwardRequestC.inl" #endif /* !defined INLINE */ @@ -27,18 +27,18 @@ +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 -@@ -294,3 +296,5 @@ +@@ -279,3 +281,5 @@ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ForwardRequestA.cpp 2005-01-27 13:51:06.723408000 +0100 -+++ ForwardRequestA.cpp 2005-01-27 13:52:23.373625600 +0100 -@@ -29,6 +29,8 @@ - #include "tao/Typecode.h" +--- orig/ForwardRequestA.cpp 2005-02-18 11:19:47.210710400 +0100 ++++ ForwardRequestA.cpp 2005-02-18 11:19:49.153504000 +0100 +@@ -31,6 +31,8 @@ + #include "tao/Any.h" #include "tao/Any_Dual_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) @@ -46,7 +46,7 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 -@@ -129,3 +131,5 @@ +@@ -131,3 +133,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ImplRepo.diff b/TAO/tao/PortableServer/diffs/ImplRepo.diff deleted file mode 100644 index db6b709c178..00000000000 --- a/TAO/tao/PortableServer/diffs/ImplRepo.diff +++ /dev/null @@ -1,1948 +0,0 @@ ---- orig/ImplRepoC.h 2003-04-25 17:36:28.000000000 -0500 -+++ ./ImplRepoC.h 2003-04-25 17:38:12.000000000 -0500 -@@ -30,17 +30,19 @@ - - #ifndef _TAO_IDL_ORIG_IMPLREPOC_H_ - #define _TAO_IDL_ORIG_IMPLREPOC_H_ -- - #include "ace/pre.h" -- --#include "tao/corba.h" -+#include "portableserver_export.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - -- --#include "portableserver_export.h" -+#include "tao/Exception.h" -+#include "tao/Object.h" -+#include "tao/Sequence.h" -+#include "tao/Remote_Object_Proxy_Impl.h" -+#include "tao/VarOut_T.h" -+#include "tao/Any_T.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO -@@ -70,31 +72,31 @@ - - TAO_NAMESPACE ImplementationRepository - { -- -+ - // TAO_IDL - Generated from - // be/be_interface.cpp:570 - - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ODDS_N_ENDS_CH_) - #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ODDS_N_ENDS_CH_ -- -+ - class ServerObject; - typedef ServerObject *ServerObject_ptr; - struct tao_ServerObject_life; -- -+ - typedef - TAO_Objref_Var_T< - ServerObject, - tao_ServerObject_life - > - ServerObject_var; -- -+ - typedef - TAO_Objref_Out_T< - ServerObject, - tao_ServerObject_life - > - ServerObject_out; -- -+ - struct TAO_PortableServer_Export tao_ServerObject_life - { - static ServerObject_ptr tao_duplicate (ServerObject_ptr); -@@ -105,7 +107,7 @@ - TAO_OutputCDR & - ); - }; -- -+ - struct TAO_PortableServer_Export tao_ServerObject_cast - { - static ServerObject_ptr tao_narrow ( -@@ -116,18 +118,18 @@ - }; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:50 - - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_) - #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_ -- -+ - class _TAO_ServerObject_Proxy_Impl; - class _TAO_ServerObject_Remote_Proxy_Impl; - class _TAO_ServerObject_Proxy_Broker; - class _TAO_ServerObject_Remote_Proxy_Broker; -- -+ - class TAO_PortableServer_Export ServerObject - : public virtual CORBA::Object - { -@@ -135,110 +137,110 @@ - typedef ServerObject_ptr _ptr_type; - typedef ServerObject_var _var_type; - static int _tao_class_id; -- -+ - // The static operations. - static ServerObject_ptr _duplicate (ServerObject_ptr obj); -- -+ - static ServerObject_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - static ServerObject_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - static ServerObject_ptr _nil (void) - { - return (ServerObject_ptr)0; - } -- -+ - static void _tao_any_destructor (void *); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void ping ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void shutdown ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:207 -- -+ - virtual CORBA::Boolean _is_a ( - const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - virtual void *_tao_QueryInterface (ptr_arith_t type); -- -+ - virtual const char* _interface_repository_id (void) const; - virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_; -- -+ - protected: - ServerObject (int collocated = 0); -- -+ - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated); -- -+ - ServerObject (IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); -- -+ - ServerObject ( -- TAO_Stub *objref, -+ TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0 - ); - virtual ~ServerObject (void); -- -+ - friend class _TAO_ServerObject_Remote_Proxy_Impl; - friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; - friend class _TAO_ServerObject_Direct_Proxy_Impl; -- -+ - private: - ServerObject (const ServerObject &); - void operator= (const ServerObject &); - }; -- -+ - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulates - // an invocation logic. -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// - // Base Proxy Impl. Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/base_proxy_impl_ch.cpp:35 -- -+ - class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl - { - public: - virtual ~_TAO_ServerObject_Proxy_Impl (void) {} -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void ping ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL -@@ -246,10 +248,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void shutdown ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL -@@ -257,35 +259,35 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -- -+ - protected: - _TAO_ServerObject_Proxy_Impl (void); - }; -- -+ - // - // End Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Impl. Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37 -- -+ - class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl - : public virtual _TAO_ServerObject_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_ServerObject_Remote_Proxy_Impl (void); -- -+ - virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) {} -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void ping ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL -@@ -293,10 +295,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void shutdown ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL -@@ -305,23 +307,23 @@ - CORBA::SystemException - )); - }; -- -+ - // - // End Remote Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -- -+ - // The Proxy Brokers are used by each interface to get -- // the right proxy for performing a call. In the new -+ // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. -- -+ - /////////////////////////////////////////////////////////////////////// -- // Base Proxy Broker Declaration -+ // Base Proxy Broker Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/base_proxy_broker_ch.cpp:35 -- -+ - class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker - { - public: -@@ -330,76 +332,76 @@ - ServerObject *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; -- -+ - protected: - _TAO_ServerObject_Proxy_Broker (void); -- -+ - }; -- -+ - // -- // End Base Proxy Broker Declaration -+ // End Base Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// -- // Remote Proxy Broker Declaration -+ // Remote Proxy Broker Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40 -- -+ - class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker - : public virtual _TAO_ServerObject_Proxy_Broker - { -- public: -+ public: - _TAO_ServerObject_Remote_Proxy_Broker (void); -- -+ - virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void); -- -+ - virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( - ServerObject *object - ACE_ENV_ARG_DECL - ); -- -+ - private: - _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_; -- -+ - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void); - }; -- -+ - // -- // End Remote Proxy Broker Declaration -+ // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 - - #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_) - #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_ -- -+ - class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException - { - public: -- -+ - AlreadyRegistered (void); - AlreadyRegistered (const AlreadyRegistered &); - ~AlreadyRegistered (void); - - AlreadyRegistered &operator= (const AlreadyRegistered &); -- -+ - static void _tao_any_destructor (void *); -- -+ - static AlreadyRegistered *_downcast (CORBA::Exception *); - static CORBA::Exception *_alloc (void); - -@@ -411,44 +413,44 @@ - TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ) const; -- -+ - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:125 -- -+ - virtual CORBA::TypeCode_ptr _type (void) const; - }; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 - - #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_) - #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_ -- -+ - class TAO_PortableServer_Export CannotActivate : public CORBA::UserException - { - public: -- -+ - TAO_String_Manager reason; - CannotActivate (void); - CannotActivate (const CannotActivate &); - ~CannotActivate (void); - - CannotActivate &operator= (const CannotActivate &); -- -+ - static void _tao_any_destructor (void *); -- -+ - static CannotActivate *_downcast (CORBA::Exception *); - static CORBA::Exception *_alloc (void); - -@@ -460,50 +462,50 @@ - TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ) const; -- -+ - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ctor.cpp:66 -- -+ - CannotActivate ( - const char * _tao_reason - ); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:125 -- -+ - virtual CORBA::TypeCode_ptr _type (void) const; - }; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 - - #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_) - #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_ -- -+ - class TAO_PortableServer_Export NotFound : public CORBA::UserException - { - public: -- -+ - NotFound (void); - NotFound (const NotFound &); - ~NotFound (void); - - NotFound &operator= (const NotFound &); -- -+ - static void _tao_any_destructor (void *); -- -+ - static NotFound *_downcast (CORBA::Exception *); - static CORBA::Exception *_alloc (void); - -@@ -515,87 +517,87 @@ - TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ) const; -- -+ - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED - ); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:125 -- -+ - virtual CORBA::TypeCode_ptr _type (void) const; - }; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_type.cpp:249 -- -+ - struct EnvironmentVariable; -- -+ - typedef - TAO_Var_Var_T< - EnvironmentVariable - > - EnvironmentVariable_var; -- -+ - typedef - TAO_Out_T< - EnvironmentVariable, - EnvironmentVariable_var - > - EnvironmentVariable_out; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 -- -+ - struct TAO_PortableServer_Export EnvironmentVariable - { - typedef EnvironmentVariable_var _var_type; -- -+ - static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager value; - }; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:367 -- -+ - typedef char * Address; - typedef CORBA::String_var Address_var; - typedef CORBA::String_out Address_out; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 - - #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) - #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ -- -+ - class EnvironmentList; -- -+ - typedef - TAO_VarSeq_Var_T< - EnvironmentList, - EnvironmentVariable - > - EnvironmentList_var; -- -+ - typedef - TAO_Seq_Out_T< - EnvironmentList, -@@ -603,7 +605,7 @@ - EnvironmentVariable - > - EnvironmentList_out; -- -+ - class TAO_PortableServer_Export EnvironmentList - : public - TAO_Unbounded_Sequence< -@@ -616,27 +618,27 @@ - EnvironmentList ( - CORBA::ULong max, - CORBA::ULong length, -- EnvironmentVariable* buffer, -+ EnvironmentVariable* buffer, - CORBA::Boolean release = 0 - ); - EnvironmentList (const EnvironmentList &); - ~EnvironmentList (void); -- -+ - static void _tao_any_destructor (void *); -- -+ - typedef EnvironmentList_var _var_type; - }; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_enum/enum_ch.cpp:57 -- -+ - enum ActivationMode - { - NORMAL, -@@ -644,39 +646,39 @@ - PER_CLIENT, - AUTO_START - }; -- -+ - typedef ActivationMode &ActivationMode_out; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode; -- -+ - // TAO_IDL - Generated from - // be/be_type.cpp:249 -- -+ - struct StartupOptions; -- -+ - typedef - TAO_Var_Var_T< - StartupOptions - > - StartupOptions_var; -- -+ - typedef - TAO_Out_T< - StartupOptions, - StartupOptions_var - > - StartupOptions_out; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 -- -+ - struct TAO_PortableServer_Export StartupOptions - { - typedef StartupOptions_var _var_type; -- -+ - static void _tao_any_destructor (void *); - TAO_String_Manager command_line; - ImplementationRepository::EnvironmentList environment; -@@ -684,64 +686,64 @@ - ImplementationRepository::ActivationMode activation; - TAO_String_Manager location; - }; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions; -- -+ - // TAO_IDL - Generated from - // be/be_type.cpp:249 -- -+ - struct ServerInformation; -- -+ - typedef - TAO_Var_Var_T< - ServerInformation - > - ServerInformation_var; -- -+ - typedef - TAO_Out_T< - ServerInformation, - ServerInformation_var - > - ServerInformation_out; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 -- -+ - struct TAO_PortableServer_Export ServerInformation - { - typedef ServerInformation_var _var_type; -- -+ - static void _tao_any_destructor (void *); - TAO_String_Manager logical_server; - TAO_String_Manager server; - ImplementationRepository::StartupOptions startup; - TAO_String_Manager location; - }; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 - - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) - #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ -- -+ - class ServerInformationList; -- -+ - typedef - TAO_VarSeq_Var_T< - ServerInformationList, - ServerInformation - > - ServerInformationList_var; -- -+ - typedef - TAO_Seq_Out_T< - ServerInformationList, -@@ -749,7 +751,7 @@ - ServerInformation - > - ServerInformationList_out; -- -+ - class TAO_PortableServer_Export ServerInformationList - : public - TAO_Unbounded_Sequence< -@@ -762,48 +764,48 @@ - ServerInformationList ( - CORBA::ULong max, - CORBA::ULong length, -- ServerInformation* buffer, -+ ServerInformation* buffer, - CORBA::Boolean release = 0 - ); - ServerInformationList (const ServerInformationList &); - ~ServerInformationList (void); -- -+ - static void _tao_any_destructor (void *); -- -+ - typedef ServerInformationList_var _var_type; - }; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList; -- -+ - // TAO_IDL - Generated from - // be/be_interface.cpp:570 - - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ODDS_N_ENDS_CH_) - #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ODDS_N_ENDS_CH_ -- -+ - class ServerInformationIterator; - typedef ServerInformationIterator *ServerInformationIterator_ptr; - struct tao_ServerInformationIterator_life; -- -+ - typedef - TAO_Objref_Var_T< - ServerInformationIterator, - tao_ServerInformationIterator_life - > - ServerInformationIterator_var; -- -+ - typedef - TAO_Objref_Out_T< - ServerInformationIterator, - tao_ServerInformationIterator_life - > - ServerInformationIterator_out; -- -+ - struct TAO_PortableServer_Export tao_ServerInformationIterator_life - { - static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr); -@@ -814,7 +816,7 @@ - TAO_OutputCDR & - ); - }; -- -+ - struct TAO_PortableServer_Export tao_ServerInformationIterator_cast - { - static ServerInformationIterator_ptr tao_narrow ( -@@ -825,31 +827,31 @@ - }; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_interface.cpp:570 - - #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ODDS_N_ENDS_CH_) - #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ODDS_N_ENDS_CH_ -- -+ - class Administration; - typedef Administration *Administration_ptr; - struct tao_Administration_life; -- -+ - typedef - TAO_Objref_Var_T< - Administration, - tao_Administration_life - > - Administration_var; -- -+ - typedef - TAO_Objref_Out_T< - Administration, - tao_Administration_life - > - Administration_out; -- -+ - struct TAO_PortableServer_Export tao_Administration_life - { - static Administration_ptr tao_duplicate (Administration_ptr); -@@ -860,7 +862,7 @@ - TAO_OutputCDR & - ); - }; -- -+ - struct TAO_PortableServer_Export tao_Administration_cast - { - static Administration_ptr tao_narrow ( -@@ -871,18 +873,18 @@ - }; - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:50 - - #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_) - #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_ -- -+ - class _TAO_Administration_Proxy_Impl; - class _TAO_Administration_Remote_Proxy_Impl; - class _TAO_Administration_Proxy_Broker; - class _TAO_Administration_Remote_Proxy_Broker; -- -+ - class TAO_PortableServer_Export Administration - : public virtual CORBA::Object - { -@@ -890,30 +892,30 @@ - typedef Administration_ptr _ptr_type; - typedef Administration_var _var_type; - static int _tao_class_id; -- -+ - // The static operations. - static Administration_ptr _duplicate (Administration_ptr obj); -- -+ - static Administration_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - static Administration_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - static Administration_ptr _nil (void) - { - return (Administration_ptr)0; - } -- -+ - static void _tao_any_destructor (void *); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void activate_server ( - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -923,10 +925,10 @@ - , ImplementationRepository::NotFound - , ImplementationRepository::CannotActivate - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual char * activate_server_with_startup ( - const char * server, - CORBA::Long check_startup -@@ -937,10 +939,10 @@ - , ImplementationRepository::NotFound - , ImplementationRepository::CannotActivate - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void register_server ( - const char * server, - const ImplementationRepository::StartupOptions & options -@@ -950,10 +952,10 @@ - CORBA::SystemException - , ImplementationRepository::AlreadyRegistered - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void reregister_server ( - const char * server, - const ImplementationRepository::StartupOptions & options -@@ -962,10 +964,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void remove_server ( - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -974,10 +976,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void shutdown_server ( - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -986,10 +988,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual char * server_is_running ( - const char * server, - const char * addr, -@@ -1000,10 +1002,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void server_is_shutting_down ( - const char * server - ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -1012,10 +1014,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void find ( - const char * server, - ImplementationRepository::ServerInformation_out info -@@ -1025,10 +1027,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void list ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, -@@ -1038,70 +1040,70 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:207 -- -+ - virtual CORBA::Boolean _is_a ( - const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - virtual void *_tao_QueryInterface (ptr_arith_t type); -- -+ - virtual const char* _interface_repository_id (void) const; - virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_; -- -+ - protected: - Administration (int collocated = 0); -- -+ - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ImplementationRepository_Administration_setup_collocation (int collocated); -- -+ - Administration (IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); -- -+ - Administration ( -- TAO_Stub *objref, -+ TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0 - ); - virtual ~Administration (void); -- -+ - friend class _TAO_Administration_Remote_Proxy_Impl; - friend class _TAO_Administration_ThruPOA_Proxy_Impl; - friend class _TAO_Administration_Direct_Proxy_Impl; -- -+ - private: - Administration (const Administration &); - void operator= (const Administration &); - }; -- -+ - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulates - // an invocation logic. -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// - // Base Proxy Impl. Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/base_proxy_impl_ch.cpp:35 -- -+ - class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl - { - public: - virtual ~_TAO_Administration_Proxy_Impl (void) {} -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void activate_server ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1112,10 +1114,10 @@ - , ImplementationRepository::NotFound - , ImplementationRepository::CannotActivate - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual char * activate_server_with_startup ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1127,10 +1129,10 @@ - , ImplementationRepository::NotFound - , ImplementationRepository::CannotActivate - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void register_server ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1141,10 +1143,10 @@ - CORBA::SystemException - , ImplementationRepository::AlreadyRegistered - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void reregister_server ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1154,10 +1156,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void remove_server ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1167,10 +1169,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void shutdown_server ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1180,10 +1182,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual char * server_is_running ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1195,10 +1197,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void server_is_shutting_down ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1208,10 +1210,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void find ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1222,10 +1224,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void list ( - CORBA::Object *_collocated_tao_target_, - CORBA::ULong how_many, -@@ -1236,35 +1238,35 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -- -+ - protected: - _TAO_Administration_Proxy_Impl (void); - }; -- -+ - // - // End Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Impl. Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37 -- -+ - class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl - : public virtual _TAO_Administration_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_Administration_Remote_Proxy_Impl (void); -- -+ - virtual ~_TAO_Administration_Remote_Proxy_Impl (void) {} -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void activate_server ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1275,10 +1277,10 @@ - , ImplementationRepository::NotFound - , ImplementationRepository::CannotActivate - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual char * activate_server_with_startup ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1290,10 +1292,10 @@ - , ImplementationRepository::NotFound - , ImplementationRepository::CannotActivate - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void register_server ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1304,10 +1306,10 @@ - CORBA::SystemException - , ImplementationRepository::AlreadyRegistered - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void reregister_server ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1317,10 +1319,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void remove_server ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1330,10 +1332,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void shutdown_server ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1343,10 +1345,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual char * server_is_running ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1358,10 +1360,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void server_is_shutting_down ( - CORBA::Object *_collocated_tao_target_, - const char * server -@@ -1371,10 +1373,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void find ( - CORBA::Object *_collocated_tao_target_, - const char * server, -@@ -1385,10 +1387,10 @@ - CORBA::SystemException - , ImplementationRepository::NotFound - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void list ( - CORBA::Object *_collocated_tao_target_, - CORBA::ULong how_many, -@@ -1400,23 +1402,23 @@ - CORBA::SystemException - )); - }; -- -+ - // - // End Remote Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -- -+ - // The Proxy Brokers are used by each interface to get -- // the right proxy for performing a call. In the new -+ // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. -- -+ - /////////////////////////////////////////////////////////////////////// -- // Base Proxy Broker Declaration -+ // Base Proxy Broker Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/base_proxy_broker_ch.cpp:35 -- -+ - class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker - { - public: -@@ -1425,69 +1427,69 @@ - Administration *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; -- -+ - protected: - _TAO_Administration_Proxy_Broker (void); -- -+ - }; -- -+ - // -- // End Base Proxy Broker Declaration -+ // End Base Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// -- // Remote Proxy Broker Declaration -+ // Remote Proxy Broker Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40 -- -+ - class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker - : public virtual _TAO_Administration_Proxy_Broker - { -- public: -+ public: - _TAO_Administration_Remote_Proxy_Broker (void); -- -+ - virtual ~_TAO_Administration_Remote_Proxy_Broker (void); -- -+ - virtual _TAO_Administration_Proxy_Impl &select_proxy ( - Administration *object - ACE_ENV_ARG_DECL - ); -- -+ - private: - _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_; -- -+ - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void); - }; -- -+ - // -- // End Remote Proxy Broker Declaration -+ // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:50 - - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_) - #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_ -- -+ - class _TAO_ServerInformationIterator_Proxy_Impl; - class _TAO_ServerInformationIterator_Remote_Proxy_Impl; - class _TAO_ServerInformationIterator_Proxy_Broker; - class _TAO_ServerInformationIterator_Remote_Proxy_Broker; -- -+ - class TAO_PortableServer_Export ServerInformationIterator - : public virtual CORBA::Object - { -@@ -1495,30 +1497,30 @@ - typedef ServerInformationIterator_ptr _ptr_type; - typedef ServerInformationIterator_var _var_type; - static int _tao_class_id; -- -+ - // The static operations. - static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); -- -+ - static ServerInformationIterator_ptr _narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - static ServerInformationIterator_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - static ServerInformationIterator_ptr _nil (void) - { - return (ServerInformationIterator_ptr)0; - } -- -+ - static void _tao_any_destructor (void *); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual CORBA::Boolean next_n ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list -@@ -1527,80 +1529,80 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 -- -+ - virtual void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:207 -- -+ - virtual CORBA::Boolean _is_a ( - const char *type_id - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); -- -+ - virtual void *_tao_QueryInterface (ptr_arith_t type); -- -+ - virtual const char* _interface_repository_id (void) const; - virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_; -- -+ - protected: - ServerInformationIterator (int collocated = 0); -- -+ - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated); -- -+ - ServerInformationIterator (IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); -- -+ - ServerInformationIterator ( -- TAO_Stub *objref, -+ TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0 - ); - virtual ~ServerInformationIterator (void); -- -+ - friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; - friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; - friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; -- -+ - private: - ServerInformationIterator (const ServerInformationIterator &); - void operator= (const ServerInformationIterator &); - }; -- -+ - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulates - // an invocation logic. -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// - // Base Proxy Impl. Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/base_proxy_impl_ch.cpp:35 -- -+ - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl - { - public: - virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) {} -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual CORBA::Boolean next_n ( - CORBA::Object *_collocated_tao_target_, - CORBA::ULong how_many, -@@ -1610,10 +1612,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/base_proxy_impl_ch.cpp:24 -- -+ - virtual void destroy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL -@@ -1621,35 +1623,35 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; -- -+ - protected: - _TAO_ServerInformationIterator_Proxy_Impl (void); - }; -- -+ - // - // End Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Impl. Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37 -- -+ - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl - : public virtual _TAO_ServerInformationIterator_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_ServerInformationIterator_Remote_Proxy_Impl (void); -- -+ - virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) {} -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual CORBA::Boolean next_n ( - CORBA::Object *_collocated_tao_target_, - CORBA::ULong how_many, -@@ -1659,10 +1661,10 @@ - ACE_THROW_SPEC (( - CORBA::SystemException - )); -- -+ - // TAO_IDL - Generated from - // be/be_visitor_operation/proxy_impl_xh.cpp:24 -- -+ - virtual void destroy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL -@@ -1671,23 +1673,23 @@ - CORBA::SystemException - )); - }; -- -+ - // - // End Remote Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -- -+ - // The Proxy Brokers are used by each interface to get -- // the right proxy for performing a call. In the new -+ // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. -- -+ - /////////////////////////////////////////////////////////////////////// -- // Base Proxy Broker Declaration -+ // Base Proxy Broker Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/base_proxy_broker_ch.cpp:35 -- -+ - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker - { - public: -@@ -1696,56 +1698,56 @@ - ServerInformationIterator *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; -- -+ - protected: - _TAO_ServerInformationIterator_Proxy_Broker (void); -- -+ - }; -- -+ - // -- // End Base Proxy Broker Declaration -+ // End Base Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// -- -- -+ -+ - /////////////////////////////////////////////////////////////////////// -- // Remote Proxy Broker Declaration -+ // Remote Proxy Broker Declaration - // -- -+ - // TAO_IDL - Generated from - // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40 -- -+ - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker - : public virtual _TAO_ServerInformationIterator_Proxy_Broker - { -- public: -+ public: - _TAO_ServerInformationIterator_Remote_Proxy_Broker (void); -- -+ - virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); -- -+ - virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( - ServerInformationIterator *object - ACE_ENV_ARG_DECL - ); -- -+ - private: - _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_; -- -+ - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); - }; -- -+ - // -- // End Remote Proxy Broker Declaration -+ // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - #endif /* end #if !defined */ -- -+ - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 -- -+ - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator; - - // TAO_IDL - Generated from -@@ -1989,4 +1991,3 @@ - - #include "ace/post.h" - #endif /* ifndef */ -- diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff index 9fb17abb8fd..054b24b6e16 100644 --- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff @@ -1,5 +1,5 @@ ---- orig/ImplicitActivationPolicyC.h 2004-11-17 09:22:00.456534400 +0100 -+++ ImplicitActivationPolicyC.h 2004-11-17 09:22:11.171942400 +0100 +--- orig/ImplicitActivationPolicyC.h 2005-02-18 11:19:44.977499200 +0100 ++++ ImplicitActivationPolicyC.h 2005-02-18 11:19:48.592697600 +0100 @@ -96,6 +96,7 @@ NO_IMPLICIT_ACTIVATION }; @@ -29,28 +29,28 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/ImplicitActivationPolicyC.cpp 2004-11-17 09:22:00.456534400 +0100 -+++ ImplicitActivationPolicyC.cpp 2004-11-17 09:22:11.332172800 +0100 -@@ -45,6 +45,8 @@ +--- orig/ImplicitActivationPolicyC.cpp 2005-02-18 11:19:44.977499200 +0100 ++++ ImplicitActivationPolicyC.cpp 2005-02-18 11:19:48.602712000 +0100 +@@ -44,6 +44,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -260,3 +262,5 @@ +@@ -253,3 +255,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ImplicitActivationPolicyA.cpp 2004-11-17 09:22:00.476563200 +0100 -+++ ImplicitActivationPolicyA.cpp 2004-11-17 09:22:11.392259200 +0100 -@@ -33,6 +33,8 @@ +--- orig/ImplicitActivationPolicyA.cpp 2005-02-18 11:19:44.977499200 +0100 ++++ ImplicitActivationPolicyA.cpp 2005-02-18 11:19:48.612726400 +0100 +@@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -59,7 +59,7 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -259,3 +261,5 @@ +@@ -261,3 +263,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff index 2618d3e92a0..1c2c0f7bf9d 100644 --- a/TAO/tao/PortableServer/diffs/POAManager.diff +++ b/TAO/tao/PortableServer/diffs/POAManager.diff @@ -1,6 +1,6 @@ ---- orig/POAManagerC.h 2004-11-17 09:22:01.508046400 +0100 -+++ POAManagerC.h 2004-11-17 09:22:11.702705600 +0100 -@@ -221,6 +221,8 @@ +--- orig/POAManagerC.h 2005-02-18 11:19:45.388089600 +0100 ++++ POAManagerC.h 2005-02-18 11:19:48.662798400 +0100 +@@ -223,6 +223,8 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -9,7 +9,7 @@ virtual void hold_requests ( ::CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -255,6 +257,8 @@ +@@ -257,6 +259,8 @@ ::PortableServer::POAManager::AdapterInactive )) = 0; diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff index 546b8559e00..7e18c20dc93 100644 --- a/TAO/tao/PortableServer/diffs/PS_Forward.diff +++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff @@ -1,9 +1,9 @@ ---- orig/PS_ForwardC.h 2004-11-17 09:22:02.980163200 +0100 -+++ PS_ForwardC.h 2004-11-17 09:22:12.273526400 +0100 -@@ -68,11 +68,25 @@ +--- orig/PS_ForwardC.h 2005-02-18 11:19:46.119140800 +0100 ++++ PS_ForwardC.h 2005-02-18 11:22:35.973379200 +0100 +@@ -66,11 +66,25 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ - + +class TAO_ServantBase; +class TAO_ServantBase_var; +class TAO_RefCountServantBase; @@ -13,16 +13,16 @@ + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 - + namespace PortableServer { -+ typedef TAO_ServantBase ServantBase; -+ typedef TAO_ServantBase_var ServantBase_var; -+ typedef TAO_RefCountServantBase RefCountServantBase; -+ typedef ServantBase *Servant; ++ typedef TAO_ServantBase ServantBase; ++ typedef TAO_ServantBase_var ServantBase_var; ++ typedef TAO_RefCountServantBase RefCountServantBase; ++ typedef ServantBase *Servant; + -+ typedef TAO_Local_ServantBase LocalServantBase; -+ typedef TAO_DynamicImplementation DynamicImplementation; - ++ typedef TAO_Local_ServantBase LocalServantBase; ++ typedef TAO_DynamicImplementation DynamicImplementation; + // TAO_IDL - Generated from - // be\be_visitor_typedef/typedef_ch.cpp:435 + // be\be_visitor_typedef/typedef_ch.cpp:472 diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff index 153959fae6d..9da55740be0 100644 --- a/TAO/tao/PortableServer/diffs/PortableServer.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer.diff @@ -1,13 +1,5 @@ ---- orig/PortableServerC.h 2005-02-13 15:33:37.043569600 +0100 -+++ PortableServerC.h 2005-02-15 09:40:51.890892800 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServerC.h 2005-02-18 11:19:45.718564800 +0100 ++++ PortableServerC.h 2005-02-18 11:19:48.712870400 +0100 @@ -36,6 +36,10 @@ #include "ace/config-all.h" @@ -19,7 +11,7 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -@@ -480,6 +484,8 @@ +@@ -481,6 +485,8 @@ // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -28,7 +20,7 @@ #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) #define _PORTABLESERVER_POA_NOSERVANT_CH_ -@@ -527,6 +533,8 @@ +@@ -528,6 +534,8 @@ #endif /* end #if !defined */ @@ -37,7 +29,7 @@ // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 -@@ -870,6 +878,7 @@ +@@ -871,6 +879,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -45,7 +37,7 @@ virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy ( ::PortableServer::ThreadPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -877,6 +886,7 @@ +@@ -878,6 +887,7 @@ ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -53,7 +45,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 -@@ -914,6 +924,7 @@ +@@ -915,6 +925,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -61,7 +53,7 @@ virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( ::PortableServer::ImplicitActivationPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -921,10 +932,12 @@ +@@ -922,10 +933,12 @@ ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -74,7 +66,7 @@ virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( ::PortableServer::ServantRetentionPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -932,10 +945,12 @@ +@@ -933,10 +946,12 @@ ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -87,7 +79,7 @@ virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( ::PortableServer::RequestProcessingPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS -@@ -943,6 +958,7 @@ +@@ -944,6 +959,7 @@ ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -95,7 +87,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 -@@ -987,6 +1003,8 @@ +@@ -988,6 +1004,8 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -104,7 +96,7 @@ virtual ::PortableServer::AdapterActivator_ptr the_activator ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) -@@ -1004,10 +1022,12 @@ +@@ -1005,10 +1023,12 @@ ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -117,7 +109,7 @@ virtual ::PortableServer::ServantManager_ptr get_servant_manager ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) -@@ -1027,10 +1047,13 @@ +@@ -1028,10 +1048,13 @@ CORBA::SystemException, ::PortableServer::POA::WrongPolicy )) = 0; @@ -131,7 +123,7 @@ virtual ::PortableServer::Servant get_servant ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) -@@ -1052,6 +1075,8 @@ +@@ -1053,6 +1076,8 @@ ::PortableServer::POA::WrongPolicy )) = 0; @@ -140,7 +132,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 -@@ -1313,11 +1338,15 @@ +@@ -1314,11 +1339,15 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_ch.cpp:52 @@ -156,21 +148,13 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_ch.cpp:52 -@@ -1385,4 +1414,3 @@ +@@ -1386,4 +1415,3 @@ #endif /* ifndef */ - ---- orig/PortableServerC.cpp 2005-02-13 15:33:37.043569600 +0100 -+++ PortableServerC.cpp 2005-02-15 09:48:26.875128000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServerC.cpp 2005-02-18 11:19:45.718564800 +0100 ++++ PortableServerC.cpp 2005-02-18 11:19:48.732899200 +0100 @@ -29,7 +29,7 @@ // be\be_codegen.cpp:302 @@ -214,16 +198,8 @@ // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 ---- orig/PortableServerA.cpp 2005-02-13 15:33:37.063598400 +0100 -+++ PortableServerA.cpp 2005-02-13 19:56:05.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/PortableServerA.cpp 2005-02-18 11:19:45.718564800 +0100 ++++ PortableServerA.cpp 2005-02-18 11:19:48.752928000 +0100 @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff index a237f1baabf..82430d03f8b 100644 --- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff @@ -1,5 +1,5 @@ ---- orig/PortableServer_includeC.h 2004-12-02 09:59:06.116356400 +0100 -+++ PortableServer_includeC.h 2004-12-02 09:59:42.268340400 +0100 +--- orig/PortableServer_includeC.h 2005-02-18 11:19:47.981819200 +0100 ++++ PortableServer_includeC.h 2005-02-18 11:19:49.323748800 +0100 @@ -45,7 +45,7 @@ #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff index 421ec97a17d..750ddc39f11 100644 --- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff +++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff @@ -1,5 +1,5 @@ ---- orig/RequestProcessingPolicyC.h 2004-11-17 09:22:03.380739200 +0100 -+++ RequestProcessingPolicyC.h 2004-11-17 09:22:12.363656000 +0100 +--- orig/RequestProcessingPolicyC.h 2005-02-18 11:19:46.359486400 +0100 ++++ RequestProcessingPolicyC.h 2005-02-18 11:19:48.843057600 +0100 @@ -97,6 +97,7 @@ USE_SERVANT_MANAGER }; @@ -29,28 +29,28 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/RequestProcessingPolicyC.cpp 2004-11-17 09:22:03.380739200 +0100 -+++ RequestProcessingPolicyC.cpp 2004-11-17 09:22:12.433756800 +0100 -@@ -45,6 +45,8 @@ +--- orig/RequestProcessingPolicyC.cpp 2005-02-18 11:19:46.359486400 +0100 ++++ RequestProcessingPolicyC.cpp 2005-02-18 11:19:48.853072000 +0100 +@@ -44,6 +44,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -260,3 +262,5 @@ +@@ -253,3 +255,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/RequestProcessingPolicyA.cpp 2004-11-17 09:22:03.400768000 +0100 -+++ RequestProcessingPolicyA.cpp 2004-11-17 09:22:12.483828800 +0100 -@@ -101,6 +101,8 @@ +--- orig/RequestProcessingPolicyA.cpp 2005-02-18 11:19:46.359486400 +0100 ++++ RequestProcessingPolicyA.cpp 2005-02-18 11:19:48.863086400 +0100 +@@ -103,6 +103,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -59,7 +59,7 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -264,3 +266,5 @@ +@@ -266,3 +268,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff index 91ff7b102cc..d5ef9d427e0 100644 --- a/TAO/tao/PortableServer/diffs/ServantActivator.diff +++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff @@ -1,43 +1,43 @@ ---- orig/ServantActivatorC.h 2004-11-17 09:22:03.941545600 +0100 -+++ ServantActivatorC.h 2004-11-17 09:22:12.654073600 +0100 -@@ -74,6 +74,8 @@ +--- orig/ServantActivatorC.h 2005-02-18 11:19:46.569788800 +0100 ++++ ServantActivatorC.h 2005-02-18 11:19:48.923172800 +0100 +@@ -75,6 +75,8 @@ // TAO_IDL - Generated from - // be\be_visitor_root/root_ch.cpp:63 + // be\be_visitor_root/root_ch.cpp:62 +#if (TAO_HAS_MINIMUM_POA == 0) + namespace TAO { class Collocation_Proxy_Broker; -@@ -244,6 +246,8 @@ +@@ -245,6 +247,8 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &); +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/ServantActivatorC.cpp 2004-11-17 09:22:03.941545600 +0100 -+++ ServantActivatorC.cpp 2004-11-17 09:22:12.724174400 +0100 -@@ -46,6 +46,8 @@ +--- orig/ServantActivatorC.cpp 2005-02-18 11:19:46.569788800 +0100 ++++ ServantActivatorC.cpp 2005-02-18 11:19:48.943201600 +0100 +@@ -45,6 +45,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -239,3 +241,5 @@ +@@ -232,3 +234,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantActivatorA.cpp 2004-11-17 09:22:03.961574400 +0100 -+++ ServantActivatorA.cpp 2004-11-17 09:22:12.764232000 +0100 -@@ -32,6 +32,8 @@ +--- orig/ServantActivatorA.cpp 2005-02-18 11:19:46.569788800 +0100 ++++ ServantActivatorA.cpp 2005-02-18 11:19:48.953216000 +0100 +@@ -34,6 +34,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -46,7 +46,7 @@ static const CORBA::Long _oc_PortableServer_ServantActivator[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -154,3 +156,5 @@ +@@ -156,3 +158,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff index 3e8e6299418..31f7a794aae 100644 --- a/TAO/tao/PortableServer/diffs/ServantLocator.diff +++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff @@ -1,15 +1,15 @@ ---- orig/ServantLocatorC.h 2004-11-17 09:22:04.502352000 +0100 -+++ ServantLocatorC.h 2004-11-17 09:22:12.914448000 +0100 -@@ -74,6 +74,8 @@ +--- orig/ServantLocatorC.h 2005-02-18 11:19:46.770076800 +0100 ++++ ServantLocatorC.h 2005-02-18 11:19:49.003288000 +0100 +@@ -76,6 +76,8 @@ // TAO_IDL - Generated from - // be\be_visitor_root/root_ch.cpp:63 + // be\be_visitor_root/root_ch.cpp:62 +#if (TAO_HAS_MINIMUM_POA == 0) + namespace TAO { class Collocation_Proxy_Broker; -@@ -121,6 +123,8 @@ +@@ -123,6 +125,8 @@ : public virtual ::PortableServer::ServantManager { public: @@ -18,35 +18,35 @@ typedef ServantLocator_ptr _ptr_type; typedef ServantLocator_var _var_type; -@@ -246,6 +250,8 @@ +@@ -248,6 +252,8 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &); +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/ServantLocatorC.cpp 2004-11-17 09:22:04.502352000 +0100 -+++ ServantLocatorC.cpp 2004-11-17 09:22:12.984548800 +0100 -@@ -46,6 +46,8 @@ +--- orig/ServantLocatorC.cpp 2005-02-18 11:19:46.770076800 +0100 ++++ ServantLocatorC.cpp 2005-02-18 11:19:49.013302400 +0100 +@@ -45,6 +45,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -239,3 +241,5 @@ +@@ -232,3 +234,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantLocatorA.cpp 2004-11-17 09:22:04.522380800 +0100 -+++ ServantLocatorA.cpp 2004-11-17 09:22:13.034620800 +0100 -@@ -32,6 +32,8 @@ +--- orig/ServantLocatorA.cpp 2005-02-18 11:19:46.770076800 +0100 ++++ ServantLocatorA.cpp 2005-02-18 11:19:49.023316800 +0100 +@@ -34,6 +34,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -55,7 +55,7 @@ static const CORBA::Long _oc_PortableServer_ServantLocator[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -153,3 +155,5 @@ +@@ -155,3 +157,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff index 499ee690c1b..38a1eba32af 100644 --- a/TAO/tao/PortableServer/diffs/ServantManager.diff +++ b/TAO/tao/PortableServer/diffs/ServantManager.diff @@ -1,26 +1,26 @@ ---- orig/ServantManagerC.h 2004-11-17 09:22:04.832827200 +0100 -+++ ServantManagerC.h 2004-11-17 09:22:13.154793600 +0100 +--- orig/ServantManagerC.h 2005-02-18 11:19:47.010422400 +0100 ++++ ServantManagerC.h 2005-02-18 11:19:49.063374400 +0100 @@ -70,6 +70,8 @@ // TAO_IDL - Generated from - // be\be_visitor_root/root_ch.cpp:63 + // be\be_visitor_root/root_ch.cpp:62 +#if (TAO_HAS_MINIMUM_POA == 0) + namespace TAO { class Collocation_Proxy_Broker; -@@ -282,6 +284,8 @@ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); +@@ -212,6 +214,8 @@ + TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying + TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &); +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/ServantManagerC.cpp 2004-11-17 09:22:04.832827200 +0100 -+++ ServantManagerC.cpp 2004-11-17 09:22:13.224894400 +0100 -@@ -51,6 +51,7 @@ +--- orig/ServantManagerC.cpp 2005-02-18 11:19:47.010422400 +0100 ++++ ServantManagerC.cpp 2005-02-18 11:19:49.083403200 +0100 +@@ -49,6 +49,7 @@ { } @@ -28,24 +28,24 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 -@@ -469,3 +470,5 @@ +@@ -227,3 +228,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantManagerA.cpp 2004-11-17 09:22:04.852856000 +0100 -+++ ServantManagerA.cpp 2004-11-17 09:22:13.284980800 +0100 -@@ -30,6 +30,8 @@ +--- orig/ServantManagerA.cpp 2005-02-18 11:19:47.010422400 +0100 ++++ ServantManagerA.cpp 2005-02-18 11:19:49.093417600 +0100 +@@ -31,6 +31,8 @@ + #include "tao/Any.h" #include "tao/Any_Impl_T.h" - #include "tao/Any_Dual_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 -@@ -249,3 +251,5 @@ +@@ -155,3 +157,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff index 356091795a3..b17dd948aa0 100644 --- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff @@ -1,5 +1,5 @@ ---- orig/ServantRetentionPolicyC.h 2004-11-17 09:22:05.163302400 +0100 -+++ ServantRetentionPolicyC.h 2004-11-17 09:22:13.415168000 +0100 +--- orig/ServantRetentionPolicyC.h 2005-02-18 11:19:47.481099200 +0100 ++++ ServantRetentionPolicyC.h 2005-02-18 11:19:49.193561600 +0100 @@ -96,6 +96,7 @@ NON_RETAIN }; @@ -29,28 +29,28 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/ServantRetentionPolicyC.cpp 2004-11-17 09:22:05.163302400 +0100 -+++ ServantRetentionPolicyC.cpp 2004-11-17 09:22:13.485268800 +0100 -@@ -45,6 +45,8 @@ +--- orig/ServantRetentionPolicyC.cpp 2005-02-18 11:19:47.481099200 +0100 ++++ ServantRetentionPolicyC.cpp 2005-02-18 11:19:49.203576000 +0100 +@@ -44,6 +44,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -260,3 +262,5 @@ +@@ -253,3 +255,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantRetentionPolicyA.cpp 2004-11-17 09:22:05.173316800 +0100 -+++ ServantRetentionPolicyA.cpp 2004-11-17 09:22:13.545355200 +0100 -@@ -33,6 +33,8 @@ +--- orig/ServantRetentionPolicyA.cpp 2005-02-18 11:19:47.481099200 +0100 ++++ ServantRetentionPolicyA.cpp 2005-02-18 11:19:49.213590400 +0100 +@@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -59,7 +59,7 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -250,3 +252,5 @@ +@@ -252,3 +254,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff index 045b03391b3..b9c83503050 100644 --- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff @@ -1,5 +1,5 @@ ---- orig/ThreadPolicyC.h 2004-11-17 09:22:05.523820800 +0100 -+++ ThreadPolicyC.h 2004-11-17 09:22:13.705585600 +0100 +--- orig/ThreadPolicyC.h 2005-02-18 11:19:47.691401600 +0100 ++++ ThreadPolicyC.h 2005-02-18 11:19:49.263662400 +0100 @@ -96,6 +96,7 @@ SINGLE_THREAD_MODEL }; @@ -30,28 +30,28 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:958 + // be\be_codegen.cpp:961 ---- orig/ThreadPolicyC.cpp 2004-11-17 09:22:05.523820800 +0100 -+++ ThreadPolicyC.cpp 2004-11-17 09:22:13.795715200 +0100 -@@ -45,6 +45,8 @@ +--- orig/ThreadPolicyC.cpp 2005-02-18 11:19:47.691401600 +0100 ++++ ThreadPolicyC.cpp 2005-02-18 11:19:49.273676800 +0100 +@@ -44,6 +44,8 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:64 + // be\be_visitor_arg_traits.cpp:66 +#if (TAO_HAS_MINIMUM_POA == 0) + // Arg traits specializations. namespace TAO { -@@ -260,3 +262,5 @@ +@@ -253,3 +255,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ThreadPolicyA.cpp 2004-11-17 09:22:05.543849600 +0100 -+++ ThreadPolicyA.cpp 2004-11-17 09:22:13.845787200 +0100 -@@ -33,6 +33,8 @@ +--- orig/ThreadPolicyA.cpp 2005-02-18 11:19:47.691401600 +0100 ++++ ThreadPolicyA.cpp 2005-02-18 11:19:49.283691200 +0100 +@@ -35,6 +35,8 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:295 @@ -60,7 +60,7 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order -@@ -245,3 +247,5 @@ +@@ -247,3 +249,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |