diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
| commit | 25496e24b8043b7b515b3f8beb8e453fb105211c (patch) | |
| tree | f1b34a170ac61e90a3eb102b879e9d51d10336bc /TAO/tao | |
| parent | fa92d4711fb7519995b6bb9e5a16016d7326bbb0 (diff) | |
| download | ATCD-25496e24b8043b7b515b3f8beb8e453fb105211c.tar.gz | |
This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_merge_in_4_14_06
'oci_wchar_refactor_merge_in_4_14_06'.
Diffstat (limited to 'TAO/tao')
1908 files changed, 11697 insertions, 31355 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp index 1e48a102f8c..adc1b27ec4a 100644 --- a/TAO/tao/Abstract_Servant_Base.cpp +++ b/TAO/tao/Abstract_Servant_Base.cpp @@ -6,8 +6,6 @@ ACE_RCSID (tao, Abstract_Servant_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void) { // No-Op. @@ -27,5 +25,3 @@ TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstra { return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index f84b36f3630..3ff31187f77 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -32,8 +32,6 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ServerRequest; class TAO_Stub; class TAO_Abstract_ServantBase; @@ -171,7 +169,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/Acceptor_Filter.cpp b/TAO/tao/Acceptor_Filter.cpp index e0412bc4c07..2a7ca91f360 100644 --- a/TAO/tao/Acceptor_Filter.cpp +++ b/TAO/tao/Acceptor_Filter.cpp @@ -4,10 +4,7 @@ ACE_RCSID(tao, Acceptor_Filter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Acceptor_Filter::~TAO_Acceptor_Filter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h index bfb1a189dd0..aab2bad47fb 100644 --- a/TAO/tao/Acceptor_Filter.h +++ b/TAO/tao/Acceptor_Filter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class ObjectKey; @@ -64,7 +62,5 @@ public: virtual int encode_endpoints (TAO_MProfile &mprofile) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ACCEPTOR_FILTER_H */ diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index f1b5d150049..2286ae6c4fd 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -25,15 +25,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Thread_Per_Connection_Handler.h" -#include "tao/Server_Strategy_Factory.h" -#include "tao/ORB_Core.h" -#include "tao/Transport_Cache_Manager.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Transport.h" -#include "tao/debug.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Thread_Per_Connection_Handler.h" +#include "Server_Strategy_Factory.h" +#include "ORB_Core.h" +#include "Transport_Cache_Manager.h" +#include "Thread_Lane_Resources.h" +#include "Transport.h" +#include "debug.h" + +ACE_RCSID (tao, + Acceptor_Impl, + "$Id$") ////////////////////////////////////////////////////////////////////////////// @@ -211,6 +213,4 @@ TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_H ///////////////////////////////////////////////////////////////////// -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ACCEPTOR_IMPL_CPP */ diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h index 1d2b60e3505..ac978b8167d 100644 --- a/TAO/tao/Acceptor_Impl.h +++ b/TAO/tao/Acceptor_Impl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,8 +24,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_ORB_Core; @@ -107,8 +105,6 @@ protected: TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Acceptor_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 4be1b0d7920..9187303f3da 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -31,8 +31,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Acceptor_Registry::TAO_Acceptor_Registry (void) : acceptors_ (0), size_ (0) @@ -164,7 +162,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid endpoint ") ACE_TEXT ("specification: <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (iop.c_str ()))); } ACE_THROW_RETURN (CORBA::BAD_PARAM ( @@ -253,7 +251,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Invalid endpoint ") ACE_TEXT ("specification: <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (iop.c_str ()))); } ACE_THROW_RETURN (CORBA::BAD_PARAM ( @@ -392,7 +390,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*i)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*i)->protocol_name ().c_str ()) )); } @@ -433,7 +431,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*i)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*i)->protocol_name ().c_str ()) )); } @@ -562,7 +560,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()) )); } @@ -603,7 +601,7 @@ TAO_Acceptor_Registry::open_default_i (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to open ") ACE_TEXT ("default acceptor for <%s>%p\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()), + ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()), ACE_TEXT ("") )); } @@ -764,7 +762,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()) + ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()) )); } @@ -858,7 +856,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("unable to open acceptor ") ACE_TEXT ("for <%s>%p\n"), - ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()), + ACE_TEXT_TO_TCHAR_IN (address.c_str ()), ACE_TEXT (""))); } @@ -880,7 +878,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to create ") ACE_TEXT ("an acceptor for <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (address.c_str ()))); } ACE_THROW_RETURN (CORBA::NO_MEMORY ( @@ -895,5 +893,3 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core, return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 7d7bee02a2d..e51d9b32846 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -27,13 +27,9 @@ #include "tao/Exception.h" #include "tao/params.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +// Forward declarations. class ACE_Addr; class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Acceptor; class TAO_Acceptor_Filter; @@ -138,10 +134,9 @@ private: ACE_ENV_ARG_DECL); private: - // The acceptor registry should not be copied. - TAO_Acceptor_Registry (const TAO_Acceptor_Registry&); - void operator= (const TAO_Acceptor_Registry&); + ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry&)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Acceptor_Registry&)) private: /// List of acceptors that are currently open. @@ -151,8 +146,6 @@ private: size_t size_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) #include "tao/Acceptor_Registry.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Acceptor_Registry.i b/TAO/tao/Acceptor_Registry.i index b086cbf1c1b..4a98e902fc1 100644 --- a/TAO/tao/Acceptor_Registry.i +++ b/TAO/tao/Acceptor_Registry.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_AcceptorSetIterator TAO_Acceptor_Registry::begin (void) { @@ -15,5 +12,3 @@ TAO_Acceptor_Registry::end (void) { return this->acceptors_ + this->size_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index d85ab3b7bac..f7eabbc56c0 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -1,15 +1,12 @@ // $Id$ -#include "tao/Adapter.h" +#include "Adapter.h" ACE_RCSID (tao, Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Adapter::~TAO_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 3a46c4a64b3..5740575de0c 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -24,8 +24,6 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef TAO_Pseudo_Var_T<Object> Object_var; @@ -104,13 +102,12 @@ public: /// Create a collocated object using the given profile and stub. virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &) = 0; - /// Initialize a collocated object using the given stub + /// Initialize a collocated object using the given stub and object /// pointer for lazily evaluated object references. - virtual CORBA::Long initialize_collocated_object (TAO_Stub *) = 0; + virtual CORBA::Long initialize_collocated_object (TAO_Stub *, + CORBA::Object_ptr) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ADAPTER_H */ diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp index 104a5662569..99c8ea348d9 100644 --- a/TAO/tao/Adapter_Factory.cpp +++ b/TAO/tao/Adapter_Factory.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "tao/Adapter_Factory.h" +#include "Adapter_Factory.h" // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Adapter_Factory::~TAO_Adapter_Factory (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h index 8fa53f30628..fc4d8d13b82 100644 --- a/TAO/tao/Adapter_Factory.h +++ b/TAO/tao/Adapter_Factory.h @@ -16,18 +16,12 @@ #include /**/ "ace/pre.h" #include "tao/TAO_Export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/Service_Object.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Adapter; class TAO_ORB_Core; @@ -41,8 +35,6 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index 4096cb515bb..0f154f49f01 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -1,11 +1,10 @@ // $Id$ -#include "tao/Object.h" -#include "tao/Stub.h" -#include "tao/Adapter_Registry.h" -#include "tao/Adapter.h" -#include "tao/SystemException.h" -#include "tao/debug.h" +#include "Object.h" +#include "Adapter_Registry.h" +#include "Adapter.h" +#include "SystemException.h" +#include "debug.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" @@ -14,8 +13,6 @@ ACE_RCSID (tao, Adapter_Registry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Adapter_Registry::TAO_Adapter_Registry (TAO_ORB_Core *oc) : orb_core_ (oc), adapters_capacity_ (16), // @@ Make it configurable @@ -53,7 +50,7 @@ TAO_Adapter_Registry::close (int wait_for_completion if (TAO_debug_level > 3) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in TAO_Adapter_Registry::close ()"); + "Exception in TAO_Adapter_Registry::close () \n"); } return; } @@ -163,38 +160,22 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub, this->adapters_[i]->create_collocated_object (stub, mprofile); if (x != 0) - { - if (!stub->collocated_servant ()) - { - // This adapter created an object but it was not able to locate - // a servant so we need to give the rest of the adapters a chance to - // initialise the stub and find a servant or forward us or whatever. - for (CORBA::Long go_on = 1; go_on && i != this->adapters_count_; ++i) - { - // initialize_collocated_object only returns 0 if it has completely - // initialised the object. - go_on = this->adapters_[i]->initialize_collocated_object (stub); - } - } - return x; - } + return x; } return 0; } CORBA::Long -TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub) +TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub, + CORBA::Object_ptr obj) { for (size_t i = 0; i != this->adapters_count_; ++i) { int retval = - this->adapters_[i]->initialize_collocated_object (stub); - if (retval == 0) - { - // initialize_collocated_object only returns 0 if it has completely - // initialised the object. We can return early. - return retval; - } + this->adapters_[i]->initialize_collocated_object (stub, + obj); + if (retval != 0) + return retval; } return 0; } @@ -212,4 +193,3 @@ TAO_Adapter_Registry::find_adapter (const char *name) const } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 5572d422a3f..e184f1a81ca 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -29,8 +29,6 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef TAO_Pseudo_Var_T<Object> Object_var; @@ -95,7 +93,8 @@ public: /// Initialize a collocated object using the given stub and object /// pointer for lazily evaluated object references. - CORBA::Long initialize_collocated_object (TAO_Stub *); + CORBA::Long initialize_collocated_object (TAO_Stub *, + CORBA::Object_ptr o); /// Fetch the adapter named @a name TAO_Adapter *find_adapter (const char *name) const; @@ -114,8 +113,6 @@ private: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h index ec6567fc0dd..65d0465d4fe 100644 --- a/TAO/tao/Allocator.h +++ b/TAO/tao/Allocator.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -19,10 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -44,7 +40,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ALLOCATOR_H */ diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index d968f65b205..7a27a68e747 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -15,7 +15,6 @@ #include "ace/Dynamic_Service.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -199,6 +198,4 @@ TAO::TypeCode::Alias<StringType, Traits<StringType>::get_typecode (this->content_type_)); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ALIAS_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 201f3f001fc..e0d5dd2d06a 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -27,7 +27,6 @@ #include "tao/TypeCodeFactory_Adapter.h" #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -124,8 +123,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Alias_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl index 0be28aa9d70..fb692130538 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename StringType, typename TypeCodeType, @@ -27,5 +26,3 @@ TAO::TypeCode::Alias<StringType, , content_type_ (tc) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index 46baeb1705f..bad91cccc89 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "Alias_TypeCode_Static.h" #ifndef __ACE_INLINE__ -# include "tao/AnyTypeCode/Alias_TypeCode_Static.inl" +# include "Alias_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ -#include "tao/AnyTypeCode/TypeCode_Traits.h" +#include "TypeCode_Traits.h" #include "tao/ORB_Core.h" #include "tao/CDR.h" @@ -19,7 +19,6 @@ ACE_RCSID (tao, Alias_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Alias<char const *, @@ -174,5 +173,3 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode::_duplicate ( Traits<char const *>::get_typecode (this->content_type_)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index ce78541df83..92541682efc 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -27,7 +27,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -122,8 +121,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Alias_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl index 1be08b55121..a2665f5e461 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -18,5 +16,3 @@ TAO::TypeCode::Alias<char const *, , content_type_ (tc) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index cc1338b633f..0095966e1c6 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -25,8 +25,6 @@ ACE_RCSID (tao, Any, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - using namespace TAO; CORBA::Any::Any (void) @@ -275,7 +273,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) if ((cdr >> tc.out ()) == 0) { - return false; + return 0; } ACE_TRY_NEW_ENV @@ -283,7 +281,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) TAO::Unknown_IDL_Type *impl = 0; ACE_NEW_RETURN (impl, TAO::Unknown_IDL_Type (tc.in ()), - false); + 0); any.replace (impl); impl->_tao_decode (cdr @@ -292,11 +290,11 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any) } ACE_CATCH (CORBA::Exception, ex) { - return false; + return 0; } ACE_ENDTRY; - return true; + return 1; } // ======================================================================= @@ -357,7 +355,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_string s) void CORBA::Any::operator<<= (CORBA::Any::from_wstring ws) { - if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_) + if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::strlen (ws.val_) > ws.bound_) { return; } @@ -768,8 +766,8 @@ namespace TAO ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return true; + return 1; } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 6100e206a89..38e3936b444 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -29,8 +29,6 @@ #include "ace/CDR_Stream.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Any_Impl; @@ -325,14 +323,10 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WChar *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any.inl" #else -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Copying versions of insertion operators for basic types /// must also be defined for CORBA::Any_var. @@ -397,8 +391,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &, TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any_var &, CORBA::Any::to_object); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl index dd987ea89f5..281074ede88 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::Any_Impl * CORBA::Any::impl (void) const { @@ -369,5 +366,3 @@ CORBA::Any_out::operator-> (void) { return this->ptr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl index f5e60ba8edd..fb3a570b657 100644 --- a/TAO/tao/AnyTypeCode/AnySeq.pidl +++ b/TAO/tao/AnyTypeCode/AnySeq.pidl @@ -13,8 +13,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * AnySeq.pidl * */ diff --git a/TAO/tao/AnyTypeCode/AnySeqA.cpp b/TAO/tao/AnyTypeCode/AnySeqA.cpp index f379a5330db..4b87880c61f 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/AnySeqA.h" +#include "AnySeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqA.h b/TAO/tao/AnyTypeCode/AnySeqA.h index 644c4af252f..16f1b2288f1 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.h +++ b/TAO/tao/AnyTypeCode/AnySeqA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -93,8 +91,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/AnySeqC.cpp b/TAO/tao/AnyTypeCode/AnySeqC.cpp index da850503e43..f04c69e6e47 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/AnySeqC.h" +#include "AnySeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -171,5 +169,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/AnySeqC.h b/TAO/tao/AnyTypeCode/AnySeqC.h index bb18f8e402a..12b744d0be4 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.h +++ b/TAO/tao/AnyTypeCode/AnySeqC.h @@ -67,8 +67,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -166,8 +164,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 86a170d7639..0e35d292055 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "tao/AnyTypeCode/SystemExceptionA.h" @@ -6,12 +6,10 @@ #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID (AnyTypeCode, +ACE_RCSID (tao, TAO_AnyTypeCode_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #define STANDARD_EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ TAO_SYSTEM_EXCEPTION (BAD_PARAM) \ @@ -92,42 +90,6 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Short va } void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::UShort value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Float value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Double value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::LongLong value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::ULongLong value) -{ - (*any) <<= value; -} - -void -TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::LongDouble value) -{ - (*any) <<= value; -} - -void TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) { (*any) <<= policy; @@ -177,7 +139,6 @@ TAO_AnyTypeCode_Adapter_Impl::Initializer (void) ); } -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DEFINE ( TAO_AnyTypeCode_Adapter_Impl, diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index 389623b086c..ccee6c0a090 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -25,8 +25,6 @@ #include "tao/AnyTypeCode_Adapter.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_AnyTypeCode_Adapter */ @@ -96,18 +94,6 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, CORBA::Short value); - virtual void insert_into_any (CORBA::Any * any, CORBA::UShort value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::Float value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::Double value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::LongLong value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::ULongLong value); - - virtual void insert_into_any (CORBA::Any * any, CORBA::LongDouble value); - virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy); virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy); @@ -123,8 +109,6 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_AnyTypeCode_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_AnyTypeCode_Adapter_Impl) diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h index d954af4b0ad..92ddfa65a0b 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h @@ -30,8 +30,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class NamedValue; @@ -53,8 +51,6 @@ namespace CORBA TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr); } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANYTYPECODE_METHODS_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h index 085a068aa6b..26e4b66a844 100644 --- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h +++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -25,8 +25,6 @@ #include "tao/Var_Size_Argument_T.h" #include "tao/Arg_Traits_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -49,8 +47,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANY_ARG_TRAITS_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index ad9c1a3470e..258c469dd0e 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_ARRAY_IMPL_T_CPP -#define TAO_ANY_ARRAY_IMPL_T_CPP +#ifndef TAO_ANY_ARRAY_IMPL_T_C +#define TAO_ANY_ARRAY_IMPL_T_C #include "tao/AnyTypeCode/Any_Array_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,7 +18,9 @@ # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Array_Impl_T, + "$Id$") template<typename T_slice, typename T_forany> TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T ( @@ -65,14 +67,14 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = + const CORBA::Boolean _tao_equiv = any_tc->equivalent (tc ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -84,11 +86,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_); - return true; + return 1; } TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0; @@ -97,7 +99,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, ARRAY_ANY_IMPL (destructor, any_tc, T_forany::tao_alloc ()), - false); + 0); auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety ( replacement @@ -111,7 +113,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -119,7 +121,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, _tao_elem = reinterpret_cast <T_slice*> (replacement->value_); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -158,6 +160,4 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_ARRAY_IMPL_T_CPP */ +#endif /* TAO_ANY_ARRAY_IMPL_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index f7c0d1656ab..4f0d7ce0dee 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -64,10 +62,13 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl index c64d59e022c..876b658d0ae 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T_slice, typename T_forany> ACE_INLINE CORBA::Boolean @@ -28,5 +26,3 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const { return this->value_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index 1da4200709a..4f390f5be3e 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -14,8 +14,6 @@ ACE_RCSID (tao, Any_Basic_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc, @@ -109,9 +107,9 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (!_tao_equiv) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -123,12 +121,12 @@ namespace TAO if (narrow_impl == 0) { - return false; + return 0; } Any_Basic_Impl::assign_value (_tao_elem, narrow_impl); - return true; + return 1; } TAO::Any_Basic_Impl *replacement = @@ -150,7 +148,7 @@ namespace TAO // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading, static_cast<CORBA::Long> (tck)); @@ -161,7 +159,7 @@ namespace TAO tck); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -172,7 +170,7 @@ namespace TAO } ACE_ENDTRY; - return false; + return 0; } CORBA::Boolean @@ -382,5 +380,3 @@ namespace TAO } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index 563a252d54a..34f75baad1d 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file Any_Basic_Impl.h @@ -21,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -95,8 +92,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANY_BASIC_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index d2871693f43..d5fc92f2467 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_BASIC_IMPL_T_CPP -#define TAO_ANY_BASIC_IMPL_T_CPP +#ifndef TAO_ANY_BASIC_IMPL_T_C +#define TAO_ANY_BASIC_IMPL_T_C #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" #include "tao/AnyTypeCode/Any.h" @@ -18,7 +18,10 @@ # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Basic_Impl_T, + "$Id$") + template<typename T> TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc, @@ -56,13 +59,13 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean _tao_equiv = any_tc->equivalent (tc + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -74,11 +77,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } TAO::Any_Basic_Impl_T<T> *replacement = @@ -94,7 +97,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -102,7 +105,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -113,7 +116,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, } ACE_ENDTRY; - return false; + return 0; } template<typename T> @@ -139,6 +142,4 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_BASIC_IMPL_T_CPP */ +#endif /* TAO_ANY_BASIC_IMPL_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index aff9109b34b..d704f87b546 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -61,10 +59,13 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl index 1cd0d1627dc..4250b5f4f88 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T> ACE_INLINE CORBA::Boolean @@ -28,4 +24,3 @@ TAO::Any_Basic_Impl_T<T>::value (void) const return &this->value_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 59aded80015..0bba1c76c46 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -21,7 +21,9 @@ # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Dual_Impl_T, + "$Id$") template<typename T> TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor, @@ -110,7 +112,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -122,11 +124,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } T *empty_value = 0; @@ -150,7 +152,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -158,7 +160,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -197,6 +199,4 @@ TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ANY_DUAL_IMPL_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index e09cdad1f77..8c06f69d64c 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,9 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -77,10 +74,13 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl index 8e97656a93a..bf3ecd90e33 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl @@ -1,10 +1,5 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T> ACE_INLINE CORBA::Boolean @@ -29,4 +24,3 @@ TAO::Any_Dual_Impl_T<T>::value (void) const return this->value_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index d51a2539146..a0192816d53 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/AnyTypeCode/Any_Impl.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Marshal.h" +#include "Any_Impl.h" +#include "TypeCode.h" +#include "Marshal.h" #include "tao/CORBA_String.h" #include "tao/SystemException.h" @@ -14,8 +14,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Any_Impl::Any_Impl (_tao_destructor destructor, CORBA::TypeCode_ptr tc, bool encoded) @@ -137,4 +135,3 @@ TAO::Any_Impl::encoded (void) const return this->encoded_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 9eaf83b482d..128072e25cc 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -1,13 +1,11 @@ // -*- C++ -*- - //============================================================================= /** * @file Any_Impl.h * * $Id$ * - * @author Carlos O'Ryan - * @author Jeff Parsons + * @authors Carlos O'Ryan and Jeff Parsons */ //============================================================================= @@ -31,14 +29,10 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Message_Block; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; +class ACE_Message_Block; namespace CORBA { @@ -114,8 +108,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANY_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index d4afd38e237..f4a04cb568e 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_IMPL_T_CPP -#define TAO_ANY_IMPL_T_CPP +#ifndef TAO_ANY_IMPL_T_C +#define TAO_ANY_IMPL_T_C #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -19,7 +19,9 @@ # include "tao/AnyTypeCode/Any_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Impl_T, + "$Id$") template<typename T> TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor, @@ -69,7 +71,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -81,11 +83,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = (T *) narrow_impl->value_; - return true; + return 1; } TAO::Any_Impl_T<T> *replacement = 0; @@ -93,7 +95,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, TAO::Any_Impl_T<T> (destructor, any_tc, 0), - false); + 0); auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); @@ -105,7 +107,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -113,7 +115,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, _tao_elem = const_cast<T *> (replacement->value_); const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -152,6 +154,4 @@ TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_IMPL_T_CPP */ +#endif /* TAO_ANY_IMPL_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index bddd912ecc9..d79c5ce2135 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -72,8 +70,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Impl_T.inl" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Impl_T.inl index 3b5b36ab5ed..1bbeebeea78 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +// This may look like C, but it's really -*- C++ -*- // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // These three are overridden in generated code where appropriate. template<typename T> @@ -54,4 +51,3 @@ TAO::Any_Impl_T<T>::value (void) const return this->value_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index 544e89127d3..b584831329c 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ANY_SPECIAL_IMPL_T_CPP -#define TAO_ANY_SPECIAL_IMPL_T_CPP +#ifndef TAO_ANY_SPECIAL_IMPL_T_C +#define TAO_ANY_SPECIAL_IMPL_T_C #include "tao/AnyTypeCode/Any_Special_Impl_T.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -15,7 +15,9 @@ # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Any_Special_Impl_T, + "$Id$") template<typename T, typename from_T, typename to_T> TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T ( @@ -103,7 +105,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (any_kind != try_kind) { - return false; + return 0; } CORBA::ULong length = @@ -112,7 +114,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (length != bound) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -127,11 +129,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = (T *) narrow_impl->value_; - return true; + return 1; } TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0; @@ -140,7 +142,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, tc, 0, bound), - false); + 0); auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety ( replacement @@ -154,7 +156,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -162,7 +164,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } // Duplicated by Any_Impl base class constructor. @@ -197,18 +199,10 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode ( ACE_ENV_ARG_DECL ) { - if (this->value_destructor_ != 0) - { - (*this->value_destructor_) (this->value_); - this->value_ = 0; - } - if (! this->demarshal_value (cdr)) { ACE_THROW (CORBA::MARSHAL ()); } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ANY_T_CPP */ +#endif /* TAO_ANY_T_C */ diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c166c9293ca..c5fe808c64e 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -66,10 +64,13 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl index cce6dbda782..bc8715b083f 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T, typename from_T, typename to_T> ACE_INLINE CORBA::Boolean @@ -32,4 +28,3 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const return this->value_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 2a22d8f256c..d3a4b55193c 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "tao/AnyTypeCode/Any_SystemException.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" -#include "tao/AnyTypeCode/Marshal.h" -#include "tao/AnyTypeCode/TypeCode.h" +#include "Any_SystemException.h" +#include "Any.h" +#include "Any_Unknown_IDL_Type.h" +#include "Marshal.h" +#include "TypeCode.h" #include "tao/CDR.h" #include "tao/Exception.h" @@ -21,8 +21,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor, CORBA::TypeCode_ptr tc, CORBA::SystemException * const val) @@ -92,13 +90,13 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, ACE_TRY_NEW_ENV { CORBA::TypeCode_ptr any_tc = any._tao_get_typecode (); - CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc - ACE_ENV_ARG_PARAMETER); + CORBA::Boolean _tao_equiv = any_tc->equivalent (tc + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (_tao_equiv == false) + if (_tao_equiv == 0) { - return false; + return 0; } TAO::Any_Impl *impl = any.impl (); @@ -110,11 +108,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, if (narrow_impl == 0) { - return false; + return 0; } _tao_elem = narrow_impl->value_; - return true; + return 1; } CORBA::SystemException *empty_value = (*f) (); @@ -124,7 +122,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, TAO::Any_SystemException (destructor, any_tc, empty_value), - false); + 0); auto_ptr<TAO::Any_SystemException > replacement_safety (replacement); @@ -136,7 +134,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, // shared by another Any. This copies the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); - CORBA::Boolean const good_decode = + CORBA::Boolean good_decode = replacement->demarshal_value (for_reading); if (good_decode) @@ -144,7 +142,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, _tao_elem = replacement->value_; const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); - return true; + return 1; } } ACE_CATCHANY @@ -181,13 +179,13 @@ TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr) this->value_->_tao_encode (cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } CORBA::Boolean @@ -198,13 +196,11 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr) this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h index a26dacfe1c1..2856c6cf3f1 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.h +++ b/TAO/tao/AnyTypeCode/Any_SystemException.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -81,7 +79,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_ANY_SYSTEMEXCEPTION_H*/ diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 980b311f802..062c906b303 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -15,8 +15,6 @@ ACE_RCSID (tao, Any_Unknown_IDL_Type, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_Auto_Ptr<ACE_Lock> TAO::Unknown_IDL_Type::lock_(new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>()); TAO::Unknown_IDL_Type::Unknown_IDL_Type ( @@ -67,16 +65,16 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr) if (status != TAO::TRAVERSE_CONTINUE) { - return false; + return 0; } } ACE_CATCH (CORBA::Exception, ex) { - return false; + return 0; } ACE_ENDTRY; - return true; + return 1; } const void * @@ -295,5 +293,3 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index 8a59bee86b0..56d0cb2b1b4 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -1,13 +1,11 @@ // -*- C++ -*- - //============================================================================= /** * @file Any_Unknown_IDL_Type.h * * $Id$ * - * @author Carlos O'Ryan - * @author Jeff Parsons + * @authors Carlos O'Ryan and Jeff Parsons */ //============================================================================= @@ -25,12 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -74,8 +68,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */ diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp index 99a63b8332a..051cf1ea18d 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/BooleanSeqA.h" +#include "BooleanSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.h b/TAO/tao/AnyTypeCode/BooleanSeqA.h index 9797a2afa66..e621d14fd31 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.h +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.h @@ -37,8 +37,6 @@ #include "tao/BooleanSeqC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::BooleanSeq*); / TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::BooleanSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::BooleanSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/Bounds.pidl b/TAO/tao/AnyTypeCode/Bounds.pidl index 707ab2b8158..c639e285fe5 100644 --- a/TAO/tao/AnyTypeCode/Bounds.pidl +++ b/TAO/tao/AnyTypeCode/Bounds.pidl @@ -15,8 +15,6 @@ * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Bounds.pidl * * and then: diff --git a/TAO/tao/AnyTypeCode/BoundsA.cpp b/TAO/tao/AnyTypeCode/BoundsA.cpp index 40891d21c2e..097395f4667 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.cpp +++ b/TAO/tao/AnyTypeCode/BoundsA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/BoundsA.h" +#include "BoundsA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -147,5 +145,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BoundsA.h b/TAO/tao/AnyTypeCode/BoundsA.h index ed91bde89f4..c3f5f3658a2 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.h +++ b/TAO/tao/AnyTypeCode/BoundsA.h @@ -62,8 +62,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -147,8 +145,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/BoundsC.cpp b/TAO/tao/AnyTypeCode/BoundsC.cpp index a4e520aa372..fec4453680a 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.cpp +++ b/TAO/tao/AnyTypeCode/BoundsC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/BoundsA.h" +#include "BoundsA.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -173,5 +171,3 @@ CORBA::Boolean operator>> ( { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/BoundsC.h b/TAO/tao/AnyTypeCode/BoundsC.h index 68a4721e7dc..b228461b7b0 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.h +++ b/TAO/tao/AnyTypeCode/BoundsC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -133,8 +131,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp index 91fc0a664e3..e93d7b8e7f7 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/CONV_FRAMEA.h" +#include "CONV_FRAMEA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -427,5 +425,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h index beffd197c43..cbc76dd89aa 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CONV_FRAME { @@ -108,8 +106,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContex TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/CharSeqA.cpp b/TAO/tao/AnyTypeCode/CharSeqA.cpp index eb3fd68c0e9..e6867cf7452 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/CharSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/CharSeqA.h" +#include "CharSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CharSeqA.h b/TAO/tao/AnyTypeCode/CharSeqA.h index 76758080b9e..59c6bfdb1f4 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.h +++ b/TAO/tao/AnyTypeCode/CharSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::CharSeq*); // n TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::CharSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::CharSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/CurrentA.cpp b/TAO/tao/AnyTypeCode/CurrentA.cpp index 0501cc64e20..d7946836b98 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.cpp +++ b/TAO/tao/AnyTypeCode/CurrentA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/CurrentA.h" +#include "CurrentA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_CORBA_Current ( @@ -53,4 +51,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/CurrentA.h b/TAO/tao/AnyTypeCode/CurrentA.h index 5a505a5776d..e045f6a2882 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.h +++ b/TAO/tao/AnyTypeCode/CurrentA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -56,8 +54,6 @@ namespace CORBA } // module CORBA -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/DomainA.cpp b/TAO/tao/AnyTypeCode/DomainA.cpp index 6f6db000bc2..4bf71aa1cae 100644 --- a/TAO/tao/AnyTypeCode/DomainA.cpp +++ b/TAO/tao/AnyTypeCode/DomainA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/DomainA.h" +#include "DomainA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -296,5 +294,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DomainA.h b/TAO/tao/AnyTypeCode/DomainA.h index 72c5b0f95ac..9f8660d3545 100644 --- a/TAO/tao/AnyTypeCode/DomainA.h +++ b/TAO/tao/AnyTypeCode/DomainA.h @@ -58,8 +58,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -119,8 +117,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp index a67a84fb0b5..79331b8f617 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/DoubleSeqA.h" +#include "DoubleSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.h b/TAO/tao/AnyTypeCode/DoubleSeqA.h index c905c31a980..f6bb35ddd49 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::DoubleSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::DoubleSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::DoubleSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl index 6a15c71045e..9cc2be7c43d 100644 --- a/TAO/tao/AnyTypeCode/Dynamic.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Dynamic.pidl * */ @@ -25,8 +23,8 @@ // File: Dynamic.idl // Used primarily for Interceptors -#include "tao/AnyTypeCode/Dynamic_Parameter.pidl" -#include "tao/StringSeq.pidl" +#include "Dynamic_Parameter.pidl" +#include "StringSeq.pidl" #ifndef _DYNAMIC_IDL_ #define _DYNAMIC_IDL_ diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp index 4f17ea24008..589213436f5 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.cpp +++ b/TAO/tao/AnyTypeCode/DynamicA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/DynamicA.h" +#include "DynamicA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/Dynamic_ParameterA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD #define _TAO_TYPECODE_Dynamic_ParameterList_GUARD namespace TAO @@ -287,5 +285,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicA.h b/TAO/tao/AnyTypeCode/DynamicA.h index a327a5a461a..944d9d28d76 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.h +++ b/TAO/tao/AnyTypeCode/DynamicA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { } // module CORBA @@ -129,8 +127,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCod // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp index bb693ede9b8..3b045863a7a 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.cpp +++ b/TAO/tao/AnyTypeCode/DynamicC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/DynamicC.h" +#include "DynamicC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -303,5 +301,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h index 0bdd3a59057..76b095d02f0 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.h +++ b/TAO/tao/AnyTypeCode/DynamicC.h @@ -70,8 +70,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -253,8 +251,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl index 038b00daf99..f82dd8ba366 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl +++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Dynamic_Parameter.pidl * */ @@ -29,7 +27,7 @@ #ifndef _DYNAMIC_PARAMETER_IDL_ #define _DYNAMIC_PARAMETER_IDL_ -#include "tao/ParameterMode.pidl" +#include <ParameterMode.pidl> module Dynamic { diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp index 6376ab32799..df1f94abd24 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/Dynamic_ParameterA.h" +#include "Dynamic_ParameterA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/ParameterModeA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -124,5 +122,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h index facb3803731..25b861466fd 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Dynamic { @@ -91,8 +89,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dyn // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp index 093e3c79f27..b681433ed5e 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/Dynamic_ParameterC.h" +#include "Dynamic_ParameterC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -82,5 +80,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.argument) && (strm >> _tao_aggregate.mode); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h index e5533c2b7dc..1647bfc6b91 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Dynamic { @@ -123,8 +121,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Param // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 1294bdd0fe6..6f9f5589c15 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/AnyTypeCode/Empty_Param_TypeCode.h" +#include "Empty_Param_TypeCode.h" #ifndef __ACE_INLINE__ -# include "tao/AnyTypeCode/Empty_Param_TypeCode.inl" +# include "Empty_Param_TypeCode.inl" #endif /* !__ACE_INLINE__ */ @@ -12,8 +12,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const @@ -46,7 +44,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr // Equality has already been established in the // CORBA::TypeCode base class. - return true; + return 1; } CORBA::Boolean @@ -62,12 +60,12 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc CORBA::TCKind const tc_kind = TAO::unaliased_kind (tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_kind != this->kind_) - return false; + return 0; - return true; + return 1; } CORBA::TypeCode_ptr @@ -83,5 +81,3 @@ TAO::TypeCode::Empty_Param::get_compact_typecode_i ( return &compact_typecode; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index 62b9936a1a9..4b39c0cf73a 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -23,8 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -90,8 +88,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Empty_Param_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl index bfead3de02d..85ec45fd029 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl @@ -2,12 +2,9 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k) : CORBA::TypeCode (k) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index b84a50f9b72..112f3cc463e 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -15,7 +15,6 @@ # include "tao/AnyTypeCode/Enum_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> bool @@ -90,10 +89,10 @@ TAO::TypeCode::Enum<StringType, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nenumerators_; ++i) { @@ -103,13 +102,13 @@ TAO::TypeCode::Enum<StringType, Traits<StringType>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; } - return true; + return 1; } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> @@ -125,12 +124,12 @@ TAO::TypeCode::Enum<StringType, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; - return true; + return 1; } template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> @@ -219,6 +218,4 @@ TAO::TypeCode::Enum<StringType, return Traits<StringType>::get_string (this->enumerators_[index]); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_ENUM_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 64a4d7bf9b0..e85387209d6 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -123,7 +122,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Enum_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl index dc8d3b6631a..8b8e04f8632 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class EnumeratorArrayType, @@ -20,5 +19,3 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum ( , enumerators_ (enumerators) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 64cd8f00d37..930fb10eaf2 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -13,11 +13,10 @@ #endif /* !__ACE_INLINE__ */ -ACE_RCSID (AnyTypeCode, +ACE_RCSID (tao, Enum_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Enum<char const *, @@ -87,10 +86,10 @@ TAO::TypeCode::Enum<char const *, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nenumerators_; ++i) { @@ -100,13 +99,13 @@ TAO::TypeCode::Enum<char const *, Traits<char const *>::get_string (lhs_enumerator); char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; } - return true; + return 1; } CORBA::Boolean @@ -121,12 +120,12 @@ TAO::TypeCode::Enum<char const *, CORBA::ULong const tc_nenumerators = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nenumerators != this->nenumerators_) - return false; + return 0; - return true; + return 1; } CORBA::TypeCode_ptr @@ -213,5 +212,3 @@ TAO::TypeCode::Enum<char const *, return Traits<char const *>::get_string (this->enumerators_[index]); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index d9f22d44271..e8b78607c85 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -128,7 +127,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Enum_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl index b0f1e6df742..1d2ab5ca8cb 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Enum<char const *, char const * const *, @@ -20,5 +18,3 @@ TAO::TypeCode::Enum<char const *, , enumerators_ (enumerators) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index 138d2bc2b6d..ba97c942cdb 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/AnyTypeCode/ExceptionA.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +#include "ExceptionA.h" +#include "Any_Dual_Impl_T.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/ORB_Constants.h" @@ -20,8 +20,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Specializations for CORBA::Exception Any operators. namespace TAO { @@ -44,14 +42,14 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } template<> @@ -64,14 +62,14 @@ namespace TAO ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - return true; + return 1; } ACE_CATCHANY { } ACE_ENDTRY; - return false; + return 0; } // This should never get called since we don't have extraction operators @@ -87,7 +85,7 @@ namespace TAO const CORBA::Exception *& ) { - return false; + return 0; } } @@ -118,5 +116,3 @@ operator<<= (CORBA::Any &any, CORBA::Exception *exception) ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 44f6cd6834c..05d608f4403 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Exception.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -46,8 +44,6 @@ namespace CORBA TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/"ace/post.h" #endif /* TAO_EXCEPTIONA_H */ diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index 0fae62d507c..d0adfdcb7b0 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -10,7 +10,6 @@ # include "tao/AnyTypeCode/Fixed_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class RefCountPolicy> bool @@ -108,6 +107,5 @@ TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i ( return this->scale_; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_FIXED_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 3e300cb3658..740ae58de8e 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -23,8 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -97,8 +95,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Fixed_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl index 61aad41d671..9db9ca2b26d 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits, @@ -14,5 +12,3 @@ TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits, , scale_ (scale) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.cpp b/TAO/tao/AnyTypeCode/FloatSeqA.cpp index 4f33cff12e0..2d7b5761009 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.cpp +++ b/TAO/tao/AnyTypeCode/FloatSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/FloatSeqA.h" +#include "FloatSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.h b/TAO/tao/AnyTypeCode/FloatSeqA.h index e43fd256d73..149932f1466 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.h +++ b/TAO/tao/AnyTypeCode/FloatSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::FloatSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::FloatSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::FloatSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/GIOPA.cpp b/TAO/tao/AnyTypeCode/GIOPA.cpp index 6e5788601b7..2e6898c7486 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.cpp +++ b/TAO/tao/AnyTypeCode/GIOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/GIOPA.h" +#include "GIOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -328,5 +326,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/GIOPA.h b/TAO/tao/AnyTypeCode/GIOPA.h index 7971878edcc..b6b51cc4f1b 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.h +++ b/TAO/tao/AnyTypeCode/GIOPA.h @@ -39,7 +39,6 @@ #include "tao/AnyTypeCode/IOP_IORA.h" #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -96,8 +95,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/IIOPA.cpp b/TAO/tao/AnyTypeCode/IIOPA.cpp index 0af44ddaac6..89720b384a9 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.cpp +++ b/TAO/tao/AnyTypeCode/IIOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IIOPA.h" +#include "IIOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,9 +37,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -322,5 +319,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IIOPA.h b/TAO/tao/AnyTypeCode/IIOPA.h index 52931766bc1..58fc4b53f3a 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.h +++ b/TAO/tao/AnyTypeCode/IIOPA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace IIOP { @@ -90,8 +88,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceCon TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp index ce4520e630a..d528ac270c4 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IIOP_EndpointsA.h" +#include "IIOP_EndpointsA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -233,5 +231,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h index e7f1f677145..b62fc8976f1 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -108,8 +106,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/IOPA.cpp b/TAO/tao/AnyTypeCode/IOPA.cpp index a6f7e67bc7c..77398cd1a3b 100644 --- a/TAO/tao/AnyTypeCode/IOPA.cpp +++ b/TAO/tao/AnyTypeCode/IOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IOPA.h" +#include "IOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.cpp b/TAO/tao/AnyTypeCode/IOP_IORA.cpp index 0538c9143dc..0c9e8f27150 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.cpp +++ b/TAO/tao/AnyTypeCode/IOP_IORA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/IOP_IORA.h" +#include "IOP_IORA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -997,5 +995,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.h b/TAO/tao/AnyTypeCode/IOP_IORA.h index aecc75df280..081015c697f 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.h +++ b/TAO/tao/AnyTypeCode/IOP_IORA.h @@ -39,8 +39,6 @@ #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -184,8 +182,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*) TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp index 61f889f87c9..98e266b808a 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/LongDoubleSeqA.h" +#include "LongDoubleSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h index 7c4b3675985..1462f4a097c 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -94,8 +92,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp index 1546a6a5106..237cc42e778 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/LongLongSeqA.h" +#include "LongLongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.h b/TAO/tao/AnyTypeCode/LongLongSeqA.h index 12256367f76..ba99c7410b9 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -94,8 +92,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/LongSeqA.cpp b/TAO/tao/AnyTypeCode/LongSeqA.cpp index fdf7bc45be2..ac83fdac8db 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/LongSeqA.h" +#include "LongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/LongSeqA.h b/TAO/tao/AnyTypeCode/LongSeqA.h index 0d639f5719c..29beb356664 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -95,8 +93,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 22219d0a0e0..f3cab27779d 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -32,8 +32,6 @@ ACE_RCSID (tao, Marshal, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Marshal_Object::~TAO_Marshal_Object (void) { } @@ -257,4 +255,3 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 6232bc5f87d..94e98d86f81 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,8 +27,6 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -449,8 +447,6 @@ private: CORBA::Boolean nested_processing_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/Marshal.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl index 9c632873b55..8b78849a003 100644 --- a/TAO/tao/AnyTypeCode/Marshal.inl +++ b/TAO/tao/AnyTypeCode/Marshal.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Marshal_Object::TAO_Marshal_Object (void) { @@ -79,5 +75,3 @@ TAO_Marshal_Value::TAO_Marshal_Value (void) : nested_processing_ (0) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp index 345f3034f92..6d77541a020 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/Messaging_PolicyValueA.h" +#include "Messaging_PolicyValueA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -41,8 +41,6 @@ #include "tao/AnyTypeCode/Policy_ForwardA.h" #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -240,5 +238,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h index ea8e563befd..f6d5e0d7474 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { // TAO_IDL - Generated from @@ -110,8 +108,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Mes // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index b07e186305c..dcc9e9ec042 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -3,11 +3,11 @@ // Implementation of Named Value List and NamedValue classes -#include "tao/AnyTypeCode/NVList.h" -#include "tao/AnyTypeCode/BoundsC.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Marshal.h" -#include "tao/AnyTypeCode/Any_Impl.h" +#include "NVList.h" +#include "BoundsC.h" +#include "TypeCode.h" +#include "Marshal.h" +#include "Any_Impl.h" #include "tao/SystemException.h" #include "tao/CORBA_String.h" @@ -18,15 +18,13 @@ #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -# include "tao/AnyTypeCode/NVList.inl" +# include "NVList.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, NVList, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Reference counting for DII Request object CORBA::ULong @@ -82,7 +80,7 @@ CORBA::NVList::~NVList (void) for (iter.first (); !iter.done (); iter.advance ()) { - CORBA::NamedValue_ptr *nv = 0; + CORBA::NamedValue_ptr *nv; (void) iter.next (nv); delete *nv; } @@ -362,7 +360,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (arg))); + ACE_TEXT_TO_TCHAR_IN (arg))); } CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode (); (void) TAO_Marshal_Object::perform_append (tc, @@ -415,7 +413,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, for (i.first (); !i.done (); i.advance ()) { - CORBA::NamedValue_ptr *item = 0; + CORBA::NamedValue_ptr *item; (void) i.next (item); CORBA::NamedValue_ptr nv = *item; @@ -433,7 +431,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" ))); + ACE_TEXT_TO_TCHAR_IN (nv->name ()? nv->name () : "(no name given)" ))); } CORBA::Any_ptr any = nv->value (); @@ -498,4 +496,3 @@ CORBA::NVList::_lazy_has_arguments (void) const } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 0b73c17576c..0b7cf469847 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -33,8 +33,6 @@ #include "ace/Atomic_Op.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_InputCDR; @@ -303,8 +301,6 @@ namespace CORBA }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/NVList.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index e89db0e4dfb..035279feaf6 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::NamedValue_ptr nv) { @@ -126,5 +124,3 @@ CORBA::NVList::_nil (void) { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index 7ed8cb3d983..212a10a3dbf 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -9,8 +9,6 @@ ACE_RCSID (AnyTypeCode, #include "tao/AnyTypeCode/NVList.h" #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_NVList_Adapter_Impl::create_list ( CORBA::Long count, @@ -70,8 +68,6 @@ TAO_NVList_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl, ACE_TEXT ("TAO_NVList_Adapter"), ACE_SVC_OBJ_T, @@ -79,3 +75,5 @@ ACE_STATIC_SVC_DEFINE (TAO_NVList_Adapter_Impl, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl) + + diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index e24ebd357c5..60593941e08 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,8 +24,6 @@ #include "tao/NVList_Adapter.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_NVList_Adapter */ @@ -46,14 +44,13 @@ public: static int Initializer (void); }; -static int TAO_Requires_NVList_Adapter_Impl_Initializer = - TAO_NVList_Adapter_Impl::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_NVList_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_AnyTypeCode, TAO_NVList_Adapter_Impl) +static int +TAO_Requires_NVList_Adapter_Impl_Initializer = + TAO_NVList_Adapter_Impl::Initializer (); + #include /**/ "ace/post.h" #endif /* TAO_NVLIST_ADAPTER_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 8a39b8e9c52..9206227ec0d 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -24,10 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -77,8 +73,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NULL_REFCOUNT_POLICY_H */ diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp index 5e1c5439010..409a8b0e341 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp @@ -25,15 +25,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ObjectIdListA.h" +#include "ObjectIdListA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -100,5 +98,3 @@ namespace CORBA &_tao_tc_CORBA_ORB_ObjectIdList; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.h b/TAO/tao/AnyTypeCode/ObjectIdListA.h index 50fc249bcf3..1fedb3c212a 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.h +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -89,8 +87,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index c897143e4dc..bf53f06da69 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -10,11 +10,9 @@ #endif /* !__ACE_INLINE__ */ #include "tao/CDR.h" -#include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class RefCountPolicy> bool @@ -152,6 +150,4 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i ( return this->attributes_.name (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_OBJREF_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 8444669513a..0e2a0e03f3a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -32,8 +32,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -106,7 +104,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Objref_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl index fa8f28d1808..e40aa1e10d9 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, class RefCountPolicy> ACE_INLINE @@ -15,5 +14,3 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref ( , attributes_ (id, name) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index dc3605222a6..69a540da1f0 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -18,7 +18,6 @@ ACE_RCSID (tao, Objref_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal ( @@ -148,4 +147,3 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( return this->attributes_.name (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index f67bb980e66..f12217caef9 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -110,7 +108,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Objref_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl index 6673159051b..07c5d36ece2 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( @@ -14,5 +13,3 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( , attributes_ (id, name) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp index dd6b7864968..66b18534bb1 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.cpp +++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/OctetSeqA.h" +#include "OctetSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h index 8b94976cb20..159132d2448 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.h +++ b/TAO/tao/AnyTypeCode/OctetSeqA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp index fe43b76ce42..6d4394780cf 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/PI_ForwardA.h" +#include "PI_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/OctetSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -197,4 +195,3 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h index f99092e4ec1..70124737301 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.h +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h @@ -65,8 +65,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -178,8 +176,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.cpp b/TAO/tao/AnyTypeCode/ParameterModeA.cpp index b4a65bb1787..7eeaa86618c 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.cpp +++ b/TAO/tao/AnyTypeCode/ParameterModeA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ParameterModeA.h" +#include "ParameterModeA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -91,5 +89,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.h b/TAO/tao/AnyTypeCode/ParameterModeA.h index 91bb04bd510..85dbb46597e 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.h +++ b/TAO/tao/AnyTypeCode/ParameterModeA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { // TAO_IDL - Generated from @@ -92,8 +90,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Pa // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 9d49724bc2f..0594672bf8f 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/PolicyA.h" +#include "PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -39,8 +39,6 @@ #include "tao/AnyTypeCode/UShortSeqA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -557,5 +555,3 @@ operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h index ed2c78d1e3a..feae0030ce9 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.h +++ b/TAO/tao/AnyTypeCode/PolicyA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -142,8 +140,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Po // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp index 93e73bc4856..aae38186b03 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/Policy_ForwardA.h" +#include "Policy_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -331,5 +329,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.h b/TAO/tao/AnyTypeCode/Policy_ForwardA.h index 7626097a3b9..88c0b82f339 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.h +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.h @@ -37,7 +37,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Policy_ForwardC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -99,8 +98,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType); TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp index 166de771bb6..0ffe043ddbe 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/PortableInterceptorA.h" +#include "PortableInterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.h b/TAO/tao/AnyTypeCode/PortableInterceptorA.h index 4de58d5653e..e257fccb813 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -52,8 +50,6 @@ namespace PortableInterceptor } // module PortableInterceptor -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp index db48e1583f7..a96abe13a0b 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp @@ -1,13 +1,12 @@ // $Id$ + #include "tao/CDR.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType> bool TAO::TypeCode::Recursive_Type<TypeCodeBase, @@ -137,5 +136,3 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, return (cdr << indirection_kind); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 027100bb476..08b0025560c 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -18,11 +18,9 @@ #include /**/ "ace/pre.h" +#include "ace/Recursive_Thread_Mutex.h" #include "tao/Basic_Types.h" #include "tao/Typecode_typesC.h" -#include "ace/Recursive_Thread_Mutex.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -200,8 +198,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl index efd9091a125..7f7a5ea6fe8 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType> ACE_INLINE TAO::TypeCode::Recursive_Type<TypeCodeBase, @@ -149,5 +147,3 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, this->fields_ = fields; this->nfields_ = nfields; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h index ac0be52fc3b..fd9a09754c5 100644 --- a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h +++ b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h @@ -24,9 +24,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Null_RefCount_Policy; @@ -104,8 +101,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REFCOUNT_POLICY_TRAITS_H */ diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index 76016fe93fe..a3b7c2e458c 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -11,7 +11,6 @@ # include "tao/AnyTypeCode/Sequence_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename TypeCodeType, class RefCountPolicy> bool @@ -145,6 +144,5 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i ( Traits<TypeCodeType>::get_typecode (this->content_type_)); } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_SEQUENCE_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 3b8cd242ade..555511402c0 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -23,9 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -118,7 +115,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Sequence_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl index 27de6a56926..81e7add5646 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename TypeCodeType, class RefCountPolicy> ACE_INLINE TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence ( @@ -23,5 +21,3 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence ( { // ACE_ASSERT (kind == CORBA::tk_array || kind == CORBA::tk_sequence); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index e967f69c096..d0ab50e8dde 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -13,7 +13,6 @@ ACE_RCSID (tao, Sequence_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, @@ -146,5 +145,3 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode::_duplicate ( Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 7c3d4746fbc..7975d403192 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -116,7 +115,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Sequence_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl index b433031f883..27e98729656 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::Sequence ( @@ -16,5 +14,3 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, , length_ (length) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ServicesA.cpp b/TAO/tao/AnyTypeCode/ServicesA.cpp index 0030c4e2c44..2fa2316ff53 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.cpp +++ b/TAO/tao/AnyTypeCode/ServicesA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ServicesA.h" +#include "ServicesA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -518,5 +516,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ServicesA.h b/TAO/tao/AnyTypeCode/ServicesA.h index 7a422b3358a..87b6aca143f 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.h +++ b/TAO/tao/AnyTypeCode/ServicesA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -123,8 +121,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.cpp b/TAO/tao/AnyTypeCode/ShortSeqA.cpp index f876b863891..ed70a459f81 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ShortSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ShortSeqA.h" +#include "ShortSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.h b/TAO/tao/AnyTypeCode/ShortSeqA.h index 5c450473eb1..f3f6f53c485 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.h +++ b/TAO/tao/AnyTypeCode/ShortSeqA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/StringSeqA.cpp b/TAO/tao/AnyTypeCode/StringSeqA.cpp index 1016edf61df..df52b396d70 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/StringSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/StringSeqA.h" +#include "StringSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -143,5 +141,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/StringSeqA.h b/TAO/tao/AnyTypeCode/StringSeqA.h index c26b6c77dee..a97892b5181 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.h +++ b/TAO/tao/AnyTypeCode/StringSeqA.h @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // no TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index bae404af34e..8542fc7ce99 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -10,7 +10,6 @@ # include "tao/AnyTypeCode/String_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class RefCountPolicy> bool @@ -88,6 +87,5 @@ TAO::TypeCode::String<RefCountPolicy>::length_i ( return this->length_; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_STRING_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 86a7270f12b..628e251c491 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -95,8 +93,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/String_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.inl b/TAO/tao/AnyTypeCode/String_TypeCode.inl index 2f5fb0b6487..90e8e887c3b 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind, @@ -14,5 +12,3 @@ TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind, { // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 60783babaec..a0817ca8c31 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -13,8 +13,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal ( TAO_OutputCDR & cdr, @@ -84,5 +82,3 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( { return this->length_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 8911843a9ee..9bd90692793 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -98,8 +97,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/String_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl index 726d9242f8e..4d42413daa1 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String ( CORBA::TCKind kind, @@ -14,5 +12,3 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String ( { // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h index 670e6a835ba..14287963745 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h @@ -28,9 +28,6 @@ #include "tao/AnyTypeCode/String_TypeCode.h" #include "tao/AnyTypeCode/True_RefCount_Policy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCodeFactory @@ -74,7 +71,6 @@ namespace TAO } // End namespace TypeCodeFactory } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index aa50e7bdf78..65ad7720597 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -17,7 +17,6 @@ #include "ace/Dynamic_Service.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -344,6 +343,4 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (this->fields_[index].type)); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_STRUCT_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index df44f2d2a3a..dc356f07447 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -27,7 +27,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -138,7 +137,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Struct_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl index ad95ae544fa..eb3da52ae7e 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -46,5 +45,3 @@ TAO::TypeCode::Struct<StringType, // CORBA::tk_except is not allowed in the recursive TypeCode case. // ACE_ASSERT (kind == CORBA::tk_struct); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 8228c5de001..41211b42d25 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -20,8 +20,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -316,5 +314,3 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode::_duplicate ( Traits<char const *>::get_typecode (this->fields_[index].type)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index dea9405238b..b923b4c9917 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -28,7 +28,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -143,7 +142,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Struct_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl index d17483fe23f..f32a858b845 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCode::Struct<char const *, @@ -22,5 +21,3 @@ TAO::TypeCode::Struct<char const *, , fields_ (fields) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index c11f3984ef3..44271253ab5 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "tao/AnyTypeCode/SystemExceptionA.h" -#include "tao/AnyTypeCode/Any_SystemException.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Enum_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "SystemExceptionA.h" +#include "Any_SystemException.h" +#include "Any_Dual_Impl_T.h" +#include "TypeCode.h" +#include "TypeCode_Constants.h" +#include "Enum_TypeCode_Static.h" +#include "TypeCode_Struct_Field.h" +#include "Struct_TypeCode_Static.h" +#include "Null_RefCount_Policy.h" #include "tao/CORBA_String.h" @@ -16,12 +16,9 @@ ACE_RCSID (tao, SystemExceptionA, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ // List of standard/system exceptions ... used to create static // storage for their typecodes. @@ -181,5 +178,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &any, \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.h b/TAO/tao/AnyTypeCode/SystemExceptionA.h index b6ca62d2e55..75fc6dfd459 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.h +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.h @@ -20,8 +20,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -84,8 +82,6 @@ namespace CORBA } // End CORBA namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SYSTEMEXCEPTIONA_H */ diff --git a/TAO/tao/AnyTypeCode/TAOA.cpp b/TAO/tao/AnyTypeCode/TAOA.cpp index cf036da5c50..4230f001fc7 100644 --- a/TAO/tao/AnyTypeCode/TAOA.cpp +++ b/TAO/tao/AnyTypeCode/TAOA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/TAOA.h" +#include "TAOA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -37,8 +37,6 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -164,5 +162,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TAOA.h b/TAO/tao/AnyTypeCode/TAOA.h index 1a68c91f64b..131c8b6eff0 100644 --- a/TAO/tao/AnyTypeCode/TAOA.h +++ b/TAO/tao/AnyTypeCode/TAOA.h @@ -43,8 +43,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -76,8 +74,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint* TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h index e0d8853654d..b66ae8db4d2 100644 --- a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h +++ b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h @@ -1,20 +1,113 @@ // -*- C++ -*- -// ------------------------------------------------------------- +//============================================================================= /** - * @file TC_Constants_Forward.h + * @file TC_Constants_Forward.h * - * $Id$ + * $Id$ * - * Backward compatibility header. + * Forward declare the type code constants used in the ORB. * - * @deprecated Use TypeCode_Constants.h instead. + * @author Jeff Parsons */ -// ------------------------------------------------------------- +//============================================================================= #ifndef TAO_TC_CONSTANTS_FORWARD_H #define TAO_TC_CONSTANTS_FORWARD_H -#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include /**/ "ace/pre.h" -#endif /* TAO_TC_CONSTANTS_FORWARD_H */ +#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" + +namespace CORBA +{ + class TypeCode; + typedef TypeCode *TypeCode_ptr; + + /** + * @name TypeCode Constants + * + * All the TypeCode constants + */ + //@{ + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_null; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_void; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_short; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_long; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ushort; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ulong; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_float; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_double; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_boolean; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_char; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_octet; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_any; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_TypeCode; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Principal; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Object; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_string; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_longlong; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ulonglong; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_longdouble; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_wchar; + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_wstring; + +#define TAO_SYSTEM_EXCEPTION_LIST \ + TAO_SYSTEM_EXCEPTION(UNKNOWN); \ + TAO_SYSTEM_EXCEPTION(BAD_PARAM); \ + TAO_SYSTEM_EXCEPTION(NO_MEMORY); \ + TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \ + TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \ + TAO_SYSTEM_EXCEPTION(INV_OBJREF); \ + TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \ + TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \ + TAO_SYSTEM_EXCEPTION(INTERNAL); \ + TAO_SYSTEM_EXCEPTION(MARSHAL); \ + TAO_SYSTEM_EXCEPTION(INITIALIZE); \ + TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \ + TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \ + TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \ + TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \ + TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \ + TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \ + TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \ + TAO_SYSTEM_EXCEPTION(TRANSIENT); \ + TAO_SYSTEM_EXCEPTION(FREE_MEM); \ + TAO_SYSTEM_EXCEPTION(INV_IDENT); \ + TAO_SYSTEM_EXCEPTION(INV_FLAG); \ + TAO_SYSTEM_EXCEPTION(INTF_REPOS); \ + TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \ + TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \ + TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \ + TAO_SYSTEM_EXCEPTION(INV_POLICY); \ + TAO_SYSTEM_EXCEPTION(REBIND); \ + TAO_SYSTEM_EXCEPTION(TIMEOUT); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \ + TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \ + TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \ + TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \ + TAO_SYSTEM_EXCEPTION(BAD_QOS); \ + TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \ + TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \ + TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \ + TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); + + // = Typecode constants for system exceptions. +#define TAO_SYSTEM_EXCEPTION(name) \ + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ ## name + TAO_SYSTEM_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + //@} + + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_UnknownUserException; + + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Current; + + extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_NamedValue; +} + +#include /**/ "ace/post.h" + +#endif /* TAO_TC_CONSTANTS_FORWARD_H */ diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.cpp b/TAO/tao/AnyTypeCode/TimeBaseA.cpp index 1cb54f59417..444c8d69f0a 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.cpp +++ b/TAO/tao/AnyTypeCode/TimeBaseA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/TimeBaseA.h" +#include "TimeBaseA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -271,5 +269,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.h b/TAO/tao/AnyTypeCode/TimeBaseA.h index c18a4a4f8d2..c75cc8715c4 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.h +++ b/TAO/tao/AnyTypeCode/TimeBaseA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TimeBase { @@ -123,8 +121,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Tim // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 2c7190d82bf..3b5b3fab354 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/AnyTypeCode/True_RefCount_Policy.h" +#include "True_RefCount_Policy.h" #ifndef __ACE_INLINE__ # include "True_RefCount_Policy.inl" @@ -11,10 +11,7 @@ ACE_RCSID (tao, True_RefCount_Policy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::True_RefCount_Policy::~True_RefCount_Policy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index 6bef507fae0..89035c00f47 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -29,8 +29,6 @@ #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -108,7 +106,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/True_RefCount_Policy.inl" diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl index db9631237de..87b1b1b9159 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::True_RefCount_Policy::True_RefCount_Policy (void) @@ -24,5 +23,3 @@ TAO::True_RefCount_Policy::remove_ref (void) if (new_count == 0) delete this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 4af8e87ee16..a84b422f4b0 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/AnyTypeCode/TypeCode.h" +#include "TypeCode.h" ACE_RCSID (tao, TypeCode, @@ -8,7 +8,7 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "tao/AnyTypeCode/TypeCode.inl" +# include "TypeCode.inl" #endif /* ! __ACE_INLINE__ */ #include "tao/SystemException.h" @@ -18,7 +18,6 @@ ACE_RCSID (tao, #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::TypeCode::~TypeCode (void) { @@ -333,7 +332,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex) CORBA::Exception * CORBA::TypeCode::BadKind::_tao_duplicate (void) const { - CORBA::Exception *result = 0; + CORBA::Exception *result; ACE_NEW_RETURN (result, CORBA::TypeCode::BadKind (*this), 0); @@ -486,4 +485,3 @@ TAO::unaliased_kind (CORBA::TypeCode_ptr tc return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index 93edd808684..dd9a6d7b2bb 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -42,8 +42,6 @@ #endif #define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var; @@ -581,7 +579,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/AnyTypeCode/TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index eb044d6641f..64cd68fe7c1 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -4,8 +4,6 @@ #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::TypeCode_ptr obj) { @@ -158,5 +156,3 @@ CORBA::TypeCode::_tao_any_destructor (void * x) CORBA::release (static_cast <CORBA::TypeCode_ptr> (x)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCodeA.cpp b/TAO/tao/AnyTypeCode/TypeCodeA.cpp index aa229493ecc..6ff09fdf2cc 100644 --- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp +++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "Struct_TypeCode_Static.h" +#include "Null_RefCount_Policy.h" ACE_RCSID (tao, @@ -9,8 +9,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -59,5 +57,3 @@ CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_BadKind = CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_Bounds = &TAO::TypeCode::tc_Bounds; - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 03740852534..4771d75d95b 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -21,10 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCode @@ -81,7 +77,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Base_Attributes.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl index 915e4ed9411..d94e65040a6 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl @@ -4,7 +4,6 @@ #include "tao/AnyTypeCode/TypeCode_Traits.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename STRING_TYPE> ACE_INLINE @@ -50,5 +49,3 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name) this->name_ = the_name; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index 769d6760258..3ad634f15a7 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -1,38 +1,35 @@ // $Id$ -#include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h" +#include "TypeCode_CDR_Extraction.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/True_RefCount_Policy.h" +#include "TypeCode_Constants.h" +#include "True_RefCount_Policy.h" -#include "tao/AnyTypeCode/Alias_TypeCode.h" -#include "tao/AnyTypeCode/Enum_TypeCode.h" -#include "tao/AnyTypeCode/Fixed_TypeCode.h" -#include "tao/AnyTypeCode/Objref_TypeCode.h" -#include "tao/AnyTypeCode/Sequence_TypeCode.h" -#include "tao/AnyTypeCode/String_TypeCode.h" -#include "tao/AnyTypeCode/Struct_TypeCode.h" -#include "tao/AnyTypeCode/Union_TypeCode.h" -#include "tao/AnyTypeCode/Value_TypeCode.h" -#include "tao/AnyTypeCode/Any.h" +#include "Alias_TypeCode.h" +#include "Enum_TypeCode.h" +#include "Fixed_TypeCode.h" +#include "Objref_TypeCode.h" +#include "Sequence_TypeCode.h" +#include "String_TypeCode.h" +#include "Struct_TypeCode.h" +#include "Union_TypeCode.h" +#include "Value_TypeCode.h" -#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" +#include "Recursive_Type_TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Case_T.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/AnyTypeCode/TypeCode_Value_Field.h" +#include "TypeCode_Case_T.h" +#include "TypeCode_Struct_Field.h" +#include "TypeCode_Value_Field.h" #include "tao/CDR.h" #include "ace/Array_Base.h" -#include "ace/Value_Ptr.h" ACE_RCSID (tao, TypeCode_CDR_Extraction, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -105,7 +102,7 @@ namespace TAO::TypeCodeFactory::TC_Info_List & infos); bool find_recursive_tc (char const * id, - TAO::TypeCodeFactory::TC_Info_List & tcs, + CORBA::TypeCode_ptr & tc, TAO::TypeCodeFactory::TC_Info_List & infos) { // See comments above for rationale behind using an array instead @@ -119,18 +116,12 @@ namespace if (ACE_OS::strcmp (info.id, id) == 0) { - // We have a mathing id, so store the typecode in the out array - // and then compare the others. - size_t const old_size = tcs.size (); - if (tcs.size (old_size + 1) == -1) // Incremental growth -- *sigh* - return false; - - TAO::TypeCodeFactory::TC_Info & new_info = tcs[old_size]; - new_info.type = info.type; + tc = info.type; + return true; } } - return (tcs.size () > 0) ; + return false; } } @@ -415,8 +406,7 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind, // Check if struct TypeCode is recursive. - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, infos)) + if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos)) { // Set remaining parameters. @@ -425,23 +415,14 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind, member_array_type> recursive_typecode_type; - size_t const len = recursive_tc.size (); - - for (size_t i = 0; i < len; ++i) - { - TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i]; - - recursive_typecode_type * const rtc = - dynamic_cast<recursive_typecode_type *> (info.type); + recursive_typecode_type * const rtc = + dynamic_cast<recursive_typecode_type *> (tc); - ACE_ASSERT (rtc); + ACE_ASSERT (rtc); - rtc->struct_parameters (name.in (), - fields, - nfields); - } - - tc = recursive_tc[0].type; + rtc->struct_parameters (name.in (), + fields, + nfields); } else { @@ -512,7 +493,7 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, { elem_type & member = cases[i]; - TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case = 0; + TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case; // Ugly. *sigh* switch (discriminant_kind) @@ -663,9 +644,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, case_array_type, TAO::True_RefCount_Policy> typecode_type; - // Check if we have recursive members, this could be multiple - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) + // Check if union TypeCode is recursive. + if (find_recursive_tc (id.in (), tc, infos)) { // Set remaining parameters. @@ -674,25 +654,16 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, case_array_type> recursive_typecode_type; - size_t const len = recursive_tc.size (); - - for (size_t i = 0; i < len; ++i) - { - TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i]; - - recursive_typecode_type * const rtc = - dynamic_cast<recursive_typecode_type *> (info.type); + recursive_typecode_type * const rtc = + dynamic_cast<recursive_typecode_type *> (tc); - ACE_ASSERT (rtc); + ACE_ASSERT (rtc); - rtc->union_parameters (name.in (), - discriminant_type, - cases, // Will be copied. - ncases, - default_index); - } - - tc = recursive_tc[0].type; + rtc->union_parameters (name.in (), + discriminant_type, + cases, // Will be copied. + ncases, + default_index); } else { @@ -1019,8 +990,7 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind, TAO::True_RefCount_Policy> typecode_type; // Check if valuetype/eventtype TypeCode is recursive. - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) + if (find_recursive_tc (id.in (), tc, infos)) { // Set remaining parameters. @@ -1029,24 +999,16 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind, member_array_type> recursive_typecode_type; - size_t const len = recursive_tc.size (); - - for (size_t i = 0; i < len; ++i) - { - TAO::TypeCodeFactory::TC_Info & info = recursive_tc[i]; - - recursive_typecode_type * const rtc = - dynamic_cast<recursive_typecode_type *> (info.type); + recursive_typecode_type * const rtc = + dynamic_cast<recursive_typecode_type *> (tc); - ACE_ASSERT (rtc); + ACE_ASSERT (rtc); - rtc->valuetype_parameters (name.in (), - type_modifier, - concrete_base, - fields, // Will be copied. - nfields); - } - tc = recursive_tc[0].type; + rtc->valuetype_parameters (name.in (), + type_modifier, + concrete_base, + fields, // Will be copied. + nfields); } else { @@ -1258,132 +1220,94 @@ namespace // Don't bother demarshaling the rest of the parameters. They will // be handled by the top-level TypeCode demarshaling call. - bool new_tc = false; switch (kind) { case CORBA::tk_struct: { - // Check if we already have a tc for this type, if yes, use that - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) - { - tc = recursive_tc[0].type; - } - else - { - new_tc = true; - - typedef ACE_Array_Base< - TAO::TypeCode::Struct_Field< - CORBA::String_var, - CORBA::TypeCode_var> > member_array_type; - - typedef TAO::TypeCode::Struct< - CORBA::String_var, - CORBA::TypeCode_var, - member_array_type, - TAO::True_RefCount_Policy> typecode_type; - - typedef TAO::TypeCode::Recursive_Type<typecode_type, - CORBA::TypeCode_var, - member_array_type> - recursive_typecode_type; - - ACE_NEW_RETURN (tc, - recursive_typecode_type (kind, - id.in ()), - false); - } + typedef ACE_Array_Base< + TAO::TypeCode::Struct_Field< + CORBA::String_var, + CORBA::TypeCode_var> > member_array_type; + + typedef TAO::TypeCode::Struct< + CORBA::String_var, + CORBA::TypeCode_var, + member_array_type, + TAO::True_RefCount_Policy> typecode_type; + + typedef TAO::TypeCode::Recursive_Type<typecode_type, + CORBA::TypeCode_var, + member_array_type> + recursive_typecode_type; + + ACE_NEW_RETURN (tc, + recursive_typecode_type (kind, + id.in ()), + false); } break; case CORBA::tk_union: { - // Check if we already have a tc for this type, if yes, use that - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) - { - tc = recursive_tc[0].type; - } - else - { - new_tc = true; - - typedef union_case_array_type member_array_type; - - typedef TAO::TypeCode::Union< - CORBA::String_var, - CORBA::TypeCode_var, - member_array_type, - TAO::True_RefCount_Policy> typecode_type; - - typedef TAO::TypeCode::Recursive_Type<typecode_type, - CORBA::TypeCode_var, - member_array_type> - recursive_typecode_type; - - ACE_NEW_RETURN (tc, - recursive_typecode_type (kind, - id.in ()), - false); - } + typedef union_case_array_type member_array_type; + + typedef TAO::TypeCode::Union< + CORBA::String_var, + CORBA::TypeCode_var, + member_array_type, + TAO::True_RefCount_Policy> typecode_type; + + typedef TAO::TypeCode::Recursive_Type<typecode_type, + CORBA::TypeCode_var, + member_array_type> + recursive_typecode_type; + + ACE_NEW_RETURN (tc, + recursive_typecode_type (kind, + id.in ()), + false); } break; case CORBA::tk_value: case CORBA::tk_event: { - // Check if we already have a tc for this type, if yes, use that - TAO::TypeCodeFactory::TC_Info_List recursive_tc; - if (find_recursive_tc (id.in (), recursive_tc, infos)) - { - tc = recursive_tc[0].type; - } - else - { - new_tc = true; - - typedef ACE_Array_Base< - TAO::TypeCode::Value_Field< - CORBA::String_var, - CORBA::TypeCode_var> > member_array_type; - - typedef TAO::TypeCode::Value< - CORBA::String_var, - CORBA::TypeCode_var, - member_array_type, - TAO::True_RefCount_Policy> typecode_type; - - typedef TAO::TypeCode::Recursive_Type<typecode_type, - CORBA::TypeCode_var, - member_array_type> - recursive_typecode_type; - - ACE_NEW_RETURN (tc, - recursive_typecode_type (kind, - id.in ()), - false); - } + typedef ACE_Array_Base< + TAO::TypeCode::Value_Field< + CORBA::String_var, + CORBA::TypeCode_var> > member_array_type; + + typedef TAO::TypeCode::Value< + CORBA::String_var, + CORBA::TypeCode_var, + member_array_type, + TAO::True_RefCount_Policy> typecode_type; + + typedef TAO::TypeCode::Recursive_Type<typecode_type, + CORBA::TypeCode_var, + member_array_type> + recursive_typecode_type; + + ACE_NEW_RETURN (tc, + recursive_typecode_type (kind, + id.in ()), + false); } break; default: return false; // We should never get here. }; - // Only when we created a new tc add it to the list. - if (new_tc) - { - size_t const old_size = infos.size (); - if (infos.size (old_size + 1) == -1) // Incremental growth -- *sigh* - return false; + size_t const old_size = infos.size (); + if (infos.size (old_size + 1) == -1) // Incremental growth -- *sigh* + return false; - TAO::TypeCodeFactory::TC_Info & info = infos[old_size]; + TAO::TypeCodeFactory::TC_Info & info = infos[old_size]; - ACE_DECLARE_NEW_CORBA_ENV; - info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); // Should never throw! + ACE_DECLARE_NEW_CORBA_ENV; + info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (false); // Should never throw! - info.type = tc; - } + info.type = tc; return true; } @@ -1399,5 +1323,3 @@ operator>> (TAO_InputCDR & cdr, return tc_demarshal (cdr, tc, infos); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h index 0e6d6015c97..b7571fbfbf4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h @@ -23,11 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <class T> class ACE_Array_Base; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +template <class T> class ACE_Array_Base; namespace TAO { @@ -193,7 +190,6 @@ namespace TAO } // End namespace TypeCodeFactory } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 67edee2d6b8..9ed73f48bc8 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -3,14 +3,13 @@ #ifndef TAO_TYPECODE_CASE_CPP #define TAO_TYPECODE_CASE_CPP -#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" +#include "TypeCode_Case_Base_T.h" #include "ace/OS_NS_string.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType> TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void) @@ -84,6 +83,4 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_TYPECODE_CASE_CPP */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 638051bcb6a..2a646e7724a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -23,7 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -168,9 +167,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { @@ -188,9 +184,7 @@ namespace ACE } }; -} // End namespace ACE. - -ACE_END_VERSIONED_NAMESPACE_DECL +} // End namespace ACE namespace. #ifdef __ACE_INLINE__ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index 4bd6b4f8a79..bf992fde3f3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -5,7 +5,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/TypeCode_Traits.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType> ACE_INLINE @@ -75,5 +74,3 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::type (CORBA::TypeCode_ptr tc) // case. this->type_ = CORBA::TypeCode::_duplicate (tc); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index fc7533e98ae..579f968fd12 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_TYPECODE_CASE_T_CPP #define TAO_TYPECODE_CASE_T_CPP -#include "tao/AnyTypeCode/TypeCode_Case_T.h" +#include "TypeCode_Case_T.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" @@ -13,7 +13,6 @@ # include "tao/AnyTypeCode/TypeCode_Case_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -144,7 +143,7 @@ TAO::TypeCode::Case_T<DiscriminatorType, StringType, TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const { - CORBA::Any * value = 0; + CORBA::Any * value; ACE_NEW_THROW_EX (value, CORBA::Any, @@ -159,6 +158,5 @@ TAO::TypeCode::Case_T<DiscriminatorType, return safe_value._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_TYPECODE_CASE_T_CPP */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index c0cff25b880..516127d0054 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -128,7 +127,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/TypeCode_Case_T.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl index f95b599c795..b6ac33bd18e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename DiscriminatorType, typename StringType, typename TypeCodeType> @@ -30,5 +27,3 @@ TAO::TypeCode::Case_T<DiscriminatorType, , label_ (member_label) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp index eb9bd81746b..fe6b46d2c1f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "TypeCode_Constants.h" ACE_RCSID (tao, @@ -9,12 +9,11 @@ ACE_RCSID (tao, "$Id$") -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/Empty_Param_TypeCode.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/String_TypeCode_Static.h" +#include "Null_RefCount_Policy.h" +#include "Empty_Param_TypeCode.h" +#include "Objref_TypeCode_Static.h" +#include "String_TypeCode_Static.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -110,5 +109,3 @@ namespace CORBA TypeCode_ptr const _tc_Home = &TAO::TypeCode::tc_Home; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.h b/TAO/tao/AnyTypeCode/TypeCode_Constants.h index 2aea3471df7..8b057ace36d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.h @@ -21,10 +21,6 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -62,63 +58,8 @@ namespace CORBA extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Component; extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Home; //@} - -#define TAO_SYSTEM_EXCEPTION_LIST \ - TAO_SYSTEM_EXCEPTION(UNKNOWN); \ - TAO_SYSTEM_EXCEPTION(BAD_PARAM); \ - TAO_SYSTEM_EXCEPTION(NO_MEMORY); \ - TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \ - TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \ - TAO_SYSTEM_EXCEPTION(INV_OBJREF); \ - TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \ - TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \ - TAO_SYSTEM_EXCEPTION(INTERNAL); \ - TAO_SYSTEM_EXCEPTION(MARSHAL); \ - TAO_SYSTEM_EXCEPTION(INITIALIZE); \ - TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \ - TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \ - TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \ - TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \ - TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \ - TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \ - TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \ - TAO_SYSTEM_EXCEPTION(TRANSIENT); \ - TAO_SYSTEM_EXCEPTION(FREE_MEM); \ - TAO_SYSTEM_EXCEPTION(INV_IDENT); \ - TAO_SYSTEM_EXCEPTION(INV_FLAG); \ - TAO_SYSTEM_EXCEPTION(INTF_REPOS); \ - TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \ - TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \ - TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \ - TAO_SYSTEM_EXCEPTION(INV_POLICY); \ - TAO_SYSTEM_EXCEPTION(REBIND); \ - TAO_SYSTEM_EXCEPTION(TIMEOUT); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \ - TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \ - TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \ - TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \ - TAO_SYSTEM_EXCEPTION(BAD_QOS); \ - TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \ - TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \ - TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \ - TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); - - // = Typecode constants for system exceptions. -#define TAO_SYSTEM_EXCEPTION(name) \ - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_ ## name - TAO_SYSTEM_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - //@} - - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_Current; - - extern TAO_AnyTypeCode_Export TypeCode_ptr const _tc_NamedValue; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TYPECODE_CONSTANTS_H */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h index 1a3d8c9deb4..ad1fb0b35c2 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h @@ -24,7 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -84,7 +83,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Traits.h b/TAO/tao/AnyTypeCode/TypeCode_Traits.h index 7c1fe02b47e..921f00717e8 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Null_RefCount_Policy; @@ -119,7 +117,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h index c421189f0f5..7fbfcb20501 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h @@ -23,7 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -86,7 +85,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp index 5773812563a..d77d9b59c07 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ULongLongSeqA.h" +#include "ULongLongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.h b/TAO/tao/AnyTypeCode/ULongLongSeqA.h index 65fb4366d8f..0d5ca2d7bd9 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.h @@ -37,8 +37,6 @@ #include "tao/ULongLongSeqC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::ULongLongSeq*); TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::ULongLongSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongSeqA.cpp index 7acfbea8976..f48c8306497 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ULongSeqA.h" +#include "ULongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.h b/TAO/tao/AnyTypeCode/ULongSeqA.h index ed4eac48536..f093cec9617 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongSeqA.h @@ -38,8 +38,6 @@ #include "tao/ULongSeqC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -64,8 +62,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // non TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp index 582d15d69d0..8150d15bef7 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/UShortSeqA.h" +#include "UShortSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h index 824246509de..59de79c234c 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.h +++ b/TAO/tao/AnyTypeCode/UShortSeqA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -95,8 +93,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 25aba5c6340..c88e8ec1236 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -3,19 +3,18 @@ #ifndef TAO_UNION_TYPECODE_CPP #define TAO_UNION_TYPECODE_CPP -#include "tao/AnyTypeCode/Union_TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" +#include "Union_TypeCode.h" +#include "TypeCode_Case_Base_T.h" #ifndef __ACE_INLINE__ -# include "tao/AnyTypeCode/Union_TypeCode.inl" +# include "Union_TypeCode.inl" #endif /* !__ACE_INLINE__ */ #include "tao/SystemException.h" -#include "tao/AnyTypeCode/Any.h" +#include "Any.h" #include "ace/Value_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -58,22 +57,11 @@ TAO::TypeCode::Union<StringType, if (!success) return false; - offset += enc.total_length (); - for (CORBA::ULong i = 0; i < this->ncases_; ++i) { - TAO_OutputCDR case_enc; - offset = ACE_align_binary (offset, - ACE_CDR::LONG_ALIGN); - case_type const & c = *this->cases_[i]; - if (!c.marshal (case_enc, offset)) - return false; - - offset += case_enc.total_length (); - - if (!enc.write_octet_array_mb (case_enc.begin ())) + if (!c.marshal (enc, offset + enc.total_length ())) return false; } @@ -127,28 +115,28 @@ TAO::TypeCode::Union<StringType, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -167,13 +155,13 @@ TAO::TypeCode::Union<StringType, lhs_case.equal (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_case) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -193,27 +181,27 @@ TAO::TypeCode::Union<StringType, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_discriminators = Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -232,13 +220,13 @@ TAO::TypeCode::Union<StringType, lhs_case.equivalent (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_case) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -407,7 +395,7 @@ TAO::TypeCode::Union<StringType, if (this->default_index_ > -1 && static_cast<CORBA::ULong> (this->default_index_) == index) { - CORBA::Any * any = 0; + CORBA::Any * any; ACE_NEW_THROW_EX (any, CORBA::Any, CORBA::NO_MEMORY ()); @@ -458,6 +446,4 @@ TAO::TypeCode::Union<StringType, return this->default_index_; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_UNION_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 8089aeea48f..92117ba92fd 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -25,7 +25,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -161,8 +160,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Union_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.inl b/TAO/tao/AnyTypeCode/Union_TypeCode.inl index 28ac14d3537..84dfb32fa0b 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename StringType, typename TypeCodeType, class CaseArrayType, @@ -55,5 +53,3 @@ TAO::TypeCode::Union<StringType, , cases_ () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index 2d5677d317e..714b16cfa96 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -13,13 +13,11 @@ #include "ace/Value_Ptr.h" -ACE_RCSID (AnyTypeCode, +ACE_RCSID (tao, Union_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - bool TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, @@ -58,23 +56,13 @@ TAO::TypeCode::Union<char const *, if (!success) return false; - offset += enc.total_length (); - // Note that we handle the default case below, too. - for (CORBA::ULong i = 0; i < this->ncases_; ++i) + for (unsigned int i = 0; i < this->ncases_; ++i) { - TAO_OutputCDR case_enc; - offset = ACE_align_binary (offset, - ACE_CDR::LONG_ALIGN); case_type const & c = *this->cases_[i]; - if (!c.marshal (case_enc, offset)) - return false; - - offset += case_enc.total_length (); - - if (!enc.write_octet_array_mb (case_enc.begin ())) + if (!c.marshal (enc, offset + enc.total_length ())) return false; } @@ -117,28 +105,28 @@ TAO::TypeCode::Union<char const *, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; // Check the discriminator type. CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_discriminators = Traits<char const *>::get_typecode (this->discriminant_type_)->equal ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -157,13 +145,13 @@ TAO::TypeCode::Union<char const *, lhs_case.equal (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_case) - return false; + return 0; } - return true; + return 1; } CORBA::Boolean @@ -180,27 +168,27 @@ TAO::TypeCode::Union<char const *, CORBA::ULong const tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_count != this->ncases_ || tc_def != this->default_index_) - return false; + return 0; CORBA::TypeCode_var tc_discriminator = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_discriminators = Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent ( tc_discriminator.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_discriminators) - return false; + return 0; for (CORBA::ULong i = 0; i < this->ncases_; ++i) { @@ -219,13 +207,13 @@ TAO::TypeCode::Union<char const *, lhs_case.equivalent (i, tc ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_case) - return false; + return 0; } - return true; + return 1; } CORBA::TypeCode_ptr @@ -418,5 +406,3 @@ TAO::TypeCode::Union<char const *, { return this->default_index_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index bf58345e03f..b0a507ca168 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -26,7 +26,6 @@ #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -160,7 +159,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Union_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl index 4398e2a0a62..019a8ba2a2f 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, @@ -25,5 +23,3 @@ TAO::TypeCode::Union<char const *, , cases_ (cases) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl index 2887587dddd..4cd346c5049 100644 --- a/TAO/tao/AnyTypeCode/ValueModifier.pidl +++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * ValueModifier.pidl */ // ================================================================ diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.cpp b/TAO/tao/AnyTypeCode/ValueModifierA.cpp index 5f23127315a..0a93f94dc26 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/ValueModifierA.h" +#include "ValueModifierA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" @@ -33,8 +33,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -54,4 +52,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.h b/TAO/tao/AnyTypeCode/ValueModifierA.h index ff165ad8eda..479dc4c4052 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.h +++ b/TAO/tao/AnyTypeCode/ValueModifierA.h @@ -58,8 +58,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -82,8 +80,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.cpp b/TAO/tao/AnyTypeCode/ValueModifierC.cpp index 9606aaf3d1b..76644c8b3c0 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/ValueModifierC.h" +#include "ValueModifierC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,11 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.h b/TAO/tao/AnyTypeCode/ValueModifierC.h index 424e4e3b61b..2bfe5a25b4e 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.h +++ b/TAO/tao/AnyTypeCode/ValueModifierC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -108,8 +106,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 8955d4be01b..4be37413b75 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -16,7 +16,6 @@ # include "tao/AnyTypeCode/Value_TypeCode.inl" #endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -125,29 +124,29 @@ TAO::TypeCode::Value<StringType, CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_concrete_base_types) - return false; + return 0; CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -158,37 +157,37 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; char const * const lhs_name = Traits<StringType>::get_string (lhs_field.name);; char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_members) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -205,32 +204,32 @@ TAO::TypeCode::Value<StringType, { CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equivalent_concrete_base_types = this->equivalent (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_concrete_base_types) - return false; + return 0; // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -242,28 +241,28 @@ TAO::TypeCode::Value<StringType, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_types) - return false; + return 0; } - return true; + return 1; } template <typename StringType, @@ -460,6 +459,5 @@ TAO::TypeCode::Value<StringType, Traits<StringType>::get_typecode (this->concrete_base_)); } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_VALUE_TYPECODE_CPP */ diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index ffc18532e6f..2578a304b53 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -28,7 +28,6 @@ #include "tao/AnyTypeCode/ValueModifierC.h" #include "tao/AnyTypeCode/VisibilityC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -161,7 +160,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Value_TypeCode.inl" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.inl b/TAO/tao/AnyTypeCode/Value_TypeCode.inl index 6a63efab53e..9a8b31f0ddb 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename StringType, typename TypeCodeType, @@ -56,5 +55,3 @@ TAO::TypeCode::Value<StringType, , fields_ () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index c222edfa947..369aeae045c 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -18,7 +18,6 @@ ACE_RCSID (tao, Value_TypeCode_Static, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCode::Value<char const *, @@ -116,29 +115,29 @@ TAO::TypeCode::Value<char const *, CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_concrete_base_types = this->equal (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_concrete_base_types) - return false; + return 0; CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -149,37 +148,37 @@ TAO::TypeCode::Value<char const *, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; char const * const lhs_name = Traits<char const *>::get_string (lhs_field.name);; char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equal_members) - return false; + return 0; } - return true; + return 1; } CORBA::Boolean @@ -193,32 +192,32 @@ TAO::TypeCode::Value<char const *, { CORBA::ValueModifier const tc_type_modifier = tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_type_modifier != this->type_modifier_) - return false; + return 0; CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equivalent_concrete_base_types = this->equivalent (rhs_concrete_base_type.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equivalent_concrete_base_types) - return false; + return 0; // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (tc_nfields != this->nfields_) - return false; + return 0; for (CORBA::ULong i = 0; i < this->nfields_; ++i) { @@ -231,28 +230,28 @@ TAO::TypeCode::Value<char const *, CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (lhs_visibility != rhs_visibility) - return false; + return 0; CORBA::TypeCode_ptr const lhs_tc = Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ACE_CHECK_RETURN (0); if (!equiv_types) - return false; + return 0; } - return true; + return 1; } CORBA::TypeCode_ptr @@ -421,5 +420,3 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode::_duplicate ( Traits<char const *>::get_typecode (this->concrete_base_)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index 57ba318ab03..9db721919f5 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -29,7 +29,6 @@ #include "tao/AnyTypeCode/VisibilityC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -159,7 +158,6 @@ namespace TAO } // End namespace TypeCode } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/AnyTypeCode/Value_TypeCode_Static.inl" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl index 3341e18053f..70c7d6cf1b1 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, @@ -26,5 +24,3 @@ TAO::TypeCode::Value<char const *, , fields_ (fields) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl index 715b312bdf1..44cece777a3 100644 --- a/TAO/tao/AnyTypeCode/Visibility.pidl +++ b/TAO/tao/AnyTypeCode/Visibility.pidl @@ -15,8 +15,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Visibilty.pidl */ // ================================================================ diff --git a/TAO/tao/AnyTypeCode/VisibilityA.cpp b/TAO/tao/AnyTypeCode/VisibilityA.cpp index ce31b456908..95ae55adc13 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityA.cpp @@ -25,15 +25,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/VisibilityA.h" +#include "VisibilityA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -53,4 +51,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/VisibilityA.h b/TAO/tao/AnyTypeCode/VisibilityA.h index c791d479e08..04f9ebde904 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.h +++ b/TAO/tao/AnyTypeCode/VisibilityA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -84,8 +82,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/VisibilityC.cpp b/TAO/tao/AnyTypeCode/VisibilityC.cpp index d8c674edc02..76f74d94f2f 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/AnyTypeCode/VisibilityC.h" +#include "VisibilityC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,11 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/VisibilityC.h b/TAO/tao/AnyTypeCode/VisibilityC.h index 4f6e607ba23..124188ba2f7 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.h +++ b/TAO/tao/AnyTypeCode/VisibilityC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -98,8 +96,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.cpp b/TAO/tao/AnyTypeCode/WCharSeqA.cpp index 978836022a6..c8d8ecee99d 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WCharSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/WCharSeqA.h" +#include "WCharSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,8 +34,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -142,5 +140,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.h b/TAO/tao/AnyTypeCode/WCharSeqA.h index 8935210cc23..ab57e949bdd 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.h +++ b/TAO/tao/AnyTypeCode/WCharSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WCharSeq*); // TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WCharSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WCharSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.cpp b/TAO/tao/AnyTypeCode/WStringSeqA.cpp index f3f468704e4..41067661a25 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WStringSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/WStringSeqA.h" +#include "WStringSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -143,5 +141,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.h b/TAO/tao/AnyTypeCode/WStringSeqA.h index b9357c80326..9f01c462bc2 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.h +++ b/TAO/tao/AnyTypeCode/WStringSeqA.h @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -63,8 +61,6 @@ TAO_AnyTypeCode_Export void operator<<= ( ::CORBA::Any &, CORBA::WStringSeq*); / TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CORBA::WStringSeq *&); // deprecated TAO_AnyTypeCode_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const CORBA::WStringSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 9c6fd0a62f2..7b37a76f712 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/WrongTransactionA.h" +#include "WrongTransactionA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -147,5 +145,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h index 745c0aa5f39..08bce947959 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.h +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -95,8 +93,6 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const COR // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 36a8721fa7d..bb14170a683 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -38,8 +38,6 @@ ACE_RCSID (tao, append, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Encode instances of arbitrary data types based only on typecode. // "data" points to the data type; if it's not a primitve data type, // the TypeCode interpreter is used to recursively encode its @@ -415,13 +413,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... - CORBA::Short short_v = CORBA::Short(); - CORBA::UShort ushort_v = CORBA::UShort(); - CORBA::Long long_v = CORBA::Long(); - CORBA::ULong ulong_v = CORBA::ULong(); - CORBA::ULong enum_v = CORBA::ULong(); - CORBA::Char char_v = CORBA::Char(); - CORBA::WChar wchar_v = CORBA::WChar(); + CORBA::Short short_v; + CORBA::UShort ushort_v; + CORBA::Long long_v; + CORBA::ULong ulong_v; + CORBA::ULong enum_v; + CORBA::Char char_v; + CORBA::WChar wchar_v; CORBA::Boolean boolean_v = false; switch (kind) @@ -1321,5 +1319,3 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/orb_typesA.cpp b/TAO/tao/AnyTypeCode/orb_typesA.cpp index e1967ebdfd8..92c9bc9bc46 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.cpp +++ b/TAO/tao/AnyTypeCode/orb_typesA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/AnyTypeCode/orb_typesA.h" +#include "orb_typesA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -33,8 +33,6 @@ #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -114,4 +112,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/orb_typesA.h b/TAO/tao/AnyTypeCode/orb_typesA.h index 84b2fcc5c0f..1585e465596 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.h +++ b/TAO/tao/AnyTypeCode/orb_typesA.h @@ -37,7 +37,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orb_typesC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -70,8 +69,6 @@ namespace CORBA } // module CORBA -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index dcad0cb9c3f..31fd7a14552 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -19,10 +19,10 @@ // // ============================================================================ -#include "tao/AnyTypeCode/Marshal.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" -#include "tao/AnyTypeCode/Any.h" +#include "Marshal.h" +#include "TypeCode.h" +#include "Any_Unknown_IDL_Type.h" +#include "Any.h" #include "tao/debug.h" #include "tao/Valuetype_Adapter.h" @@ -36,14 +36,12 @@ ACE_RCSID (tao, skip, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // Status of skip operation. TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE; @@ -88,7 +86,8 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, retval = TAO::TRAVERSE_STOP; // we are not a primitive type } - if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping) + if (retval == TAO::TRAVERSE_CONTINUE + && continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -125,7 +124,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // Typecode kind. CORBA::ULong kind; @@ -133,7 +132,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, // Decode the "kind" field of the typecode from the stream. continue_skipping = stream->read_ulong (kind); - if (continue_skipping) + if (continue_skipping == 1) { // Typecodes with empty parameter lists all have preallocated // constants. We use those to reduce memory consumption and @@ -206,7 +205,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, } } - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -226,7 +225,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // specifies the number of bytes in the Principal CORBA::ULong len; @@ -237,7 +236,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, continue_skipping = stream->skip_bytes (len); } - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -257,7 +256,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // return status TAO::traverse_status retval = @@ -299,7 +298,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, continue_skipping = stream->skip_bytes (encap_len); } - if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping) + if (retval == TAO::TRAVERSE_CONTINUE + && continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -366,15 +366,15 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... - CORBA::Short short_v = CORBA::Short(); - CORBA::UShort ushort_v = CORBA::UShort(); - CORBA::Long long_v = CORBA::Long(); - CORBA::ULong ulong_v = CORBA::ULong(); - CORBA::ULong enum_v = CORBA::ULong(); - CORBA::Char char_v = CORBA::Char(); - CORBA::WChar wchar_v = CORBA::WChar(); - CORBA::Boolean boolean_v = false; - + CORBA::Short short_v; + CORBA::UShort ushort_v; + CORBA::Long long_v; + CORBA::ULong ulong_v; + CORBA::ULong enum_v; + CORBA::Char char_v; + CORBA::WChar wchar_v; + CORBA::Boolean boolean_v = false;; + switch (kind) { case CORBA::tk_short: @@ -600,7 +600,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // On decode, omit the check against specified string bounds, and // cope with illegal "zero length" strings (all lengths on the wire @@ -611,7 +611,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, // but we will accept them when it's clear how to do so. continue_skipping = stream->skip_string (); - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; else { @@ -708,7 +708,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, break; default: - while (bounds-- && continue_skipping) + while (bounds-- && continue_skipping == 1) { continue_skipping = TAO_Marshal_Object::perform_skip (tc2.in (), @@ -736,7 +736,8 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; + // retrieve the bounds of the array CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -799,7 +800,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, break; default: - while (bounds-- && continue_skipping) + while (bounds-- && continue_skipping == 1) { int stop = TAO_Marshal_Object::perform_skip (tc2.in (), @@ -807,7 +808,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); if (stop == TAO::TRAVERSE_STOP) - continue_skipping = false; + continue_skipping = 0; } break; }// end of switch @@ -831,7 +832,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, { // Typecode of the aliased type. CORBA::TypeCode_var tc2; - CORBA::Boolean continue_skipping = true; + CORBA::Boolean continue_skipping = 1; // Status of decode operation. TAO::traverse_status retval = @@ -847,7 +848,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, // tc2->_decr_refcnt (); if (retval == TAO::TRAVERSE_CONTINUE - && continue_skipping) + && continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) @@ -915,7 +916,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, TAO_InputCDR *stream ACE_ENV_ARG_DECL) { - CORBA::Boolean continue_skipping = true; + ACE_CDR::Boolean continue_skipping = 1; // On decode, omit the check against specified wstring bounds, and // cope with illegal "zero length" strings (all lengths on the wire @@ -929,7 +930,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, continue_skipping = stream->skip_wstring (); - if (continue_skipping) + if (continue_skipping == 1) return TAO::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) @@ -1039,5 +1040,3 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp index d9da63d780f..ef7e0adf569 100644 --- a/TAO/tao/AnyTypeCode_Adapter.cpp +++ b/TAO/tao/AnyTypeCode_Adapter.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/AnyTypeCode_Adapter.h" @@ -6,10 +6,7 @@ ACE_RCSID (tao, TAO_AnyTypeCode_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index 9fd002af542..5050a148c32 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -27,8 +27,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -115,18 +113,6 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, CORBA::Short value) = 0; - virtual void insert_into_any (CORBA::Any * any, CORBA::UShort value) = 0; - - virtual void insert_into_any (CORBA::Any * any, CORBA::Float value) = 0; - - virtual void insert_into_any (CORBA::Any * any, CORBA::Double value) = 0; - - virtual void insert_into_any (CORBA::Any * any, CORBA::LongLong value) = 0; - - virtual void insert_into_any (CORBA::Any * any, CORBA::ULongLong value) = 0; - - virtual void insert_into_any (CORBA::Any * any, CORBA::LongDouble value) = 0; - virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value) = 0; virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value) = 0; @@ -136,7 +122,5 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANYTYPECODE_ADAPTER */ diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h index df79cbbc1f9..48b71281704 100644 --- a/TAO/tao/Any_Insert_Policy_T.h +++ b/TAO/tao/Any_Insert_Policy_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -26,12 +26,9 @@ #include "tao/AnyTypeCode_Adapter.h" #include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" #include "tao/debug.h" #include "tao/IFR_Client_Adapter.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { template <typename S> @@ -113,8 +110,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_ANY_INSERT_POLICY_H */ diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h index f71e79b2f27..e384db4a2ad 100644 --- a/TAO/tao/Arg_Traits_T.h +++ b/TAO/tao/Arg_Traits_T.h @@ -19,8 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -34,8 +32,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ARG_TRAITS_T_H */ diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp index d1819d1cc51..98e0861d980 100644 --- a/TAO/tao/Argument.cpp +++ b/TAO/tao/Argument.cpp @@ -3,8 +3,6 @@ #include "tao/Argument.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Argument::~Argument (void) { } @@ -54,4 +52,4 @@ TAO::RetArgument::mode (void) const #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index cbaee13f83d..edad3568278 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -6,8 +6,7 @@ * * $Id$ * - * @author Jeff Parsons - * @author Carlos O'Ryan + * @authors Jeff Parsons and Carlos O'Ryan */ //============================================================================= @@ -27,8 +26,6 @@ #include "tao/TAO_Export.h" #include "tao/ParameterModeC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -126,8 +123,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ARGUMENT_H */ diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index 712ee76a20a..63093981053 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_ARRAY_VAROUT_T_CPP -#define TAO_ARRAY_VAROUT_T_CPP +#ifndef TAO_ARRAY_VAROUT_T_C +#define TAO_ARRAY_VAROUT_T_C #include "tao/Array_VarOut_T.h" @@ -9,8 +9,9 @@ #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Array_VarOut_T, + "$Id$") template<typename T, typename T_slice, typename TAG> TAO_FixedArray_Var_T<T,T_slice,TAG> & @@ -90,6 +91,4 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor ( TAO::Array_Traits<T,T_slice,TAG>::free (tmp); } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ARRAY_VAROUT_T_CPP */ +#endif /* TAO_ARRAY_VAROUT_T_C */ diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 3a923436eba..f2e07430c24 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -172,7 +170,7 @@ class TAO_Array_Forany_T public: TAO_Array_Forany_T (void); TAO_Array_Forany_T (T_slice *, - CORBA::Boolean nocopy = false); + CORBA::Boolean nocopy = 0); TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &); ~TAO_Array_Forany_T (void); @@ -200,11 +198,9 @@ public: static T_slice * tao_alloc (void); private: T_slice * ptr_; - CORBA::Boolean nocopy_; + const CORBA::Boolean nocopy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index 13c9f923572..f0837b64e71 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -2,8 +2,6 @@ // //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (void) @@ -245,7 +243,7 @@ template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void) : ptr_ (0), - nocopy_ (false) + nocopy_ (0) {} template<typename T, typename T_slice, typename TAG> @@ -349,7 +347,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const { // @@@ (JP) This looks scary I know but it helps MSVC understand // things better when the array is multi-dimensional. -#if (defined (_MSC_VER) && _MSC_VER <= 1200) +#if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600)) // @@ (OO) MSVC++ 6 can't handle the const_cast<> in the // multi-dimensional array case so reinterpret_cast<> cast // instead. It's not clear if this is really the right @@ -358,22 +356,9 @@ TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const // C-style "sledgehammer" cast to make it obvious that this // code may have unresolved issues, and also to make it // easier for others to find this code. - // @@ (RLS) It is not the const_cast<> that VC6 can't handle, it is - // just confused. The ptr_ is seen as int (* const) and - // the desired type is const int *. const_cast<> is used - // to cast away const'ness and it does on VC6, yeilding - // int * where const int * is desired, and specifically - // directing the user to use either a reinterpret_cast<> - // or a C-style cast. - // @@ (RLS) The IBM compiler was complaining about a bad cast only. - // return const_cast<const T_slice *> (this->ptr_); - // It is perfectly happy with the #else part below, as - // is every other compiler I've tried it on. return reinterpret_cast<const T_slice *> (this->ptr_); #else - // This should work on all platforms. If a platform fails that it is - // that compiler that's wrong, not everyone else. RLS - return (this->ptr_); + return const_cast<const T_slice *> (this->ptr_); #endif /* _MSC_VER <= 1200 */ } @@ -424,5 +409,3 @@ TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void) { return TAO::Array_Traits<T,T_slice,TAG>::alloc (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 74412e8db1a..0f10cddbe1f 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -1,6 +1,6 @@ -#include "tao/Asynch_Queued_Message.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" +#include "Asynch_Queued_Message.h" +#include "debug.h" +#include "ORB_Core.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" @@ -14,7 +14,6 @@ ACE_RCSID (tao, Asynch_Queued_Message, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Asynch_Queued_Message::TAO_Asynch_Queued_Message ( const ACE_Message_Block *contents, @@ -182,5 +181,3 @@ TAO_Asynch_Queued_Message::destroy (void) } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h index 99c2ddf2718..9b40397caa0 100644 --- a/TAO/tao/Asynch_Queued_Message.h +++ b/TAO/tao/Asynch_Queued_Message.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Asynch_Queued_Message * @@ -99,7 +97,5 @@ private: char *buffer_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ASYNCH_QUEUED_MESSAGE_H */ diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp index 1f01eca39f6..3fdcb0239aa 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -14,8 +14,6 @@ ACE_RCSID (tao, Asynch_Reply_Dispatcher_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base ( TAO_ORB_Core *orb_core, @@ -146,5 +144,3 @@ TAO_Asynch_Reply_Dispatcher_Base::try_dispatch_reply (void) return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index 671c188a325..ea4c156ba22 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** * @file Asynch_Reply_Dispatcher_Base.h @@ -25,17 +24,13 @@ #include "tao/IOP_IORC.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_Pluggable_Reply_Params; +class TAO_ORB_Core ; class ACE_Time_Value; +class TAO_Transport; class ACE_Lock; class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_Pluggable_Reply_Params; -class TAO_ORB_Core; -class TAO_Transport; /** * @class TAO_Asynch_Reply_Dispatcher_Base * @@ -161,8 +156,6 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Asynch_Reply_Dispatcher_Base.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.i b/TAO/tao/Asynch_Reply_Dispatcher_Base.i index c63371d74a4..af9c34d4242 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.i +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE void @@ -14,5 +10,3 @@ namespace TAO (void) ardb->decr_refcount (); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Auto_Functor.h b/TAO/tao/Auto_Functor.h index a764aea0e3d..3fc7a857e5a 100644 --- a/TAO/tao/Auto_Functor.h +++ b/TAO/tao/Auto_Functor.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file Auto_Functor.h @@ -21,8 +20,6 @@ #include "ace/Auto_Functor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Utils @@ -33,7 +30,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_AUTO_FUNCTOR_H*/ diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index 4e9e4d2201c..2734394a30f 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_BD_STRING_ARGUMENT_T_CPP -#define TAO_BD_STRING_ARGUMENT_T_CPP +#ifndef TAO_BD_STRING_ARGUMENT_T_C +#define TAO_BD_STRING_ARGUMENT_T_C #include "tao/BD_String_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/BD_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + BD_String_Argument_T, + "$Id$") template<typename S, typename to_S, @@ -151,6 +153,4 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::intercep #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_BD_STRING_ARGUMENT_T_CPP */ +#endif /* TAO_BD_STRING_ARGUMENT_T_C */ diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 7c73638e991..7a2fdc4eddd 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -25,8 +25,6 @@ #include "tao/Argument.h" #include "tao/Any_Insert_Policy_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -200,8 +198,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/BD_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index d222489a42c..a21a1e227b7 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename to_S, typename from_S, @@ -133,4 +129,3 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::arg (voi return this->x_.out (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp index 121aea34b89..75b3d08349c 100644 --- a/TAO/tao/Base_Transport_Property.cpp +++ b/TAO/tao/Base_Transport_Property.cpp @@ -11,12 +11,11 @@ ACE_RCSID (tao, Base_Transport_Property, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Base_Transport_Property::~TAO_Base_Transport_Property (void) { } + TAO_Transport_Descriptor_Interface * TAO_Base_Transport_Property::duplicate (void) { @@ -54,5 +53,3 @@ TAO_Base_Transport_Property::hash (void) const { return this->endpoint_->hash (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h index 954c7e7bb83..b781ac40232 100644 --- a/TAO/tao/Base_Transport_Property.h +++ b/TAO/tao/Base_Transport_Property.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ // =================================================================== @@ -25,8 +24,6 @@ #include "tao/Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Base_Transport_Property * @@ -67,8 +64,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Base_Transport_Property.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl index 3c097130fd4..fa4bd7f6b19 100644 --- a/TAO/tao/Base_Transport_Property.inl +++ b/TAO/tao/Base_Transport_Property.inl @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Base_Transport_Property::TAO_Base_Transport_Property (void) { @@ -27,5 +24,3 @@ TAO_Base_Transport_Property::TAO_Base_Transport_Property ( { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp index ae34d1062d0..f798eb09887 100644 --- a/TAO/tao/Basic_Argument_T.cpp +++ b/TAO/tao/Basic_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_BASIC_ARGUMENT_T_CPP -#define TAO_BASIC_ARGUMENT_T_CPP +#ifndef TAO_BASIC_ARGUMENT_T_C +#define TAO_BASIC_ARGUMENT_T_C #include "tao/Basic_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Basic_Argument_T, + "$Id$") template<typename S, typename Insert_Policy> CORBA::Boolean @@ -96,6 +98,4 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_BASIC_ARGUMENT_T_CPP */ +#endif /* TAO_BASIC_ARGUMENT_T_C */ diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 8558ce45bf6..cc7bcb388b3 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -156,8 +154,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index c8df439d593..d11f01533bd 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> ACE_INLINE TAO::In_Basic_Argument_T<S, Insert_Policy>::In_Basic_Argument_T (S const & x) @@ -82,4 +78,3 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void) return this->x_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h index 81c0000ac90..155d66c651e 100644 --- a/TAO/tao/Basic_Arguments.h +++ b/TAO/tao/Basic_Arguments.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -25,8 +25,6 @@ #include "tao/Arg_Traits_T.h" #include "tao/Any_Insert_Policy_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -66,7 +64,7 @@ namespace TAO template<> class TAO_Export Arg_Traits<CORBA::UShort> - : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::UShort> > + : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> > { }; @@ -78,39 +76,37 @@ namespace TAO template<> class TAO_Export Arg_Traits<CORBA::Float> - : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Float> > + : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> > { }; template<> class TAO_Export Arg_Traits<CORBA::Double> - : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Double> > + : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> > { }; template<> class TAO_Export Arg_Traits<CORBA::LongLong> - : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongLong> > + : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> > { }; template<> class TAO_Export Arg_Traits<CORBA::ULongLong> : public Basic_Arg_Traits_T<CORBA::ULongLong, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULongLong> > + TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> > { }; template<> class TAO_Export Arg_Traits<CORBA::LongDouble> : public Basic_Arg_Traits_T<CORBA::LongDouble, - TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongDouble> > + TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> > { }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_BASIC_ARGUMENTS_H */ diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h index 5276a3e0ba6..b2d8d652926 100644 --- a/TAO/tao/Basic_Types.h +++ b/TAO/tao/Basic_Types.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,10 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { /** @@ -88,8 +84,6 @@ namespace CORBA class TAO_InputCDR; class TAO_OutputCDR; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_BASIC_TYPES_H */ diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp index b564942d5db..90b60d1b393 100644 --- a/TAO/tao/BiDir_Adapter.cpp +++ b/TAO/tao/BiDir_Adapter.cpp @@ -1,13 +1,10 @@ -// $Id$ +// @(#) $Id$ #include "tao/BiDir_Adapter.h" ACE_RCSID(tao, BiDir_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index fd5270b769c..ebf1e5675dc 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Policy_Validator; @@ -52,8 +50,5 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_BIDIR_ADAPTER_H */ diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index a4943a47b04..033371ec5bb 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -1,6 +1,6 @@ -#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h" -#include "tao/BiDir_GIOP/BiDirGIOP.h" -#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h" +#include "BiDir_ORBInitializer.h" +#include "BiDirGIOP.h" +#include "BiDirPolicy_Validator.h" #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/ORBInitializer_Registry.h" @@ -9,7 +9,6 @@ ACE_RCSID (BiDir_GIOP, BiDirGIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Set the flag to zero to start with int TAO_BiDirGIOP_Loader::is_activated_ = 0; @@ -59,7 +58,7 @@ TAO_BiDirGIOP_Loader::init (int, if (TAO_debug_level > 0) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + "(%P | %t) Caught exception:"); } return -1; } @@ -88,14 +87,12 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val CORBA::COMPLETED_NO)); ACE_CHECK; - // We may be adding another TAO_BiDirPolicy_Validator instance for - // the same ORB (different POA). In cases where huge numbers of - // bi-directional POA instances are created, having a validator - // instance per POA may introduce additional delays in policy - // validation and hence, the overal policy creation time. Since this - // is out of the critical invocation processing path, I plan to keep - // the design simple and not try to avoid an ineficiency of such - // small proportions. + // We may be adding another TAO_BiDirPolicy_Validator instance for the + // same ORB (different POA). In cases where huge numbers of bi-directional POA instances + // are created, having a validator instance per POA may introduce additional delays in + // policy validation and hence, the overal policy creation time. Since this is out of the + // critical invocation processing path, I plan to keep the design simple and not try to + // avoid an ineficiency of such small proportions. val.add_validator (validator); } @@ -105,8 +102,6 @@ TAO_BiDirGIOP_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_BiDirGIOP_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader, ACE_TEXT ("BiDirGIOP_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index c1cafd48fa3..643bca38dc6 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file BiDirGIOP.h @@ -17,7 +16,7 @@ #define TAO_BIDIR_GIOP_H #include /**/ "ace/pre.h" -#include "tao/BiDir_GIOP/bidirgiop_export.h" +#include "bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -26,8 +25,6 @@ #include "tao/BiDir_Adapter.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_BiDirPolicy_Validator; /** @@ -64,17 +61,14 @@ private: static int is_activated_; }; -static int -TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader) ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) +static int +TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); #define TAO_BIDIRGIOP_SAFE_INCLUDE -#include "tao/BiDir_GIOP/BiDirPolicyC.h" +#include "BiDirPolicyC.h" #undef TAO_BIDIRGIOP_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl index 876d32946fa..6659b56951d 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl @@ -10,8 +10,6 @@ // -Wb,export_include="bidirgiop_export.h" \ // -Wb,pre_include="ace/pre.h" \ // -Wb,post_include="ace/post.h" \ -// -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ -// -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ // BiDirPolicy.pidl // // This is from the GIOP 1.2 spec for Bi Dir IIOP. @@ -21,7 +19,7 @@ #pragma prefix "omg.org" -#include "tao/Policy.pidl" +#include <Policy.pidl> // Self contained module for Bi-directional GIOP policy module BiDirPolicy diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 07fe0de4a78..93db9790b38 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "BiDirGIOP.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -184,5 +182,3 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index c1661c9c707..0baa3c73cee 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -43,7 +43,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/BiDir_GIOP/bidirgiop_export.h" +#include "bidirgiop_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -69,8 +69,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace BiDirPolicy { @@ -246,8 +244,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp index af719c05a24..8dcdeb2b341 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp @@ -1,14 +1,12 @@ -#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h" -#include "tao/BiDir_GIOP/BiDir_Policy_i.h" +#include "BiDirPolicy_Validator.h" +#include "BiDir_Policy_i.h" #include "tao/Policy_Set.h" #include "tao/ORB_Core.h" -ACE_RCSID (BiDir_GIOP, +ACE_RCSID (TAO, BiDirPolicy_Validator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core) { @@ -56,5 +54,3 @@ TAO_BiDirPolicy_Validator::legal_policy_impl (CORBA::PolicyType type) { return (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h index 106b1a834c8..a91220671d8 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file BiDirPolicy_Validator.h @@ -18,14 +16,13 @@ #define TAO_BIDIR_POLICY_VALIDATOR_H_ #include /**/ "ace/pre.h" -#include "tao/BiDir_GIOP/bidirgiop_export.h" +#include "bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Policy_Validator.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Policy_Set; class TAO_ORB_Core; @@ -36,6 +33,7 @@ class TAO_ORB_Core; * @brief Policy Validator for BiDir GIOP class * */ + class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator { public: @@ -50,9 +48,9 @@ public: virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type); -}; +private: -TAO_END_VERSIONED_NAMESPACE_DECL +}; #include /**/ "ace/post.h" #endif /* TAO_BIDIR_POLICY_VALIDATOR_H_ */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index 2aff9aa8432..ff26f0ca91f 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -1,8 +1,10 @@ +// -*- C++ -*- +// // $Id$ -#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h" -#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h" -#include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "BiDir_ORBInitializer.h" +#include "BiDir_PolicyFactory.h" +#include "BiDirGIOP.h" #include "tao/ORB_Constants.h" @@ -10,8 +12,6 @@ ACE_RCSID (BiDir_GIOP, BiDir_ORBInitializer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_BiDir_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -65,5 +65,3 @@ TAO_BiDir_ORBInitializer::register_policy_factories ( ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index b09a94da506..736f2b637f4 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "tao/BiDir_GIOP/bidirgiop_export.h" +#include "bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,12 +30,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Messaging ORB initializer. -class TAO_BiDir_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object +class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: @@ -56,8 +54,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index 98ef7218f99..248691a541a 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -1,6 +1,6 @@ -#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h" -#include "tao/BiDir_GIOP/BiDirGIOP.h" -#include "tao/BiDir_GIOP/BiDir_Policy_i.h" +#include "BiDir_PolicyFactory.h" +#include "BiDirGIOP.h" +#include "BiDir_Policy_i.h" #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/Any.h" @@ -9,8 +9,6 @@ ACE_RCSID (BiDir_GIOP, BiDir_PolicyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO_BiDir_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -48,5 +46,3 @@ TAO_BiDir_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index 9a4175257b5..cdce842dead 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "tao/BiDir_GIOP/bidirgiop_export.h" +#include "bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,16 +27,14 @@ // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) -# pragma warning(push) -# pragma warning(disable:4250) +#pragma warning(push) +#pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Policy factory for all Messaging related policies. -class TAO_BiDir_PolicyFactory - : public PortableInterceptor::PolicyFactory - , public TAO_Local_RefCounted_Object +class TAO_BiDirGIOP_Export TAO_BiDir_PolicyFactory : + public PortableInterceptor::PolicyFactory, + public TAO_Local_RefCounted_Object { public: @@ -45,13 +43,11 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); - }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) -# pragma warning(pop) +#pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 926dbcf223e..c301a8a7b53 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/BiDir_GIOP/BiDir_Policy_i.h" +#include "BiDir_Policy_i.h" #include "tao/Stub.h" #include "tao/debug.h" @@ -10,8 +10,6 @@ ACE_RCSID (TAO, BiDir_Policy_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_BidirectionalPolicy::TAO_BidirectionalPolicy ( const BiDirPolicy::BidirectionalPolicyValue val) : ACE_NESTED_CLASS (CORBA, Object) () @@ -33,6 +31,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy { } + CORBA::PolicyType TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -75,6 +74,7 @@ TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } + BiDirPolicy::BidirectionalPolicyValue TAO_BidirectionalPolicy::value ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -90,5 +90,3 @@ TAO_BidirectionalPolicy::_tao_cached_type (void) const { return TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 93ef62f6c19..1555b96dc9d 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -1,4 +1,6 @@ -// -*- C++ -*- +/* -*- C++ -*- */ +// $Id$ +// // =================================================================== /** @@ -13,22 +15,20 @@ #ifndef TAO_BIDIR_POLICY_I_H #define TAO_BIDIR_POLICY_I_H #include /**/ "ace/pre.h" -#include "tao/BiDir_GIOP/bidirgiop_export.h" +#include "bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "BiDirGIOP.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) -# pragma warning(push) -# pragma warning(disable:4250) +#pragma warning(push) +#pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_BidirectionalPolicy * @@ -38,11 +38,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * clients can be made bi-directional or not. Further, this policy * also needs to be set by the server to use the connections * established by the clients to send requests. + * */ -class TAO_BidirectionalPolicy - : public virtual BiDirPolicy::BidirectionalPolicy - , public virtual TAO_Local_RefCounted_Object + +class TAO_BiDirGIOP_Export TAO_BidirectionalPolicy + : public virtual BiDirPolicy::BidirectionalPolicy, + public virtual TAO_Local_RefCounted_Object { + public: /// Constructor. @@ -57,6 +60,7 @@ public: /// = The BiDir::BidirectionalPolicy methods virtual BiDirPolicy::BidirectionalPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); @@ -71,18 +75,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; - private: /// The attribute BiDirPolicy::BidirectionalPolicyValue value_; - }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) -# pragma warning(pop) +#pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Bind_Dispatcher_Guard.cpp b/TAO/tao/Bind_Dispatcher_Guard.cpp index c88d3af1783..9466a58fe3e 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.cpp +++ b/TAO/tao/Bind_Dispatcher_Guard.cpp @@ -11,8 +11,6 @@ ACE_RCSID (tao, Bind_Dispatcher_Guard, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Guard ( CORBA::ULong request_id, TAO_Reply_Dispatcher* rd, @@ -38,5 +36,3 @@ TAO_Bind_Dispatcher_Guard::~TAO_Bind_Dispatcher_Guard (void) if (this->status_ == TAO_Bind_Dispatcher_Guard::UNBIND) (void) this->tms_->unbind_dispatcher (this->request_id_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h index ae86b126b92..e4c992b8ab6 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.h +++ b/TAO/tao/Bind_Dispatcher_Guard.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** * @file Bind_Dispatcher_Guard.h @@ -19,8 +18,6 @@ #include "tao/Basic_Types.h" #include "tao/TAO_Export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Reply_Dispatcher; class TAO_Transport_Mux_Strategy; @@ -58,8 +55,6 @@ private: TAO_Transport_Mux_Strategy* tms_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Bind_Dispatcher_Guard.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Bind_Dispatcher_Guard.i b/TAO/tao/Bind_Dispatcher_Guard.i index f5ccc4a8d23..64bce7bf6f6 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.i +++ b/TAO/tao/Bind_Dispatcher_Guard.i @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +// This may look like C, but it's really -*- C++ -*- // $Id$ // =========================================================================== @@ -16,7 +15,6 @@ #include "tao/Reply_Dispatcher.h" #include "tao/Transport_Mux_Strategy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void TAO_Bind_Dispatcher_Guard::status (int s) @@ -42,5 +40,3 @@ TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void) return retval; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp index c56ecbe7ef0..96a6b3f12d1 100644 --- a/TAO/tao/Block_Flushing_Strategy.cpp +++ b/TAO/tao/Block_Flushing_Strategy.cpp @@ -1,13 +1,12 @@ +// -*- C++ -*- // $Id$ -#include "tao/Block_Flushing_Strategy.h" -#include "tao/Transport.h" -#include "tao/Queued_Message.h" +#include "Block_Flushing_Strategy.h" +#include "Transport.h" +#include "Queued_Message.h" ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Block_Flushing_Strategy::schedule_output (TAO_Transport *transport) { @@ -51,5 +50,3 @@ TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport) } return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h index 835b97755e7..4c917bc2671 100644 --- a/TAO/tao/Block_Flushing_Strategy.h +++ b/TAO/tao/Block_Flushing_Strategy.h @@ -14,14 +14,12 @@ #define TAO_BLOCK_FLUSHING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Flushing_Strategy.h" +#include "Flushing_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Block_Flushing_Strategy * @@ -38,7 +36,5 @@ public: virtual int flush_transport (TAO_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_BLOCK_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp index 9317a128679..a7d50c3d307 100644 --- a/TAO/tao/Blocked_Connect_Strategy.cpp +++ b/TAO/tao/Blocked_Connect_Strategy.cpp @@ -1,5 +1,5 @@ -#include "tao/Blocked_Connect_Strategy.h" -#include "tao/Connection_Handler.h" +#include "Blocked_Connect_Strategy.h" +#include "Connection_Handler.h" #include "ace/Synch_Options.h" @@ -7,7 +7,6 @@ ACE_RCSID(tao, Blocked_Connect_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Blocked_Connect_Strategy::TAO_Blocked_Connect_Strategy ( TAO_ORB_Core *orb_core) @@ -54,5 +53,3 @@ TAO_Blocked_Connect_Strategy::wait (TAO_Transport *, // We cannot wait for connection completion return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h index 9c547ebfc23..87016f0470f 100644 --- a/TAO/tao/Blocked_Connect_Strategy.h +++ b/TAO/tao/Blocked_Connect_Strategy.h @@ -14,14 +14,12 @@ #define TAO_BLOCKED_CONNECT_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Connect_Strategy.h" +#include "Connect_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Blocked_Connect_Strategy * @@ -29,10 +27,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * during connects * */ + class TAO_Export TAO_Blocked_Connect_Strategy : public TAO_Connect_Strategy { public: - /// Constructor + /// Contructor TAO_Blocked_Connect_Strategy (TAO_ORB_Core *orb); /// Destructor @@ -52,7 +51,6 @@ public: ACE_Time_Value *val); }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_BLOCKED_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index 1b8ef457532..94f67041501 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/BooleanSeqC.h" +#include "BooleanSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ void CORBA::BooleanSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h index 58218300078..61901510719 100644 --- a/TAO/tao/BooleanSeqC.h +++ b/TAO/tao/BooleanSeqC.h @@ -52,8 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -141,8 +139,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp index 52ae87f3c33..34a0aa19550 100644 --- a/TAO/tao/Buffer_Allocator_T.cpp +++ b/TAO/tao/Buffer_Allocator_T.cpp @@ -6,9 +6,6 @@ #include "tao/Buffer_Allocator_T.h" #include "ace/Global_Macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { template <typename handler_type, typename alloc_type> @@ -40,6 +37,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_BUFFER_ALLOCATOR_T_CPP */ diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index 3d29c153ac9..59684723965 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -21,8 +21,6 @@ #include "tao/Allocator.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -48,8 +46,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Buffer_Allocator_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 89c04ea640a..f3e97bfc0d3 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -4,8 +4,8 @@ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -#include "tao/TAOC.h" -#include "tao/SystemException.h" +#include "TAOC.h" +#include "SystemException.h" ACE_RCSID (tao, Buffering_Constraint_Policy, @@ -16,8 +16,6 @@ ACE_RCSID (tao, #include "tao/Buffering_Constraint_Policy.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint) : ACE_NESTED_CLASS (CORBA, Object) () , ACE_NESTED_CLASS (CORBA, Policy) () @@ -88,6 +86,4 @@ TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h index f6b336801cc..d94271eeca4 100644 --- a/TAO/tao/Buffering_Constraint_Policy.h +++ b/TAO/tao/Buffering_Constraint_Policy.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Buffering_Constraint_Policy.h @@ -31,8 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Buffering_Constraint_Policy * @@ -77,8 +74,6 @@ private: TAO::BufferingConstraint buffering_constraint_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Buffering_Constraint_Policy.i b/TAO/tao/Buffering_Constraint_Policy.i index 2176d0efc36..aa5203cb743 100644 --- a/TAO/tao/Buffering_Constraint_Policy.i +++ b/TAO/tao/Buffering_Constraint_Policy.i @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_Buffering_Constraint_Policy::get_buffering_constraint (TAO::BufferingConstraint &bc) const { bc = this->buffering_constraint_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index e738a4843ad..ccc993ff3b0 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -44,8 +44,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_CDR_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_OutputCDR::TAO_OutputCDR (size_t size, int byte_order, ACE_Allocator *buffer_allocator, @@ -231,11 +229,3 @@ TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) } } - -ACE_Message_Block::Message_Flags -TAO_InputCDR::clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ) -{ - return start_.clr_self_flags( less_flags ); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 27f28c82ac2..91ebea856a1 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** * @file CDR.h @@ -55,8 +54,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; namespace CORBA @@ -277,8 +274,6 @@ public: /// Accessor TAO_ORB_Core *orb_core (void) const; - ACE_Message_Block::Message_Flags - clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ); // = TAO specific methods. static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL); @@ -289,14 +284,10 @@ private: TAO_ORB_Core* orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) # include "tao/CDR.i" #else -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // CDR output operators for CORBA types TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, @@ -346,9 +337,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::Char* &x); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, CORBA::WChar* &x); - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* __ACE_INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i index a7dcf134c77..a4081309dc6 100644 --- a/TAO/tao/CDR.i +++ b/TAO/tao/CDR.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_OutputCDR::~TAO_OutputCDR (void) { @@ -288,5 +286,3 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, { return static_cast<ACE_InputCDR &> (is) >> x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl index 671887bff88..3f4684f6fb2 100644 --- a/TAO/tao/CONV_FRAME.pidl +++ b/TAO/tao/CONV_FRAME.pidl @@ -1,5 +1,3 @@ -// -*- IDL -*- - /** * @file CONV_FRAME.pidl * @@ -14,8 +12,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * CONV_FRAME.pidl * * The files are ready to use. diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 42f84796b58..11d54fd3b16 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:288 -#include "tao/CONV_FRAMEC.h" +#include "CONV_FRAMEC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -261,5 +259,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.char_data) && (strm >> _tao_aggregate.wchar_data); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index 8e76fe5ec34..798e0fa4261 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CONV_FRAME { @@ -258,8 +256,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 9192b99c8a4..ae210f857b9 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -1,10 +1,10 @@ -#include "tao/CORBALOC_Parser.h" -#include "tao/ORB_Core.h" -#include "tao/Stub.h" -#include "tao/MProfile.h" -#include "tao/Connector_Registry.h" -#include "tao/Transport_Connector.h" -#include "tao/Protocol_Factory.h" +#include "CORBALOC_Parser.h" +#include "ORB_Core.h" +#include "Stub.h" +#include "MProfile.h" +#include "Connector_Registry.h" +#include "Transport_Connector.h" +#include "Protocol_Factory.h" #include "tao/debug.h" #include "ace/Vector_T.h" #include "ace/INET_Addr.h" @@ -13,13 +13,17 @@ #include "ace/os_include/os_netdb.h" #if !defined(__ACE_INLINE__) -#include "tao/CORBALOC_Parser.i" +#include "CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, CORBALOC_Parser, "$Id$") +TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) +{ +} + static const char prefix[] = "corbaloc:"; static const size_t prefix_len = sizeof prefix - 1; static const char rir_token[] = "rir:"; @@ -27,12 +31,6 @@ static const size_t rir_token_len = sizeof rir_token - 1; static const char iiop_token[] = "iiop:"; static const char iiop_token_len = sizeof iiop_token - 1; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void) -{ -} - int TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const { @@ -180,7 +178,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, ACE_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("could not parse from %s"), - ACE_TEXT_CHAR_TO_TCHAR(ior))); + ACE_TEXT_TO_TCHAR_IN(ior))); ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO), CORBA::Object::_nil ()); @@ -212,7 +210,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, ACE_ERROR ((LM_ERROR, ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ") ACE_TEXT("could not parse from %s"), - ACE_TEXT_CHAR_TO_TCHAR(ior))); + ACE_TEXT_TO_TCHAR_IN(ior))); ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO), CORBA::Object::_nil ()); @@ -376,8 +374,6 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior, canonical_endpoint += raw_port; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser, ACE_TEXT ("CORBALOC_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index b9ecab51756..df1d73c4715 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -27,10 +27,9 @@ #include "tao/Profile.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_MProfile; + /** * @class TAO_CORBALOC_Parser * @@ -41,7 +40,7 @@ class TAO_MProfile; * string to separate the individual <obj_addr> from the list of object * addresses <obj_addr_list>. */ -class TAO_CORBALOC_Parser : public TAO_IOR_Parser +class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser { public: /// Constructor @@ -93,10 +92,8 @@ private: }; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/CORBALOC_Parser.i" +# include "CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser) diff --git a/TAO/tao/CORBALOC_Parser.i b/TAO/tao/CORBALOC_Parser.i index 53f39cf5a05..fddafd15c3f 100644 --- a/TAO/tao/CORBALOC_Parser.i +++ b/TAO/tao/CORBALOC_Parser.i @@ -1,16 +1,13 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_CORBALOC_Parser::TAO_CORBALOC_Parser (void) { } ACE_INLINE -TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint (void) +TAO_CORBALOC_Parser::parsed_endpoint::parsed_endpoint(void) : profile_ (0) { } @@ -21,5 +18,3 @@ TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void) if (this->profile_ != 0) this->profile_->_decr_refcnt(); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index bfc2eca66a7..649edfb1408 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -1,12 +1,16 @@ // $Id$ -#include "tao/CORBANAME_Parser.h" -#include "tao/ORB.h" -#include "tao/Object.h" -#include "tao/SystemException.h" -#include "tao/UB_String_Arguments.h" -#include "tao/Invocation_Adapter.h" -#include "tao/debug.h" +#include "CORBANAME_Parser.h" +#include "ORB.h" +#include "Object.h" +#include "SystemException.h" +#include "UB_String_Arguments.h" +#include "Invocation_Adapter.h" +#include "debug.h" + +#if !defined(__ACE_INLINE__) +#include "CORBANAME_Parser.i" +#endif /* __ACE_INLINE__ */ #include "ace/Log_Msg.h" #include "ace/SString.h" @@ -17,14 +21,13 @@ ACE_RCSID (tao, CORBANAME_Parser, "$Id$") -static const char corbaname_prefix[] = "corbaname:"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void) { } +static const char corbaname_prefix[] = "corbaname:"; + int TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const { @@ -155,8 +158,6 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser, ACE_TEXT ("CORBANAME_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index 9580d770885..5f1f66cf8db 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -24,8 +23,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_CORBANAME_Parser * @@ -36,9 +33,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * to a naming service at the given address and port and then resolve an * object in that context. */ -class TAO_CORBANAME_Parser : public TAO_IOR_Parser +class TAO_Export TAO_CORBANAME_Parser : public TAO_IOR_Parser { public: + /// Constructor + TAO_CORBANAME_Parser (void); /// The destructor virtual ~TAO_CORBANAME_Parser (void); @@ -59,7 +58,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__ACE_INLINE__) +# include "CORBANAME_Parser.i" +#endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser) ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser) diff --git a/TAO/tao/CORBANAME_Parser.i b/TAO/tao/CORBANAME_Parser.i new file mode 100644 index 00000000000..1139a868437 --- /dev/null +++ b/TAO/tao/CORBANAME_Parser.i @@ -0,0 +1,6 @@ +// $Id$ + +ACE_INLINE +TAO_CORBANAME_Parser::TAO_CORBANAME_Parser (void) +{ +} diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 583be67aded..6c49706b60b 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -1,5 +1,5 @@ -#include "tao/CORBA_String.h" -#include "tao/Managed_Types.h" +#include "CORBA_String.h" +#include "Managed_Types.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_wchar.h" @@ -16,8 +16,6 @@ ACE_RCSID (tao, CORBA_String, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - char * CORBA::string_dup (const char *str) { @@ -26,84 +24,66 @@ CORBA::string_dup (const char *str) errno = EINVAL; return 0; } + return ACE::String_Conversion::Convert_Out< char >( str ).c_str(); +} - const size_t len = ACE_OS::strlen (str); - - // This allocates an extra byte for the '\0'; - char * copy = CORBA::string_alloc (static_cast<CORBA::ULong> (len)); - - // The memcpy() below assumes that the destination is a valid buffer. - if (copy == 0) +char * +CORBA::string_dup (const WChar *str) +{ + if (!str) { + errno = EINVAL; return 0; } - - ACE_OS::memcpy (copy, - str, - len + 1); - return copy; + return ACE::String_Conversion::Convert_Out< char >( str ).c_str(); } char * CORBA::string_alloc (CORBA::ULong len) { - // Allocate 1 + strlen to accomodate the null terminating character. - - char *s = 0; - ACE_NEW_RETURN (s, - char[size_t (len + 1)], - 0); - - s[0]= '\0'; - - return s; + return ACE::String_Conversion::Allocator_cpp< char >().alloc( len ); } void CORBA::string_free (char *str) { - delete [] str; + ACE::String_Conversion::Allocator_cpp< char >().free( str ); } // **************************************************************** CORBA::WChar* -CORBA::wstring_dup (const WChar *const str) +CORBA::wstring_dup (const WChar * str) { if (!str) { errno = EINVAL; return 0; } + return ACE::String_Conversion::Convert_Out< WChar >( str ).c_str(); +} - CORBA::WChar* retval = - CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str))); - - // The wscpy() below assumes that the destination is a valid buffer. - if (retval == 0) +CORBA::WChar* +CORBA::wstring_dup (const char *str) +{ + if (!str) { + errno = EINVAL; return 0; } - - return ACE_OS::wscpy (retval, - str); + return ACE::String_Conversion::Convert_Out< WChar >( str ).c_str(); } CORBA::WChar* CORBA::wstring_alloc (CORBA::ULong len) { - CORBA::WChar *s = 0; - ACE_NEW_RETURN (s, - CORBA::WChar [(size_t) (len + 1)], - 0); - - return s; + return ACE::String_Conversion::Allocator_cpp< WChar >().alloc( len ); } void -CORBA::wstring_free (CORBA::WChar *const str) +CORBA::wstring_free (CORBA::WChar * str) { - delete [] str; + ACE::String_Conversion::Allocator_cpp< WChar >().free( str ); } // **************************************************************** @@ -275,7 +255,7 @@ operator>> (istream &is, CORBA::String_out &so) ostream & operator<< (ostream &os, const CORBA::WString_var &wsv) { - const CORBA::ULong len = + const CORBA::ULong len = static_cast <CORBA::ULong> (ACE_OS::strlen (wsv.in ())); for (CORBA::ULong i = 0; i < len; ++i) @@ -351,5 +331,3 @@ operator>> (istream &is, CORBA::WString_out &wso) } #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index d4c8f58fa51..a066ad183b2 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -26,8 +26,6 @@ // For the (W)String_var and (W)String_out iostream operators. #include "ace/iosfwd.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_String_Manager; class TAO_WString_Manager; @@ -41,6 +39,7 @@ namespace CORBA //@{ TAO_Export char * string_alloc (ULong len); TAO_Export char * string_dup (const char *); + TAO_Export char * string_dup (const WChar *); TAO_Export void string_free (char *); //@} @@ -51,8 +50,9 @@ namespace CORBA */ //@{ TAO_Export WChar * wstring_alloc (ULong len); - TAO_Export WChar * wstring_dup (const WChar * const); - TAO_Export void wstring_free (WChar * const); + TAO_Export WChar * wstring_dup (const WChar *); + TAO_Export WChar * wstring_dup (const char *); + TAO_Export void wstring_free (WChar *); //@} /** @@ -333,8 +333,6 @@ operator>> (istream &, CORBA::WString_out &); # endif /* ACE_LACKS_IOSTREAM_TOTALLY */ -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/CORBA_String.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CORBA_String.inl b/TAO/tao/CORBA_String.inl index 90433d8095b..992044b1bb4 100644 --- a/TAO/tao/CORBA_String.inl +++ b/TAO/tao/CORBA_String.inl @@ -10,8 +10,6 @@ // #include "ace/OS_NS_wchar.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::String_var::String_var (void) : ptr_ (0) @@ -291,5 +289,3 @@ TAO::String_Var_Equal_To::operator() (CORBA::WString_var const & lhs, { return (ACE_OS::strcmp (lhs.in (), rhs.in ()) == 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h index 62d95e56a1e..038f912b6e2 100644 --- a/TAO/tao/CORBA_methods.h +++ b/TAO/tao/CORBA_methods.h @@ -30,8 +30,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class ORB; @@ -79,8 +77,6 @@ namespace CORBA TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr); } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CORBA_METHODS_H */ diff --git a/TAO/tao/CSD_Framework.mpc b/TAO/tao/CSD_Framework.mpc deleted file mode 100644 index 51aa8cd4736..00000000000 --- a/TAO/tao/CSD_Framework.mpc +++ /dev/null @@ -1,38 +0,0 @@ -//$Id$ -project : taolib, portableserver, core, pi { - sharedname = TAO_CSD_Framework - dynamicflags = TAO_CSD_FW_BUILD_DLL - includes += $(TAO_ROOT)/tao - - Source_Files { - CSD_Framework - } - - Header_Files { - CSD_Framework - } - - Inline_Files { - CSD_Framework - } - - Template_Files { - CSD_Framework - } - - Resource_Files { - CSD_Framework - } - - IDL_Files { - CSD_Framework - } - - PIDL_Files { - CSD_Framework - } - - Pkgconfig_Files { - CSD_Framework/TAO_CSD_Framework.pc.in - } -} diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp deleted file mode 100644 index a2cf1ceafe1..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h" -#include "tao/CSD_Framework/CSD_POA.h" -#include "tao/CSD_Framework/CSD_Strategy_Repository.h" -#include "ace/Dynamic_Service.h" - -ACE_RCSID(CSD_Framework, - CSD_Default_Servant_Dispatcher, - "$Id$") - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void) -{ -} - - -TAO_Root_POA * -TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) -{ - TAO_CSD_POA *poa = 0; - - ACE_NEW_THROW_EX (poa, - TAO_CSD_POA (name, - poa_manager, - policies, - 0, - lock, - thread_lock, - orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - - - TAO_CSD_Strategy_Repository *repo = - ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); - - CSD_Framework::Strategy_var strategy = repo->find (name); - - if (! CORBA::is_nil (strategy.in ())) - { - poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - } - - return poa; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h deleted file mode 100644 index ed78621d075..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h +++ /dev/null @@ -1,53 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_Default_Servant_Dispatcher.h - * - * $Id$ - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - -#ifndef TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H -#define TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/Default_Servant_Dispatcher.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_CSD_Default_Servant_Dispatcher - * - * @brief Interface for CSD_POA servant dispatching strategies. - */ -class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher - : public virtual TAO_Default_Servant_Dispatcher -{ -public: - virtual ~TAO_CSD_Default_Servant_Dispatcher (void); - - - /// Factory method for creating new CSD Root POA. - virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_FW_Export.h b/TAO/tao/CSD_Framework/CSD_FW_Export.h deleted file mode 100644 index edeb9119dc4..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FW_Export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s TAO_CSD_FW -// ------------------------------ -#ifndef TAO_CSD_FW_EXPORT_H -#define TAO_CSD_FW_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_CSD_FW_HAS_DLL) -# define TAO_CSD_FW_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && TAO_CSD_FW_HAS_DLL */ - -#if !defined (TAO_CSD_FW_HAS_DLL) -# define TAO_CSD_FW_HAS_DLL 1 -#endif /* ! TAO_CSD_FW_HAS_DLL */ - -#if defined (TAO_CSD_FW_HAS_DLL) && (TAO_CSD_FW_HAS_DLL == 1) -# if defined (TAO_CSD_FW_BUILD_DLL) -# define TAO_CSD_FW_Export ACE_Proper_Export_Flag -# define TAO_CSD_FW_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_CSD_FW_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_CSD_FW_BUILD_DLL */ -# define TAO_CSD_FW_Export ACE_Proper_Import_Flag -# define TAO_CSD_FW_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_CSD_FW_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_CSD_FW_BUILD_DLL */ -#else /* TAO_CSD_FW_HAS_DLL == 1 */ -# define TAO_CSD_FW_Export -# define TAO_CSD_FW_SINGLETON_DECLARATION(T) -# define TAO_CSD_FW_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_CSD_FW_HAS_DLL == 1 */ - -// Set TAO_CSD_FW_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (TAO_CSD_FW_NTRACE) -# if (ACE_NTRACE == 1) -# define TAO_CSD_FW_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define TAO_CSD_FW_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !TAO_CSD_FW_NTRACE */ - -#if (TAO_CSD_FW_NTRACE == 1) -# define TAO_CSD_FW_TRACE(X) -#else /* (TAO_CSD_FW_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define TAO_CSD_FW_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (TAO_CSD_FW_NTRACE == 1) */ - -#endif /* TAO_CSD_FW_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp deleted file mode 100644 index f8cc7c0d008..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ /dev/null @@ -1,465 +0,0 @@ -// $Id$ -#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h" -#include "tao/debug.h" -#include "tao/ORB_Constants.h" -#include "tao/ORB_Core.h" -#include "tao/Transport.h" -#include "tao/CDR.h" - - -ACE_RCSID (CSD_Framework, - FW_Server_Request_Wrapper, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper() -{ - // Only delete the request if we cloned it. - if (this->is_clone_) - { - // Since this TAO_ServerRequest object is a clone, it - // "owns" the input and output CDR objects held by the - // incoming_ and outgoing_ data members, respectfully. - // Thus, for the clone case, the TAO_ServerRequest dtor - // needs to release (aka, delete) the CDR objects. - delete this->request_->incoming_; - - // Get the start message block that reference to the data allocated - // on the heap. - if (this->request_->outgoing_ != 0) - { - char* buffer = this->request_->outgoing_->begin ()->base (); - delete [] buffer; - delete this->request_->outgoing_; - } - if (this->request_->operation_details_ != 0) - { - char* opname = (char*)this->request_->operation_details_->opname_; - delete [] opname; - delete this->request_->operation_details_; - } - delete this->request_; - } -} - - -// Assumes that the servant argument is not a NULL pointer. -void -TAO::CSD::FW_Server_Request_Wrapper::dispatch - (PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - ACE_TRY - { - servant->_dispatch(*this->request_, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - // Only CORBA exceptions are caught here. - ACE_CATCHANY - { - if (this->request_->collocated()) - { - // For collocated requests, we re-throw the exception. - ACE_RE_THROW; - } - else if (!this->request_->sync_with_server() && - this->request_->response_expected() && - !this->request_->deferred_reply()) - { - // The request is a remote request that is expecting a reply. - this->request_->tao_send_reply_exception(ACE_ANY_EXCEPTION); - } - else if (TAO_debug_level > 0) - { - // It is unfortunate that an exception (probably a system - // exception) was thrown by the dispatch code (even by the - // user) when the client was not expecting a response. - // However, in this case, we cannot close the connection - // down, since it really isn't the client's fault. - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) exception thrown ") - ACE_TEXT ("but client is not waiting a response\n"))); - - ACE_PRINT_EXCEPTION ( - ACE_ANY_EXCEPTION, - "FW_Server_Request_Wrapper::dispatch ()"); - } - } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL - { - // @@ TODO some c++ exception or another, but what do we do with - // it? - // We are supposed to map it into a CORBA::UNKNOWN exception. - // BTW, this cannot be detected if using the <env> mapping. If - // we have native exceptions but no support for them in the ORB - // we should still be able to catch it. If we don't have native - // exceptions it couldn't have been raised in the first place! - CORBA::UNKNOWN exception (CORBA::SystemException::_tao_minor_code - (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0), - CORBA::COMPLETED_MAYBE); - - if (this->request_->collocated()) - { - // For collocated requests, we re-throw the exception. - ACE_RE_THROW; - } - else if (!this->request_->sync_with_server() && - this->request_->response_expected() && - !this->request_->deferred_reply()) - { - // The request is a remote request that is expecting a reply. - this->request_->tao_send_reply_exception(exception); - } - else if (TAO_debug_level > 0) - { - // It is unfortunate that an exception (probably a system - // exception) was thrown by the dispatch code (even by the - // user) when the client was not expecting a response. - // However, in this case, we cannot close the connection - // down, since it really isn't the client's fault. - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) exception thrown ") - ACE_TEXT ("but client is not waiting a response\n"))); - - ACE_PRINT_EXCEPTION ( - exception, - "FW_Server_Request_Wrapper::dispatch ()"); - } - } -#endif /* TAO_HAS_EXCEPTIONS */ - - ACE_ENDTRY; -} - - -TAO_ServerRequest* -TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request) -{ - // TBD-CSD: Ultimately add an argument for an allocator. - TAO_ServerRequest* clone_obj = this->create_new_request (); - - if (clone_obj == 0) - { - return 0; - } - - // TYPE: TAO_Pluggable_Messaging* - // ACTION: Assuming that a shallow-copy is ok here. - clone_obj->mesg_base_ = request->mesg_base_; - - // TYPE: ACE_CString - // ACTION: Assignment performs deep-copy of string contents. - clone_obj->operation_ = request->operation_; - - // TYPE: CORBA::Object_var - // ACTION: Assignment performs reference-counted copy of object ref. - clone_obj->forward_location_ = request->forward_location_; - - // TYPE: TAO_InputCDR* - // ACTION: This *must* be "cloned". - if (request->incoming_ != 0) - { - clone_obj->incoming_ = this->clone (request->incoming_); - } - - // TYPE: TAO_OutputCDR* - // ACTION: This *must* be "cloned". - if (request->outgoing_ != 0) - { - clone_obj->outgoing_ = this->create_new_output_cdr (); - } - - // TYPE: TAO_Transport* - // ACTION: Assuming that a shallow-copy is ok here. - clone_obj->transport_ = request->transport_; - - // TYPE: CORBA::Boolean - // ACTION: Primitive data type assignment. - clone_obj->response_expected_ = request->response_expected_; - - // TYPE: CORBA::Boolean - // ACTION: Primitive data type assignment. - clone_obj->deferred_reply_ = request->deferred_reply_; - - // TYPE: CORBA::Boolean - // ACTION: Primitive data type assignment. - clone_obj->sync_with_server_ = request->sync_with_server_; - - // TYPE: CORBA::Boolean - // ACTION: Primitive data type assignment. - clone_obj->is_dsi_ = request->is_dsi_; - - // TYPE: CORBA::ULong - // ACTION: Primitive data type assignment. - clone_obj->exception_type_ = request->exception_type_; - - // TYPE: TAO_ORB_Core* - // ACTION: Assuming that a shallow-copy is ok here. - clone_obj->orb_core_ = request->orb_core_; - - // TYPE: TAO_Service_Context - // ACTION: No copy/assignment operator, so adding/using a clone operation. - this->clone (request->request_service_context_, clone_obj->request_service_context_); - - // TYPE: TAO_Service_Context - // ACTION: No copy/assignment operator, so adding/using a clone operation. - this->clone (request->reply_service_context_, clone_obj->reply_service_context_); - - // TYPE: CORBA::ULong - // ACTION: Primitive data type assignment. - clone_obj->request_id_ = request->request_id_; - - // TYPE: TAO_Tagged_Profile - // ACTION: No copy/assignment operator, so adding/using a clone operation. - this->clone (request->profile_, clone_obj->profile_); - - // TYPE: CORBA::OctetSeq_var - // ACTION: Assignment performs reference-counted copy of sequence. - clone_obj->requesting_principal_ = request->requesting_principal_; - - // TYPE: ptrdiff_t - // ACTION: Primitive data type assignment (unsigned integral type). - clone_obj->dsi_nvlist_align_ = request->dsi_nvlist_align_; - - // TYPE: TAO_Operation_Details const * const - // ACTION: Need to clone this. - if (request->operation_details_ != 0) - { - ACE_ASSERT (request->incoming_ == 0); - if (this->clone (request->operation_details_, - clone_obj->operation_details_, - clone_obj->incoming_) == false) - { - return 0; - } - } - - // TYPE: CORBA::Boolean - // ACTION: Primitive data type assignment. - clone_obj->argument_flag_ = request->argument_flag_; - - //#if TAO_HAS_INTERCEPTORS == 1 - // TYPE: size_t - // ACTION: Primitive data type assignment. - // Just leave this alone for a clone. - // - //clone_obj->interceptor_count_ = request->interceptor_count_; - - // TYPE: TAO::PICurrent_Impl - // ACTION: Copy/assignment operator disabled on purpose. - // Just leave this alone for a clone. - // - // clone_obj->rs_pi_current_ - - // TYPE: TAO::PICurrent_Copy_Callback - // ACTION: No copy/assignment operator. - // Just leave this alone for a clone. - // - // clone_obj->pi_current_copy_callback_ - - // TYPE: CORBA::OctetSeq_var - // ACTION: Assignment performs reference-counted copy of sequence. - // Assuming that this is ok. - // Just leave this alone for a clone. - // - //clone_obj->result_seq_ = request->result_seq_; - //#endif /* TAO_HAS_INTERCEPTORS == 1 */ - - if (clone_obj->transport_ != 0) - { - clone_obj->transport_->assign_translators(clone_obj->incoming_, - clone_obj->outgoing_); - } - return clone_obj; -} - - -TAO_InputCDR* -TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_InputCDR*& from) -{ - TAO_InputCDR* clone_ptr = 0; - ACE_NEW_RETURN (clone_ptr, - TAO_InputCDR(*from), - 0); - return clone_ptr; -} - - -bool -TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Operation_Details const *& from, - TAO_Operation_Details const *& to, - TAO_InputCDR*& cdr) -{ - TAO_Operation_Details *& from_non_const - = const_cast <TAO_Operation_Details *&>(from); - - char* cloned_op_name = new char[from_non_const->opname_len_ + 1]; - ACE_OS::strncpy(cloned_op_name, from_non_const->opname_, from_non_const->opname_len_); - cloned_op_name[from_non_const->opname_len_] = '\0'; - - TAO_OutputCDR outcdr; - - if (! from_non_const->marshal_args (outcdr)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("(%P|%T) TAO::CSD::FW_Server_Request_Wrapper::") - ACE_TEXT("clone TAO_Operation_Details failed\n"))); - return false; - } - - ACE_NEW_RETURN (cdr, - TAO_InputCDR (outcdr), - false); - - - // CSD-TBD: Eventually need to use allocators. - - // CSD-TBD: Assert that this->ex_data_ and this->ex_count_ are both == 0 - TAO_Operation_Details* to_non_const; - ACE_NEW_RETURN (to_non_const, - TAO_Operation_Details(cloned_op_name, - from_non_const->opname_len_, - from_non_const->argument_flag_, - 0, - 0, - 0, - 0), - false); - - - // DATA MEMBER: const char *opname_; - // DATA MEMBER: CORBA::ULong opname_len_; - // DATA MEMBER: CORBA::Boolean argument_flag_; - // DATA MEMBER: TAO::Argument **args_; - // DATA MEMBER: CORBA::ULong num_args_; - // DATA MEMBER: TAO::Exception_Data *ex_data_; - // DATA MEMBER: CORBA::ULong ex_count_; - // - // ACTION: None - handled in ctor - // - - // DATA MEMBER: CORBA::ULong request_id_; - // DATA MEMBER: CORBA::Octet response_flags_; - // DATA MEMBER: TAO_Target_Specification::TAO_Target_Address addressing_mode_; - // DATA MEMBER: TAO_Service_Context request_service_info_; - // DATA MEMBER: TAO_Service_Context reply_service_info_; - // - // ACTION: Use assignment op to copy from "this" object to the clone. - // - to_non_const->request_id_ = from->request_id_; - to_non_const->response_flags_ = from->response_flags_; - to_non_const->addressing_mode_ = from->addressing_mode_; - - // DATA MEMBER: TAO_Service_Context request_service_info_; - // DATA MEMBER: TAO_Service_Context reply_service_info_; - // - // ACTION: Use the TAO_Service_Context clone() method. - // - this->clone (from_non_const->request_service_info_, to_non_const->request_service_info_); - this->clone (from_non_const->reply_service_info_, to_non_const->reply_service_info_); - - to = to_non_const; - - return true; -} - - -void -TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Tagged_Profile& from, - TAO_Tagged_Profile& to) -{ - to.orb_core_ = from.orb_core_; - to.discriminator_ = from.discriminator_; - to.object_key_extracted_ = from.object_key_extracted_; - to.object_key_ = from.object_key_; - to.profile_ = from.profile_; - to.profile_index_ = from.profile_index_; - to.type_id_ = from.type_id_; -} - - -void -TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Service_Context& from, - TAO_Service_Context& to) -{ - to.service_context_ = from.service_context_; -} - -TAO_ServerRequest* -TAO::CSD::FW_Server_Request_Wrapper::create_new_request () -{ - // Use one of constructor to create the TAO_ServerRequest object then - // reset the data members. This reduces the footprint due to a default - // TAO_ServerRequest constructor. - // - //TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base, - // TAO_InputCDR &input, - // TAO_OutputCDR &output, - // TAO_Transport *transport, - // TAO_ORB_Core *orb_core); - - TAO_ServerRequest* request = 0; - - TAO_InputCDR dummy_input ((ACE_Message_Block *)0); // empty input cdr stream - TAO_OutputCDR dummy_output ((char *)0, (size_t) 0); // empty output cdr stream - ACE_NEW_RETURN (request, - TAO_ServerRequest (0, - dummy_input, - dummy_output, - 0, - 0), - 0); - - request->incoming_ = 0; - request->outgoing_ = 0; - - return request; -} - - -TAO_OutputCDR* -TAO::CSD::FW_Server_Request_Wrapper::create_new_output_cdr () -{ - TAO_OutputCDR* cdr = 0; - - // A buffer that we will use to initialise the CDR stream - char* repbuf = new char[ACE_CDR::DEFAULT_BUFSIZE]; - - ACE_CDR::Octet major; - ACE_CDR::Octet minor; - this->request_->outgoing_->get_version (major, minor); - - // Initialze an output CDR on the stack - // NOTE: Don't jump to a conclusion as to why we are using the - // input_cdr and hence the global pool here. These pools will move - // to the lanes anyway at some point of time. Further, it would have - // been awesome to have this in TSS. But for some reason the cloning - // that happens when the ORB gets flow controlled while writing a - // reply is messing things up. We crash horribly. Doing this adds a - // lock, we need to set things like this -- put stuff in TSS here - // and transfer to global memory when we get flow controlled. We - // need to work on the message block to get it right! - ACE_NEW_RETURN (cdr, - TAO_OutputCDR (repbuf, - ACE_CDR::DEFAULT_BUFSIZE, - TAO_ENCAP_BYTE_ORDER, - this->request_->orb_core_->input_cdr_buffer_allocator (), - this->request_->orb_core_->input_cdr_dblock_allocator (), - this->request_->orb_core_->input_cdr_msgblock_allocator (), - this->request_->orb_core_->orb_params ()->cdr_memcpy_tradeoff (), - major, - minor), - 0); - - return cdr; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h deleted file mode 100644 index e76b4090487..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h +++ /dev/null @@ -1,131 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_FW_Server_Request_Wrapper.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_FW_SERVER_REQUEST_WRAPPER_H -#define TAO_CSD_FW_SERVER_REQUEST_WRAPPER_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/TAO_Server_Request.h" -#include "tao/operation_details.h" -#include "tao/PortableServer/Servant_Base.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - /** - * @class FW_Server_Request_Wrapper - * - * @brief Wrapper around a TAO_Server_Request that will be cloned - * at the proper time. - * - * This CSD Framework class is used to provide an interface to a - * TAO_ServerRequest object such that it can be used for CSD strategies - * that need to clone TAO_Server_Requests (ie, so that they may be - * placed on a queue to be dispatched by another thread). - * - * There are several purposes for this class, with the main thing being - * that the TAO_ServerRequest object is not used directly by the - * CSD Strategies since it is, after all, an internal TAO class that was - * never meant to be exposed. Future changes to TAO's internal design - * may cause disruption in the TAO_ServerRequest class. These changes - * would only need to be accounted for here in this - * FW_Server_Request_Wrapper class' implementation, and all CSD - * Strategies will work again. It's a maintenance issue. - * - * @note: The CSD namespace is inside of TAO namespace in current - * implementation. This can be changed but, at least for now, it's - * already been delivered to some customs, we leave it as-is. If it - * needs to change, we will make this change. - */ - class TAO_CSD_FW_Export FW_Server_Request_Wrapper - { - public: - - /// Constructor. - FW_Server_Request_Wrapper(TAO_ServerRequest& server_request); - - /// Destructor. - ~FW_Server_Request_Wrapper(); - - /// Perform the clone operation. - void clone(); - - /// Dispatch the request to the servant. - void dispatch(PortableServer::Servant servant ACE_ENV_ARG_DECL); - - /// Cancel the request. - void cancel(); - - - private: - - /// Create a deep copy of the request_ object. - /// The other clone methods are used to support the TAO_ServerRequest clone. - TAO_ServerRequest* clone (TAO_ServerRequest*& from); - - /// Clone an input cdr stream. - TAO_InputCDR* clone (TAO_InputCDR*& from); - - /// Create a deep copy of a TAO_Operation_Details object and marshall - /// the arguments into a TAO_InputCDR stream. The cloned TAO_Operation_Details - /// object is created without any arguments. This would help the skeleton - /// code to determine whether the arguments are in the operation_details_ - /// object or should be demarshalled from the incoming_ stream in the request_ - /// object. - bool clone (TAO_Operation_Details const *& from, - TAO_Operation_Details const *& to, - TAO_InputCDR* & cdr); - - /// Clone the TAO_Tagged_Profile object. - void clone (TAO_Tagged_Profile& from, TAO_Tagged_Profile& to); - - /// Clone the TAO_Service_Context object. - void clone (TAO_Service_Context& from, TAO_Service_Context& to); - - /// Create a new TAO_ServerRequest with default initial values. - TAO_ServerRequest* create_new_request (); - - /// Create a TAO_OutputCDR stream initialized with a heap allocated - /// buffer. - TAO_OutputCDR* create_new_output_cdr (); - - /// A flag that indicates that the TAO_ServerRequest object - /// is already cloned. - bool is_clone_; - - /// Pointer to the underlying TAO_ServerRequest object. - TAO_ServerRequest* request_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_FW_SERVER_REQUEST_WRAPPER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl deleted file mode 100644 index 13d78a1664c..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl +++ /dev/null @@ -1,46 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::FW_Server_Request_Wrapper::FW_Server_Request_Wrapper - (TAO_ServerRequest& server_request) - : is_clone_(false), - request_(&server_request) -{ -} - - -ACE_INLINE -void -TAO::CSD::FW_Server_Request_Wrapper::clone() -{ - // Only clone the TAO_Server_Request object if we have not performed the - // clone already. This really should only be called once, but this code - // makes sure that we do not introduce a leak. - if (!this->is_clone_) - { - this->request_ = this->clone (this->request_); - this->is_clone_ = true; - } -} - - -ACE_INLINE -void -TAO::CSD::FW_Server_Request_Wrapper::cancel() -{ - // We only need to handle remote requests that are expecting a reply. - if (!this->request_->collocated() && - !this->request_->sync_with_server() && - this->request_->response_expected() && - !this->request_->deferred_reply()) - { - CORBA::NO_IMPLEMENT ex; - this->request_->tao_send_reply_exception(ex); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Framework.pidl b/TAO/tao/CSD_Framework/CSD_Framework.pidl deleted file mode 100644 index b0e78b39331..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Framework.pidl +++ /dev/null @@ -1,77 +0,0 @@ -// -*- IDL -*- -/** - * @file CSD_Framework.pidl - * - * $Id$ - * - * @brief Pre-compiled IDL source for the CSD_Framework module. - * - * This file was used to generate the code in - * CSD_FrameworkC.{h,inl,cpp}, using the following command: - * - * $ACE_ROOT/bin/tao_idl \ - * -o orig -Gp -Gd -Ge 1 -Gt -Sc -GA -I$TAO_ROOT \ - * -Wb,export_macro=TAO_CSD_FW_Export \ - * -Wb,export_include="CSD_FW_Export.h" \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ - * CSD_Framework.pidl - * - * After the file is generated a patch from the diffs directory must - * be applied. The patch: - * - * - Disables parts of the code under certain configurations. - * - * - Eliminates cycles in the include dependencies. - * - * - Adds non-idl components of CSD_Framework to the namespace. - * This includes (a) Servant (b) ServantBase (c) RefCountServantBase - * (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g) - * ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var - * (j) DynamicImplementation (k) LocalServantBase - * - * Apply patches using the following command: - * - * patch < diffs/CSD_Framework.diff - * - * Note: The diffs were generated using: - * - * rm diffs/CSD_Framework.diff - * for i in CSD_FrameworkC.{h,i,cpp}; do - * diff -wub orig/$i $i >> diffs/CSD_Framework.diff - * done - */ - -#ifndef CSD_FRAMEWORK_PIDL -#define CSD_FRAMEWORK_PIDL - -#include "tao/PortableServer/PortableServer.pidl" - -module CSD_Framework { - - # pragma version CSD_Framework 2.3 - - // This is a common base interface for all CSD strategy - // implementations - local interface Strategy { - - # pragma version Strategy 2.3 - - // This is support for a legacy method of supplying a strategy to a - // POA. - boolean apply_to(in PortableServer::POA p); - }; - - // Specialized POA providing a method to supply a strategy object to - // the POA. - local interface POA : PortableServer::POA { - - # pragma version POA 2.3 - - void set_csd_strategy (in Strategy s); - }; -}; - -#endif //CSD_FRAMEWORK_PIDL diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp deleted file mode 100644 index 267e866b903..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp +++ /dev/null @@ -1,76 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#include "tao/CSD_Framework/CSD_FrameworkA.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_CSD_Framework_Strategy ( - ::CORBA::tk_local_interface, - "IDL:CSD_Framework/Strategy:2.3", - "Strategy"); - -namespace CSD_Framework -{ - ::CORBA::TypeCode_ptr const _tc_Strategy = - &_tao_tc_CSD_Framework_Strategy; -} - - - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_CSD_Framework_POA ( - ::CORBA::tk_local_interface, - "IDL:CSD_Framework/POA:2.3", - "POA"); - -namespace CSD_Framework -{ - ::CORBA::TypeCode_ptr const _tc_POA = - &_tao_tc_CSD_Framework_POA; -} - - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.h b/TAO/tao/CSD_Framework/CSD_FrameworkA.h deleted file mode 100644 index da09d57dec2..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FrameworkA.h +++ /dev/null @@ -1,68 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// .\be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_ORIG_CSD_FRAMEWORKA_H_ -#define _TAO_IDL_ORIG_CSD_FRAMEWORKA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" -#include "tao/CSD_Framework/CSD_FrameworkC.h" -//#include "tao/PortableServer/PortableServerA.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:59 - -namespace CSD_Framework -{ - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_CSD_FW_Export ::CORBA::TypeCode_ptr const _tc_Strategy; - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_CSD_FW_Export ::CORBA::TypeCode_ptr const _tc_POA; - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:86 - -} // module CSD_Framework - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp deleted file mode 100644 index e4899682ad2..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp +++ /dev/null @@ -1,294 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// .\be\be_codegen.cpp:277 - - -#include "tao/CSD_Framework/CSD_FrameworkC.h" -#include "tao/CDR.h" -#include "ace/OS_NS_string.h" - - -// TAO_IDL - Generated from -// .\be\be_visitor_arg_traits.cpp:70 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Arg traits specializations. -namespace TAO -{ -} - - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for CSD_Framework::Strategy. - -CSD_Framework::Strategy_ptr -TAO::Objref_Traits<CSD_Framework::Strategy>::duplicate ( - CSD_Framework::Strategy_ptr p - ) -{ - return CSD_Framework::Strategy::_duplicate (p); -} - -void -TAO::Objref_Traits<CSD_Framework::Strategy>::release ( - CSD_Framework::Strategy_ptr p - ) -{ - CORBA::release (p); -} - -CSD_Framework::Strategy_ptr -TAO::Objref_Traits<CSD_Framework::Strategy>::nil (void) -{ - return CSD_Framework::Strategy::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits<CSD_Framework::Strategy>::marshal ( - CSD_Framework::Strategy_ptr p, - TAO_OutputCDR & cdr - ) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -CSD_Framework::Strategy::Strategy (void) -{} - -CSD_Framework::Strategy::~Strategy (void) -{} - -CSD_Framework::Strategy_ptr -CSD_Framework::Strategy::_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return Strategy::_duplicate ( - dynamic_cast<Strategy_ptr> (_tao_objref) - ); -} - -CSD_Framework::Strategy_ptr -CSD_Framework::Strategy::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return Strategy::_duplicate ( - dynamic_cast<Strategy_ptr> (_tao_objref) - ); -} - -CSD_Framework::Strategy_ptr -CSD_Framework::Strategy::_duplicate (Strategy_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -CSD_Framework::Strategy::_tao_release (Strategy_ptr obj) -{ - CORBA::release (obj); -} - -::CORBA::Boolean -CSD_Framework::Strategy::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:CSD_Framework/Strategy:2.3" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return false; - } -} - -const char* CSD_Framework::Strategy::_interface_repository_id (void) const -{ - return "IDL:CSD_Framework/Strategy:2.3"; -} - -::CORBA::Boolean -CSD_Framework::Strategy::marshal (TAO_OutputCDR &) -{ - return false; -} - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for CSD_Framework::POA. - -CSD_Framework::POA_ptr -TAO::Objref_Traits<CSD_Framework::POA>::duplicate ( - CSD_Framework::POA_ptr p - ) -{ - return CSD_Framework::POA::_duplicate (p); -} - -void -TAO::Objref_Traits<CSD_Framework::POA>::release ( - CSD_Framework::POA_ptr p - ) -{ - CORBA::release (p); -} - -CSD_Framework::POA_ptr -TAO::Objref_Traits<CSD_Framework::POA>::nil (void) -{ - return CSD_Framework::POA::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits<CSD_Framework::POA>::marshal ( - CSD_Framework::POA_ptr p, - TAO_OutputCDR & cdr - ) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -CSD_Framework::POA::POA (void) -{} - -CSD_Framework::POA::~POA (void) -{} - -CSD_Framework::POA_ptr -CSD_Framework::POA::_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return POA::_duplicate ( - dynamic_cast<POA_ptr> (_tao_objref) - ); -} - -CSD_Framework::POA_ptr -CSD_Framework::POA::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return POA::_duplicate ( - dynamic_cast<POA_ptr> (_tao_objref) - ); -} - -CSD_Framework::POA_ptr -CSD_Framework::POA::_duplicate (POA_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -CSD_Framework::POA::_tao_release (POA_ptr obj) -{ - CORBA::release (obj); -} - -::CORBA::Boolean -CSD_Framework::POA::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableServer/POA:2.3" - ) || - !ACE_OS::strcmp ( - value, - "IDL:CSD_Framework/POA:2.3" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return false; - } -} - -const char* CSD_Framework::POA::_interface_repository_id (void) const -{ - return "IDL:CSD_Framework/POA:2.3"; -} - -::CORBA::Boolean -CSD_Framework::POA::marshal (TAO_OutputCDR &) -{ - return false; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.h b/TAO/tao/CSD_Framework/CSD_FrameworkC.h deleted file mode 100644 index e78eaf949ae..00000000000 --- a/TAO/tao/CSD_Framework/CSD_FrameworkC.h +++ /dev/null @@ -1,316 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// .\be\be_codegen.cpp:154 - -#ifndef _TAO_IDL_ORIG_CSD_FRAMEWORKC_H_ -#define _TAO_IDL_ORIG_CSD_FRAMEWORKC_H_ - -#include /**/ "ace/pre.h" - - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_Framework/CSD_FW_Export.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/Object.h" -#include "tao/Objref_VarOut_T.h" - -#include "tao/PortableServer/PortableServer.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_CSD_FW_Export - -// TAO_IDL - Generated from -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:49 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CSD_Framework -{ - - // TAO_IDL - Generated from - // .\be\be_interface.cpp:646 - -#if !defined (_CSD_FRAMEWORK_STRATEGY__VAR_OUT_CH_) -#define _CSD_FRAMEWORK_STRATEGY__VAR_OUT_CH_ - - class Strategy; - typedef Strategy *Strategy_ptr; - - typedef - TAO_Objref_Var_T< - Strategy - > - Strategy_var; - - typedef - TAO_Objref_Out_T< - Strategy - > - Strategy_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_CSD_FRAMEWORK_STRATEGY_CH_) -#define _CSD_FRAMEWORK_STRATEGY_CH_ - - class TAO_CSD_FW_Export Strategy - : public virtual ::CORBA::Object - { - public: - typedef Strategy_ptr _ptr_type; - typedef Strategy_var _var_type; - - // The static operations. - static Strategy_ptr _duplicate (Strategy_ptr obj); - - static void _tao_release (Strategy_ptr obj); - - static Strategy_ptr _narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static Strategy_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static Strategy_ptr _nil (void) - { - return static_cast<Strategy_ptr> (0); - } - - - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Boolean apply_to ( - ::PortableServer::POA_ptr p - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210 - - 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. - Strategy (void); - - virtual ~Strategy (void); - - private: - // Private and unimplemented for concrete interfaces. - Strategy (const Strategy &); - - void operator= (const Strategy &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // .\be\be_interface.cpp:646 - -#if !defined (_CSD_FRAMEWORK_POA__VAR_OUT_CH_) -#define _CSD_FRAMEWORK_POA__VAR_OUT_CH_ - - class POA; - typedef POA *POA_ptr; - - typedef - TAO_Objref_Var_T< - POA - > - POA_var; - - typedef - TAO_Objref_Out_T< - POA - > - POA_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_CSD_FRAMEWORK_POA_CH_) -#define _CSD_FRAMEWORK_POA_CH_ - - class TAO_CSD_FW_Export POA - : public virtual ::PortableServer::POA - { - public: - typedef POA_ptr _ptr_type; - typedef POA_var _var_type; - - // The static operations. - static POA_ptr _duplicate (POA_ptr obj); - - static void _tao_release (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); - } - - - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46 - - virtual void set_csd_strategy ( - ::CSD_Framework::Strategy_ptr s - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210 - - 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 -// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:78 - -} // module CSD_Framework - -// TAO_IDL - Generated from -// .\be\be_visitor_traits.cpp:61 - -// Traits specializations. -namespace TAO -{ - -#if !defined (_CSD_FRAMEWORK_STRATEGY__TRAITS_) -#define _CSD_FRAMEWORK_STRATEGY__TRAITS_ - - template<> - struct TAO_CSD_FW_Export Objref_Traits< ::CSD_Framework::Strategy> - { - static ::CSD_Framework::Strategy_ptr duplicate ( - ::CSD_Framework::Strategy_ptr - ); - static void release ( - ::CSD_Framework::Strategy_ptr - ); - static ::CSD_Framework::Strategy_ptr nil (void); - static ::CORBA::Boolean marshal ( - ::CSD_Framework::Strategy_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_CSD_FRAMEWORK_POA__TRAITS_) -#define _CSD_FRAMEWORK_POA__TRAITS_ - - template<> - struct TAO_CSD_FW_Export Objref_Traits< ::CSD_Framework::POA> - { - static ::CSD_Framework::POA_ptr duplicate ( - ::CSD_Framework::POA_ptr - ); - static void release ( - ::CSD_Framework::POA_ptr - ); - static ::CSD_Framework::POA_ptr nil (void); - static ::CORBA::Boolean marshal ( - ::CSD_Framework::POA_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp deleted file mode 100644 index 99094e9e166..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Framework_Loader.h" -#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" -#include "tao/CSD_Framework/CSD_Strategy_Repository.h" -#include "ace/Dynamic_Service.h" - -ACE_RCSID (CSD_Framework, - CSD_Framework_Loader, - "$Id$") - -#include "tao/ORB_Core.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -int -TAO_CSD_Framework_Loader::init (void) -{ - ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_Object_Adapter_Factory); - - TAO_ORB_Core::set_poa_factory ("TAO_CSD_Object_Adapter_Factory", - "dynamic TAO_CSD_Object_Adapter_Factory Service_Object * _make_TAO_CSD_Object_Adapter_Factory()"); - - - ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_Strategy_Repository); - - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h deleted file mode 100644 index 44aa1f5c73c..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file CSD_Framework_Loader.h - * - * $Id$ - * - * Header file for loading CSD framework service objects. - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - -#ifndef TAO_CSD_FRAMEWORK_LOADER_H -#define TAO_CSD_FRAMEWORK_LOADER_H -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_CSD_Framework_Loader - * - * @brief TAO_CSD_Framework_Loader. - * - * This class acts as a facade for the CSD_Framework library to the - * ORB. - */ -class TAO_CSD_FW_Export TAO_CSD_Framework_Loader -{ - public: - /// Used to force the initialization of the ORB code. - static int init (void); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_CSD_FRAMEWORK_LOADER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp deleted file mode 100644 index b67ea4bbc08..00000000000 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// $Id$ -#include "tao/CSD_Framework/CSD_ORBInitializer.h" - -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 - -ACE_RCSID (CSD_Framework, - CSD_ORBInitializer, - "$Id$") - -#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CSD_ORBInitializer::TAO_CSD_ORBInitializer () -{ -} - -void -TAO_CSD_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -void -TAO_CSD_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h deleted file mode 100644 index 8d6aa8a03e5..00000000000 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_ORBInitializer.h - * - * $Id$ - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - - -#ifndef TAO_CSD_ORB_INITIALIZER_H -#define TAO_CSD_ORB_INITIALIZER_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -//#include "tao/PortableInterceptorC.h" -#include "tao/LocalObject.h" -#include "tao/PI/ORBInitializerC.h" - -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/// CSD ORB initializer. -class TAO_CSD_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object -{ -public: - - TAO_CSD_ORBInitializer (); - - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_ORB_INITIALIZER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp deleted file mode 100644 index ed74e7c413b..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Object_Adapter.h" -#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" -#include "tao/CSD_Framework/CSD_POA.h" - -ACE_RCSID (CSD_Framework, - CSD_Object_Adapter, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter ( - const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters, - TAO_ORB_Core &orb_core) - : TAO_Object_Adapter (creation_parameters, orb_core) -{ - -} - -TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter () -{ -} - -void -TAO_CSD_Object_Adapter::do_dispatch ( - TAO_ServerRequest& req, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) -{ - TAO_Root_POA& poa = upcall.poa (); - TAO_CSD_POA* csd_poa = dynamic_cast<TAO_CSD_POA*> (&poa); - - if (csd_poa == 0) - { - ACE_THROW (CORBA::BAD_PARAM ()); - } - - TAO::CSD::Strategy_Proxy& proxy - = csd_poa->servant_dispatching_strategy_proxy (); - proxy.dispatch_request (req, upcall ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h deleted file mode 100644 index 34016654cba..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_Object_Adapter.h - * - * $Id$ - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - - -#ifndef TAO_CSD_OBJECT_ADAPTER_H -#define TAO_CSD_OBJECT_ADAPTER_H -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/Object_Adapter.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_CSD_Object_Adapter - * - * @brief Defines the CSD version Object Adapter which overrides - * default dispatch implementation. - * - * This class will be used as a facade for the CSD POAs in a server - */ -class TAO_CSD_FW_Export TAO_CSD_Object_Adapter : public TAO_Object_Adapter -{ -public: - - /// Constructor - TAO_CSD_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters, - TAO_ORB_Core &orb_core); - - /// Destructor - virtual ~TAO_CSD_Object_Adapter (void); - - /// Hand the request to the Service_Dispatching_Strategy_Proxy for - /// dispatching. - virtual void do_dispatch (TAO_ServerRequest& req, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_CSD_OBJECT_ADAPTER_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp deleted file mode 100644 index fa06817ec2c..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" -#include "tao/CSD_Framework/CSD_Strategy_Repository.h" -#include "tao/CSD_Framework/CSD_Object_Adapter.h" -#include "tao/CSD_Framework/CSD_ORBInitializer.h" -#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h" -#include "tao/ORB_Core.h" -#include "tao/ORBInitializer_Registry.h" -#include "ace/Dynamic_Service.h" - -ACE_RCSID (CSD_Framework, - CSD_Object_Adapter_Factory, - "$Id$") - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void) -{ -} - -TAO_Adapter* -TAO_CSD_Object_Adapter_Factory::create (TAO_ORB_Core *oc) -{ - // Create the CSD object adapter. - TAO_CSD_Object_Adapter *object_adapter = 0; - ACE_NEW_RETURN (object_adapter, - TAO_CSD_Object_Adapter (oc->server_factory ()-> - active_object_map_creation_parameters (), - *oc), - 0); - - // Create and register the CSD servant dispatcher. - TAO_CSD_Default_Servant_Dispatcher * csd_servant_dispatcher = 0; - ACE_NEW_RETURN (csd_servant_dispatcher, - TAO_CSD_Default_Servant_Dispatcher, - 0); - object_adapter->servant_dispatcher (csd_servant_dispatcher); - - return object_adapter; -} - -int -TAO_CSD_Object_Adapter_Factory::init (int /* argc */, - ACE_TCHAR* /* argv */ []) -{ - TAO_CSD_Strategy_Repository *repo = - ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); - - if (repo != 0) - repo->init(0,0); - - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - /// Register the Messaging ORBInitializer. - PortableInterceptor::ORBInitializer_ptr temp_orb_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - ACE_NEW_THROW_EX (temp_orb_initializer, - TAO_CSD_ORBInitializer, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; - - PortableInterceptor::ORBInitializer_var orb_initializer = - temp_orb_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); - return -1; - } - ACE_ENDTRY; - - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_DEFINE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) -ACE_STATIC_SVC_DEFINE (TAO_CSD_Object_Adapter_Factory, - ACE_TEXT ("TAO_CSD_Object_Adapter_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_CSD_Object_Adapter_Factory), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h deleted file mode 100644 index 7914266c53c..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_Object_Adapter_Factory.h - * - * $Id$ - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - - -#ifndef TAO_CSD_OBJECT_ADAPTER_FACTORY_H -#define TAO_CSD_OBJECT_ADAPTER_FACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Adapter_Factory.h" -#include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_CSD_FW_Export TAO_CSD_Object_Adapter_Factory : public TAO_Adapter_Factory -{ -public: - /// Constructor - TAO_CSD_Object_Adapter_Factory (void); - - // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for - // details. - virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); - - virtual int init (int argc, - ACE_TCHAR* argv[]); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) -ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory) - -#include /**/ "ace/post.h" -#endif /* TAO_CSD_OBJECT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp deleted file mode 100644 index fb4d9c69869..00000000000 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ /dev/null @@ -1,134 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_POA.h" -#include "tao/CSD_Framework/CSD_Strategy_Repository.h" -#include "tao/CSD_Framework/CSD_Strategy_Base.h" - -#include "ace/Dynamic_Service.h" - -ACE_RCSID (CSD_Framework, - CSD_POA, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_POA.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Implementation skeleton constructor -TAO_CSD_POA::TAO_CSD_POA (const String &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) -: TAO_Regular_POA (name, - poa_manager, - policies, - parent, - lock, - thread_lock, - orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER) -{ - ACE_NEW_THROW_EX (this->sds_proxy_, - TAO::CSD::Strategy_Proxy (), - CORBA::NO_MEMORY ()); - ACE_CHECK; -} - - -// Implementation skeleton destructor -TAO_CSD_POA::~TAO_CSD_POA (void) -{ - delete this->sds_proxy_; -} - -void TAO_CSD_POA::set_csd_strategy ( - ::CSD_Framework::Strategy_ptr strategy - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - if (CORBA::is_nil (strategy)) - { - ACE_THROW (CORBA::BAD_PARAM ()); - } - this->sds_proxy_->custom_strategy (strategy); -} - -TAO_Root_POA * -TAO_CSD_POA::new_POA (const String &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) -{ - TAO_CSD_POA *poa = 0; - - ACE_NEW_THROW_EX (poa, - TAO_CSD_POA (name, - poa_manager, - policies, - parent, - lock, - thread_lock, - orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - - TAO_CSD_Strategy_Repository *repo = - ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); - - - CSD_Framework::Strategy_var strategy = repo->find (name); - - if (! CORBA::is_nil (strategy.in ())) - { - poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - } - - return poa; -} - -void TAO_CSD_POA::poa_activated_hook () -{ - this->sds_proxy_->poa_activated_event (); -} - -void TAO_CSD_POA::poa_deactivated_hook () -{ - this->sds_proxy_->poa_deactivated_event (); -} - -void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - this->sds_proxy_->servant_activated_event (servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - this->sds_proxy_->servant_deactivated_event (servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h deleted file mode 100644 index 7bf2c338e0d..00000000000 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ /dev/null @@ -1,111 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_POA.h - * - * $Id$ - * - * @author Yan Dai (dai_y@ociweb.com) - */ -//============================================================================= - -#ifndef TAO_CSD_POA_H -#define TAO_CSD_POA_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/Regular_POA.h" -#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_CSD_POA - * - * @brief Implementation of the CSD_Framework::POA interface. - * - * Implementation of the CSD_Framework::POA interface. - */ -class TAO_CSD_FW_Export TAO_CSD_POA - : public virtual CSD_Framework::POA, - public virtual TAO_Regular_POA -{ -public: - //Constructor - TAO_CSD_POA (const String &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); - - //Destructor - virtual ~TAO_CSD_POA (void); - - /// Pass the Strategy object reference to the CSD poa. - virtual - void set_csd_strategy ( - ::CSD_Framework::Strategy_ptr s - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - /// Hook - The POA has been (or is being) activated. - virtual void poa_activated_hook (); - - /// Hook - The POA has been deactivated. - virtual void poa_deactivated_hook (); - - /// Hook - A servant has been activated. - virtual void servant_activated_hook (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// Hook - A servant has been deactivated. - virtual void servant_deactivated_hook (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - ///Method for creating new CSD POA. - TAO_Root_POA * new_POA (const String &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL); - - /// Servant Dispatching Strategy proxy accessor. - TAO::CSD::Strategy_Proxy& - servant_dispatching_strategy_proxy (void) const; - -private: - - TAO::CSD::Strategy_Proxy* sds_proxy_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - - -#if defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_POA.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_POA_H */ - diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl deleted file mode 100644 index 5e94cf5401e..00000000000 --- a/TAO/tao/CSD_Framework/CSD_POA.inl +++ /dev/null @@ -1,14 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::Strategy_Proxy& -TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const -{ - return *sds_proxy_; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp deleted file mode 100644 index aa641fe9bc7..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ /dev/null @@ -1,132 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Strategy_Base.h" -#include "tao/CSD_Framework/CSD_POA.h" -#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/POAManager.h" -#include "tao/PortableServer/Servant_Base.h" -#include "tao/TAO_Server_Request.h" - -ACE_RCSID (CSD_Framework, - CSD_Strategy_Base, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_Strategy_Base.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::Strategy_Base::~Strategy_Base() -{ -} - -CORBA::Boolean -TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - if (CORBA::is_nil(poa)) - { - if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, - ACE_TEXT("(%P|%t) CSD Strategy cannot ") - ACE_TEXT("be applied to a nil POA.\n"))); - return false; - } - - if (!CORBA::is_nil(this->poa_.in())) - { - if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, - ACE_TEXT("(%P|%t) CSD Strategy already ") - ACE_TEXT("applied to a POA.\n"))); - return false; - } - - // The POA is a local interface (IDL terminology), and thus we know that - // we can downcast the POA_ptr to its (TAO) implementation type. - TAO_CSD_POA* poa_impl = dynamic_cast<TAO_CSD_POA*>(poa); - - if (poa_impl == 0) - { - if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, - ACE_TEXT("(%P|%t) CSD Strategy cannot ") - ACE_TEXT("be applied to a non CSD POA.\n"))); - return false; - } - - // We need to check to see if the POA is already "active". If this is - // the case, then we need to handle the poa_activated_event() right now. - // If the POA is not already "active", then we can just wait until it - // does get activated, and we (the strategy) will be informed of the - // poa_activated_event() at that time. - if (poa_impl->tao_poa_manager().get_state() == - PortableServer::POAManager::ACTIVE) - { - // The POA is already "active" (since its POAManager is active). - // We need to "raise" the poa_activated_event() now. Otherwise, - // the event will be raised when the POAManager does become active. - if (!this->poa_activated_event()) - { - // An error has been already been reported to the log with - // the detailed reason for the failure to handle the event. - return false; - } - } - - // Set the CSD Strategy_Base on the strategy proxy object owned by the POA. - bool strategy_set = false; - ACE_TRY_NEW_ENV - { - poa_impl->set_csd_strategy (this ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - strategy_set = true; - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - - if (! strategy_set) - { - // We need to make sure that we raise a poa_deactivated_event() if - // we earlier raised a poa_activated_event(). - this->poa_deactivated_event(); - - // An error has been already been reported to the log with - // the detailed reason why the proxy will not accept the - // custom strategy. - return false; - } - - // Save a duplicate of the poa into our data member. - this->poa_ = PortableServer::POA::_duplicate (poa); - - // Success - return true; -} - - -void -TAO::CSD::Strategy_Base::servant_activated_event_i - (PortableServer::Servant , - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) -{ - // do nothing. -} - - -void -TAO::CSD::Strategy_Base::servant_deactivated_event_i - (PortableServer::Servant, - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) -{ - // do nothing. -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h deleted file mode 100644 index d65753a27f7..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ /dev/null @@ -1,174 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_Strategy_Base.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_FW_CUSTOM_SERVANT_DISPATCHING_STRATEGY_H -#define TAO_CSD_FW_CUSTOM_SERVANT_DISPATCHING_STRATEGY_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/Servant_Base.h" -#include "tao/TAO_Server_Request.h" -#include "tao/LocalObject.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_Framework/CSD_FrameworkC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Root_POA; -namespace PortableServer -{ - class POAManager; -} - -namespace TAO -{ - namespace CSD - { - /** - * @class Strategy_Base - * - * @brief Base class for all Custom Servant Dispatching Strategies. - * - * This class serves as the base class for all "custom" strategies that - * perform servant dispatching. An instance of (a subclass of) this class - * can be applied to a POA object. Any servant requests for the POA will - * be "dispatched" to this strategy object. - * - */ - class TAO_CSD_FW_Export Strategy_Base - : public CSD_Framework::Strategy, - public TAO_Local_RefCounted_Object - { - public: - - /// Result Type for dispatching method(s). - enum DispatchResult - { - // The request dispatching has been handled. - DISPATCH_HANDLED, - - // The request dispatching has been rejected. - DISPATCH_REJECTED, - - // Defer to "default" dispatching strategy (use the caller's thread). - DISPATCH_DEFERRED - }; - - /// Virtual Destructor. - virtual ~Strategy_Base(); - - /// This method is invoked to "attach" this strategy object to - /// the supplied POA. Returns true for success, and false for failure. - CORBA::Boolean apply_to(PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) - ACE_THROW_SPEC((CORBA::SystemException)); - - protected: - /// Default Constructor. - Strategy_Base(); - - /// Subclass provides implementation to dispatch a remote request. - virtual DispatchResult dispatch_remote_request_i - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant - ACE_ENV_ARG_DECL) = 0; - - /// Subclass provides implementation to dispatch a collocated request. - virtual DispatchResult dispatch_collocated_request_i - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant - ACE_ENV_ARG_DECL) = 0; - - /// Event - The POA has been activated. - virtual bool poa_activated_event_i() = 0; - - /// Event - The POA has been deactivated. - virtual void poa_deactivated_event_i() = 0; - - /// Event - A servant has been activated. - virtual void servant_activated_event_i - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// Event - A servant has been deactivated. - virtual void servant_deactivated_event_i - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - private: - - /// Only our friend, the proxy, is allowed to invoke our private operations. - /// This allows us to not pollute the public interface of the CSD Strategy_Base - /// subclasses with methods that should never be called (except by the - /// proxy, of course). - friend class Strategy_Proxy; - - /// This CSD Strategy_Base has been asked to dispatch a (collocated or remote) - /// request. - void dispatch_request(TAO_ServerRequest& server_request, - ::TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); - - /// Event - The POA has been activated. This happens when the POA_Manager - /// is activated. - bool poa_activated_event(); - - /// Event - The POA has been deactivated. This happens when the - /// POAManager is deactivated, or when the POA is destroyed. - void poa_deactivated_event(); - - /// Event - A servant has been activated. - void servant_activated_event(PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// Event - A servant has been deactivated. This also occurs when - /// the POA is destroyed. - void servant_deactivated_event(PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// The POA to which this strategy has been applied. - ::PortableServer::POA_var poa_; - - /// This flag indicates that the POA is currently active (true) or - /// currently inactive (false). - bool poa_activated_; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_Strategy_Base.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_FW_CUSTOM_SERVANT_DISPATCHING_STRATEGY_H */ diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl deleted file mode 100644 index 6dce0cf7397..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl +++ /dev/null @@ -1,144 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#include "tao/debug.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::Strategy_Base::Strategy_Base() - : poa_activated_(false) -{ -} - -ACE_INLINE -void -TAO::CSD::Strategy_Base::dispatch_request - (TAO_ServerRequest& server_request, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) -{ - DispatchResult result; - - if (server_request.collocated()) - { - result = this->dispatch_collocated_request_i(server_request, - upcall.user_id(), - this->poa_.in(), - server_request.operation(), - upcall.servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - else - { - result = this->dispatch_remote_request_i(server_request, - upcall.user_id(), - this->poa_.in(), - server_request.operation(), - upcall.servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - switch (result) - { - case DISPATCH_HANDLED: - // Do nothing. Everything has been handled. - break; - - case DISPATCH_REJECTED: - if (server_request.collocated ()) - { - CORBA::NO_IMPLEMENT ex; - ex._raise (); - } - else - { - // Raise an appropriate SystemException if the request is expecting - // a reply. - if (!server_request.sync_with_server() && - server_request.response_expected() && - !server_request.deferred_reply()) - { - CORBA::NO_IMPLEMENT ex; - server_request.tao_send_reply_exception(ex); - } - } - break; - - case DISPATCH_DEFERRED: - // Perform the "default" dispatching strategy logic for this request - // right now, using the current thread. - upcall.servant()->_dispatch(server_request, - (void*)&upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - break; - - default: - if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, - ACE_TEXT("(%P|%t) Unknown result (%d) from call to ") - ACE_TEXT("dispatch_remote_request_i().\n"), result)); - // Since we do not know what to do here, just do the minimum, which - // treats this case just like the DISPATCH_HANDLED case, for better - // or worse. Hitting this default case means a coding error. - break; - } -} - - -ACE_INLINE -bool -TAO::CSD::Strategy_Base::poa_activated_event() -{ - // Notify the subclass of the event, saving the result. - this->poa_activated_ = this->poa_activated_event_i(); - - // Return the result - return this->poa_activated_; -} - -ACE_INLINE -void -TAO::CSD::Strategy_Base::poa_deactivated_event() -{ - if (this->poa_activated_) - { - this->poa_activated_ = false; - - // Notify the subclass of the event. - this->poa_deactivated_event_i(); - - // Reset the poa to nil to decrement the reference count. - // This will break the circular dependency of the deletion - // of the CSD POA. - this->poa_ = 0; - } -} - -ACE_INLINE -void -TAO::CSD::Strategy_Base::servant_activated_event - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - this->servant_activated_event_i(servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -ACE_INLINE -void -TAO::CSD::Strategy_Base::servant_deactivated_event - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - this->servant_deactivated_event_i(servant, oid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp deleted file mode 100644 index b163134be56..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" -#include "tao/TAO_Server_Request.h" -#include "tao/debug.h" - -ACE_RCSID (CSD_Framework, - CSD_Strategy_Base, - "$Id$") - - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -bool -TAO::CSD::Strategy_Proxy::custom_strategy - (CSD_Framework::Strategy_ptr strategy) -{ - if (this->strategy_impl_) - { - if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, - ACE_TEXT("(%P|%t) Error - TAO::CSD::Strategy_Proxy ") - ACE_TEXT("object already has a custom strategy.\n"))); - - return false; - } - - if (CORBA::is_nil(strategy)) - { - if (TAO_debug_level > 0) - ACE_ERROR((LM_ERROR, - ACE_TEXT("(%P|%t) Error - TAO::CSD::Strategy_Proxy ") - ACE_TEXT("supplied with a NIL custom strategy.\n"))); - - return false; - } - - // We need to bump up the reference count of the strategy before saving - // it off into our handle (smart pointer) data member. - this->strategy_ = CSD_Framework::Strategy::_duplicate(strategy); - this->strategy_impl_ = dynamic_cast <TAO::CSD::Strategy_Base*> (strategy); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h deleted file mode 100644 index 959a7cb9ebb..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h +++ /dev/null @@ -1,114 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_Strategy_Proxy.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_SERVANT_DISPATCHING_STRATEGY_PROXY_H -#define TAO_SERVANT_DISPATCHING_STRATEGY_PROXY_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" - -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Upcall.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_Framework/CSD_Strategy_Base.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_ServerRequest; - -namespace TAO -{ - namespace CSD - { - /** - * @class Strategy_Proxy - * - * @brief Proxy class for the Custom Servant Dispatching Strategy. - * - * If no custom servant dispatching strategy is provided to the proxy, - * then the "default servant dispatching strategy" logic is used. - */ - class TAO_CSD_FW_Export Strategy_Proxy - { - public: - - /// Default Constructor. - Strategy_Proxy(); - - /// Destructor. - ~Strategy_Proxy(); - - /// Mutator to provide the proxy with a CSD Strategy object. - /// A return value of true indicates success, and false indicates - /// failure to set the custom strategy on the proxy object. - bool custom_strategy(CSD_Framework::Strategy_ptr strategy); - - /// Invoked by the Object_Adapter using an ORB thread. - /// - /// If the proxy object holds a custom strategy object, then this method - /// will simply delegate to the custom strategy object. Otherwise, - /// this method will perform the "default servant dispatching strategy" - /// logic, preserving the original logic path as it was prior to the - /// introduction of the Custom Servant Dispatching feature. - /// - /// This method will be inlined (if inlining is turned on during the build). - /// - /// The added cost to the original logic path will be this method - /// invocation + one conditional (an is_nil() call/comparison for truth on - /// the smart pointer to the custom dispatching strategy object). - void dispatch_request(TAO_ServerRequest& server_request, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); - - - /// Event - The POA has been (or is being) activated. - bool poa_activated_event(); - - /// Event - The POA has been deactivated. - void poa_deactivated_event(); - - /// Event - A servant has been activated. - void servant_activated_event(PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// Event - A servant has been deactivated. - void servant_deactivated_event(PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - private: - - /// Smart Pointer to a custom servant dispatching strategy object. - /// This smart pointer will be in the "nil" state when the "default" - /// strategy is to be applied. - CSD_Framework::Strategy_var strategy_; - TAO::CSD::Strategy_Base *strategy_impl_; - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl deleted file mode 100644 index 957852e6517..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl +++ /dev/null @@ -1,104 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::Strategy_Proxy::Strategy_Proxy() - : strategy_impl_(0) -{ -} - -ACE_INLINE -TAO::CSD::Strategy_Proxy::~Strategy_Proxy() -{ - strategy_impl_ = 0; // don't delete it! The var will do it for us. -} - -ACE_INLINE -void -TAO::CSD::Strategy_Proxy::dispatch_request - (TAO_ServerRequest& server_request, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) -{ - - if (this->strategy_impl_ == 0) - { - // This is the "default" strategy implementation. - upcall.servant()->_dispatch(server_request, - (void*)&upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - else - { - // Delegate to the custom strategy object. - this->strategy_impl_->dispatch_request(server_request, - upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } -} - -ACE_INLINE -bool -TAO::CSD::Strategy_Proxy::poa_activated_event() -{ - // Delegate to the custom strategy object (or return true if this proxy - // is not holding a custom strategy). - return (this->strategy_impl_ == 0) ? true - : this->strategy_impl_->poa_activated_event(); -} - - -ACE_INLINE -void -TAO::CSD::Strategy_Proxy::poa_deactivated_event() -{ - // We only need to do something if this proxy holds a custom strategy. - if (this->strategy_impl_) - { - // Delegate to the custom strategy object. - this->strategy_impl_->poa_deactivated_event(); - } -} - -ACE_INLINE -void -TAO::CSD::Strategy_Proxy::servant_activated_event - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - // We only need to do something if this proxy holds a custom strategy. - if (this->strategy_impl_) - { - // Delegate to the custom strategy object. - this->strategy_impl_->servant_activated_event(servant, - oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } -} - -ACE_INLINE -void -TAO::CSD::Strategy_Proxy::servant_deactivated_event - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - // We only need to do something if this proxy holds a custom strategy. - if (this->strategy_impl_) - { - // Delegate to the custom strategy object. - this->strategy_impl_->servant_deactivated_event(servant, - oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp deleted file mode 100644 index 5a169516bf5..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// $Id$ - -#include "tao/CSD_Framework/CSD_Strategy_Repository.h" -#include "tao/debug.h" - -ACE_RCSID (CSD_Framework, - CSD_Strategy_Factory, - "$Id$") - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_CSD_Strategy_Repository::TAO_CSD_Strategy_Repository() -{ -} - - -TAO_CSD_Strategy_Repository::~TAO_CSD_Strategy_Repository() -{ - delete this->strategy_list_head_; -} - -int -TAO_CSD_Strategy_Repository::init(int, ACE_TCHAR **) -{ - - static int initialized = 0; - - // Only allow initialization once. - if (initialized) - return 0; - - initialized = 1; - this->strategy_list_head_ = 0; - return 0; -} - -CSD_Framework::Strategy_ptr -TAO_CSD_Strategy_Repository::find (const ACE_CString& name) -{ - - if (this->strategy_list_head_ != 0) - { - Strategy_Node *node = this->strategy_list_head_->find(name); - if (node != 0) - return CSD_Framework::Strategy::_duplicate (node->strategy_.in()); - } - - return CSD_Framework::Strategy::_nil(); -} - - -int -TAO_CSD_Strategy_Repository::add_strategy (const ACE_CString& name, - CSD_Framework::Strategy_ptr strat) -{ - Strategy_Node *node = 0; - ACE_NEW_RETURN (node, Strategy_Node(name,strat),-1); - if (this->strategy_list_head_ == 0) - this->strategy_list_head_ = node; - else - this->strategy_list_head_->add_node(node); - - if (TAO_debug_level > 3) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Strategy_Repository::add_strategy for %s \n"), - name.c_str ())); - } - return 0; -} - -TAO_CSD_Strategy_Repository::Strategy_Node::Strategy_Node (const ACE_CString& name, - CSD_Framework::Strategy_ptr strat) - : poa_name_(name), - strategy_(CSD_Framework::Strategy::_duplicate(strat)), - next_(0) -{ -} - -TAO_CSD_Strategy_Repository::Strategy_Node::~Strategy_Node () -{ - if (this->next_) - delete this->next_; -} - -void -TAO_CSD_Strategy_Repository::Strategy_Node::add_node(Strategy_Node *node) -{ - if (this->next_) - this->next_->add_node(node); - else - this->next_ = node; -} - -TAO_CSD_Strategy_Repository::Strategy_Node * -TAO_CSD_Strategy_Repository::Strategy_Node::find(const ACE_CString &name) -{ - if (this->poa_name_ == name) - return this; - if (this->next_) - return this->next_->find(name); - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -///////////////////////////////////////////////////////////////////// - -ACE_FACTORY_DEFINE (TAO_CSD_FW, TAO_CSD_Strategy_Repository) -ACE_STATIC_SVC_DEFINE (TAO_CSD_Strategy_Repository, - ACE_TEXT ("TAO_CSD_Strategy_Repository"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_CSD_Strategy_Repository), - ACE_Service_Type::DELETE_THIS - | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h deleted file mode 100644 index 7e50fe5f62f..00000000000 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_Strategy_Repository.h - * - * $Id$ - * - * @author Yan Dai <dai_y@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_STRATEGY_FACTORY_H -#define TAO_CSD_STRATEGY_FACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_Framework/CSD_FW_Export.h" -#include "tao/CSD_Framework/CSD_FrameworkC.h" -#include "ace/Service_Object.h" -#include "ace/Service_Config.h" -#include "ace/Synch.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_CSD_Strategy_Factory - * - * @brief An ACE_Service_Object capable of creating TP_Strategy objects. - * - * TBD - Explain in more detail. - * - */ -class TAO_CSD_FW_Export TAO_CSD_Strategy_Repository : public ACE_Service_Object -{ -public: - - /// Constructor. - TAO_CSD_Strategy_Repository(); - - /// Virtual Destructor. - virtual ~TAO_CSD_Strategy_Repository(); - - int init (int argc, ACE_TCHAR ** argv); - - /// Factory method used to create a CSD_Strategy object. - CSD_Framework::Strategy_ptr find (const ACE_CString& poa_name); - - int add_strategy (const ACE_CString& poa_name, - CSD_Framework::Strategy_ptr strategy); - -private: - struct Strategy_Node { - Strategy_Node(const ACE_CString& poa_name, - CSD_Framework::Strategy_ptr strategy); - ~Strategy_Node(); - void add_node (Strategy_Node *); - Strategy_Node *find(const ACE_CString& name); - - ACE_CString poa_name_; - CSD_Framework::Strategy_var strategy_; - Strategy_Node * next_; - }; - Strategy_Node * strategy_list_head_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Strategy_Repository) -ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Strategy_Repository) - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_STRATEGY_FACTORY_H */ diff --git a/TAO/tao/CSD_Framework/TAO_CSD_Framework.pc.in b/TAO/tao/CSD_Framework/TAO_CSD_Framework.pc.in deleted file mode 100644 index bef4a93f175..00000000000 --- a/TAO/tao/CSD_Framework/TAO_CSD_Framework.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_CSD_Framework -Description: TAO CSD Framework Library -Requires: TAO_PortableServer, TAO_PI, TAO -Version: @VERSION@ -Libs: -L${libdir} -lTAO -Cflags: -I${includedir} diff --git a/TAO/tao/CSD_Framework/diffs/CSD_Framework.diff b/TAO/tao/CSD_Framework/diffs/CSD_Framework.diff deleted file mode 100644 index bfbc5679c5c..00000000000 --- a/TAO/tao/CSD_Framework/diffs/CSD_Framework.diff +++ /dev/null @@ -1,84 +0,0 @@ ---- orig/CSD_FrameworkC.h 2005-10-20 11:20:03.234375000 -0700 -+++ CSD_FrameworkC.h 2005-10-20 11:26:07.578125000 -0700 -@@ -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: -@@ -47,7 +47,7 @@ - #include "tao/Object.h" - #include "tao/Objref_VarOut_T.h" - --#include "tao/PortableServer/PortableServerC.h" -+#include "tao/PortableServer/PortableServer.h" - - #if defined (TAO_EXPORT_MACRO) - #undef TAO_EXPORT_MACRO -@@ -305,13 +305,6 @@ - #endif /* end #if !defined */ - } - --// TAO_IDL - Generated from --// .\be\be_codegen.cpp:1040 -- --#if defined (__ACE_INLINE__) --#include "CSD_FrameworkC.inl" --#endif /* defined INLINE */ -- - #include /**/ "ace/post.h" - - #endif /* ifndef */ ---- orig/CSD_FrameworkC.cpp 2005-10-20 11:20:03.234375000 -0700 -+++ CSD_FrameworkC.cpp 2005-10-20 11:22:19.171875000 -0700 -@@ -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: -@@ -33,9 +33,6 @@ - #include "tao/CDR.h" - #include "ace/OS_NS_string.h" - --#if !defined (__ACE_INLINE__) --#include "CSD_FrameworkC.inl" --#endif /* !defined INLINE */ - - // TAO_IDL - Generated from - // .\be\be_visitor_arg_traits.cpp:70 ---- orig/CSD_FrameworkA.h 2005-10-20 11:20:03.250000000 -0700 -+++ CSD_FrameworkA.h 2005-10-20 11:26:42.359375000 -0700 -@@ -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: -@@ -34,8 +34,8 @@ - #include /**/ "ace/pre.h" - - #include "CSD_FW_Export.h" --#include "tao/orig/CSD_FrameworkC.h" --#include "tao/PortableServer/PortableServerA.h" -+#include "CSD_FrameworkC.h" -+//#include "tao/PortableServer/PortableServerA.h" - - - // TAO_IDL - Generated from ---- orig/CSD_FrameworkA.cpp 2005-10-20 11:20:03.234375000 -0700 -+++ CSD_FrameworkA.cpp 2005-10-20 11:23:07.562500000 -0700 -@@ -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: diff --git a/TAO/tao/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool.mpc deleted file mode 100644 index 67be4b9bf00..00000000000 --- a/TAO/tao/CSD_ThreadPool.mpc +++ /dev/null @@ -1,38 +0,0 @@ -//$Id$ -project : csd_framework, core { - sharedname = TAO_CSD_ThreadPool - dynamicflags = TAO_CSD_TP_BUILD_DLL - includes += $(TAO_ROOT)/tao - - Source_Files { - CSD_ThreadPool - } - - Header_Files { - CSD_ThreadPool - } - - Inline_Files { - CSD_ThreadPool - } - - Template_Files { - CSD_ThreadPool - } - - Resource_Files { - CSD_ThreadPool - } - - IDL_Files { - CSD_ThreadPool - } - - PIDL_Files { - CSD_ThreadPool - } - - Pkgconfig_Files { - CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - } -} diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp deleted file mode 100644 index 35b6b316012..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h" -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" - -ACE_RCSID (CSD_TP, - Cancel_Visitor, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl" -#endif /* ! __ACE_INLINE__ */ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Cancel_Visitor::~TP_Cancel_Visitor() -{ -} - - -bool -TAO::CSD::TP_Cancel_Visitor::visit_request(TP_Request* request, - bool& remove_flag) -{ - // If our servant_ data member is in the 'nil' state, then - // we are supposed to cancel *ALL* requests that we visit. - // - // Otherwise, if our servant_ data member is not in the 'nil' state, - // we are supposed to cancel only requests that target our specific - // servant_. - - if ((this->servant_.in() == 0) || (request->is_target(this->servant_.in()))) - { - // Set the remove_flag to true so that this request is removed - // (and released) from the queue when we finish our visit. - remove_flag = true; - - // Cancel the request - request->cancel(); - } - - // Since we are either cancelling requests to any servant or a - // specific servant, always continue visitation. - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h deleted file mode 100644 index d9b2472e507..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h +++ /dev/null @@ -1,87 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Cancel_Visitor.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_CANCEL_VISITOR_H -#define TAO_CSD_TP_CANCEL_VISITOR_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" -#include "tao/PortableServer/Servant_Base.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - /** - * @class TP_Cancel_Visitor - * - * @brief Used to extract/cancel request(s) from the queue. - * - * This visitor is used to cancel certain requests in the queue - * as they are visited. - * - * Note that this is currently implemented to cancel *all* - * requests in the queue, or requests that are targeted for a specific - * servant. This could be extended in the future to perhaps - * cancel all requests that have the same operation name, or something - * else. - * - */ - class TAO_CSD_TP_Export TP_Cancel_Visitor : public TP_Queue_Visitor - { - public: - - /// Default Constructor - cancel *all* requests. - TP_Cancel_Visitor(); - - /// Constructor with provided servant - cancel requests that - /// target the supplied servant. - TP_Cancel_Visitor(PortableServer::Servant servant); - - /// Virtual Destructor. - virtual ~TP_Cancel_Visitor(); - - /// Returns true to continue visitation. Returns false to stop - /// visitation. Sets the remove_flag to true if the request should - /// be removed from the queue as a result of the visit. Leaves the - /// remove_flag alone otherwise. - virtual bool visit_request(TP_Request* request, bool& remove_flag); - - private: - - /// Left as nil if we are to cancel all requests, or set to a specific - /// servant if only requests targeting that servant should be cancelled. - PortableServer::ServantBase_var servant_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_DISPATCHABLE_VISITOR_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl deleted file mode 100644 index e1602e2dde3..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor() -{ -} - - -ACE_INLINE -TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant) - : servant_(servant) -{ - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception - // then this constructor needs deal with the exception. - ACE_TRY_NEW_ENV - { - this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHALL - { - } - ACE_ENDTRY; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp deleted file mode 100644 index 0e4c596f682..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Collocated_Asynch_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl" -#endif /* ! __ACE_INLINE__ */ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Collocated_Asynch_Request::~TP_Collocated_Asynch_Request() -{ -} - - -void -TAO::CSD::TP_Collocated_Asynch_Request::prepare_for_queue_i() -{ - this->do_clone(); -} - - -void -TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i() -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#endif - ACE_ENDTRY; -} - -void -TAO::CSD::TP_Collocated_Asynch_Request::cancel_i() -{ - this->do_cancel(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h deleted file mode 100644 index 6cfa149f73a..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h +++ /dev/null @@ -1,90 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Collocated_Asynch_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_COLLOCATED_ASYNCH_REQUEST_H -#define TAO_CSD_TP_COLLOCATED_ASYNCH_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Collocated_Asynch_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Asynch_Request> - TP_Collocated_Asynch_Request_Handle; - - /** - * @class TP_Collocated_Asynch_Request - * - * @brief Represents a "queue-able", collocated, asynchronous, - * CORBA request. - * - * This kind request is one-way collocated request with the default - * SYNC_SCOPE policy (SYNC_WITH_TRANSPORT) applied. It is cloned - * before enqueuing and the "enqueuing" thread never blocks. - */ - class TAO_CSD_TP_Export TP_Collocated_Asynch_Request - : public TP_Corba_Request - { - public: - - /// Constructor. - TP_Collocated_Asynch_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state); - - /// Virtual Destructor. - virtual ~TP_Collocated_Asynch_Request(); - - - protected: - - /// Prepare this TP_Collocated_Asynch_Request object to be placed - /// into the request queue. This will cause the underlying - /// TAO_ServerRequest object to be cloned. - virtual void prepare_for_queue_i(); - - /// Dispatch the request to the servant. - virtual void dispatch_i(); - - /// Cancel the request. - virtual void cancel_i(); - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_COLLOCATED_ASYNCH_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl deleted file mode 100644 index d44f0bc56dd..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl +++ /dev/null @@ -1,24 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Collocated_Asynch_Request::TP_Collocated_Asynch_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state) - : TP_Corba_Request(object_id, - poa, - operation, - servant, - servant_state, - server_request) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp deleted file mode 100644 index 31c6c32e1a7..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Collocated_Synch_Request, - "$Id$") - -#include "tao/ORB_Core.h" - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Collocated_Synch_Request::~TP_Collocated_Synch_Request() -{ -} - - -void -TAO::CSD::TP_Collocated_Synch_Request::dispatch_i() -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // We need to save off a copy of the exception. - this->exception_ = ACE_ANY_EXCEPTION._tao_duplicate(); - } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL - { - this->exception_ - = new CORBA::UNKNOWN (CORBA::SystemException::_tao_minor_code - (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0), - CORBA::COMPLETED_MAYBE); - } -#endif - ACE_ENDTRY; - - this->synch_helper_.dispatched(); -} - -void -TAO::CSD::TP_Collocated_Synch_Request::cancel_i() -{ - this->synch_helper_.cancelled(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h deleted file mode 100644 index cad5fa52bd5..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h +++ /dev/null @@ -1,109 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Collocated_Synch_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_COLLOCATED_SYNCH_REQUEST_H -#define TAO_CSD_TP_COLLOCATED_SYNCH_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" -#include "tao/Exception.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Collocated_Synch_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Synch_Request> - TP_Collocated_Synch_Request_Handle; - - /** - * @class TP_Collocated_Synch_Request - * - * @brief Represents a "queue-able", synchronous, collocated, - * CORBA request. - * - * This kind request is the two-way or oneway(with SYNC_WITH_TARGET - * policy applied) collocated request. It is NOT cloned before - * enqueuing and the "enqueuing" thread will block until the request - * is dispatched/handled or cancelled. - */ - class TAO_CSD_TP_Export TP_Collocated_Synch_Request - : public TP_Corba_Request - { - public: - - /// Constructor. - TP_Collocated_Synch_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state); - - /// Virtual Destructor. - virtual ~TP_Collocated_Synch_Request(); - - /// Wait until the request has been dispatched (and completed), or - /// until it has been cancelled. - /// Returns true if the request has been dispatched, and returns - /// false if the request has been cancelled. - bool wait(ACE_ENV_SINGLE_ARG_DECL); - - - protected: - - /// Note that we do not override our base class implementation of - /// prepare_for_queue_i() (which does nothing), because we don't - /// need to clone the Server Request object. - - /// Dispatch the request to the servant. - virtual void dispatch_i(); - - /// Cancel the request. - virtual void cancel_i(); - - - private: - - /// Helper used to block and unblock the thread that invokes our - /// wait() method. - TP_Synch_Helper synch_helper_; - - /// Set to NULL initially, and will only be set thereafter if an - /// exception is raised from the dispatch() call on the server_request_. - CORBA::Exception* exception_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_COLLOCATED_SYNCH_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl deleted file mode 100644 index c92dfe4719f..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl +++ /dev/null @@ -1,59 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#include "ace/Auto_Ptr.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state) - : TP_Corba_Request(object_id, - poa, - operation, - servant, - servant_state, - server_request), - exception_(0) -{ -} - - -ACE_INLINE -bool -TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL) -{ - bool dispatched = this->synch_helper_.wait_while_pending(); - - if (dispatched) - { - // Check to see if the dispatching caused an exception to be raised. - if (this->exception_ != 0) - { - // An exception was raised during the actual dispatching to - // the servant. We need to raise the exception to our caller, - // which is the thread that made the collocated request in the - // first place. - CORBA::Exception* ex = this->exception_; - this->exception_ = 0; - -#if defined (TAO_HAS_EXCEPTIONS) - ACE_Auto_Basic_Ptr<CORBA::Exception> ex_holder(ex); - ex->_raise (); -#else - ACE_TRY_ENV.exception (ex); -#endif /* ACE_HAS_EXCEPTIONS */ - } - } - - return dispatched; - -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp deleted file mode 100644 index 70f43c863c7..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Collocated_Synch_With_Server_Request, - "$Id$") - -#include "tao/Exception.h" - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Collocated_Synch_With_Server_Request::~TP_Collocated_Synch_With_Server_Request() -{ -} - - -void -TAO::CSD::TP_Collocated_Synch_With_Server_Request::prepare_for_queue_i() -{ - // NOTE: We *NEED* clone the TAO_ServerRequest for a collocated, - // one-way SYNC_WITH_SERVER request. This is because the - // calling thread is signalled just *before* the request is - // dispatched. It's (very) possible that the calling thread - // will destroy the underlying TAO_ServerRequest object while - // the request is dispatching to servant. This is why we make - // a clone - so that we have our own copy that won't be destroyed - // while we are using it. - this->do_clone(); -} - - -void -TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i() -{ - // This is done *before* we do_dispatch(). - this->synch_helper_.dispatched(); - - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#endif - ACE_ENDTRY; -} - -void -TAO::CSD::TP_Collocated_Synch_With_Server_Request::cancel_i() -{ - this->synch_helper_.cancelled(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h deleted file mode 100644 index 0b54d87ed06..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h +++ /dev/null @@ -1,110 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Collocated_Synch_With_Server_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_COLLOCATED_SYNCH_WITH_SERVER_REQUEST_H -#define TAO_CSD_TP_COLLOCATED_SYNCH_WITH_SERVER_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Collocated_Synch_With_Server_Request; - typedef TAO_Intrusive_Ref_Count_Handle - <TP_Collocated_Synch_With_Server_Request> - TP_Collocated_Synch_With_Server_Request_Handle; - - /** - * @class TP_Collocated_Synch_With_Server_Request - * - * @brief Represents a "queue-able", one-way, collocated, CORBA - * request with a "Synch Scope" policy of SYNC_WITH_SERVER. - * - * This kind of request is one-way request with the SYNC_WITH_SERVER - * policy applied. It is cloned before enqueuing and the "enqueuing" - * thread will block until it is signalled by the TP_Task thread that - * will happen just before the request is dispatched or the request - * is cancelled. - */ - class TAO_CSD_TP_Export TP_Collocated_Synch_With_Server_Request - : public TP_Corba_Request - { - public: - - /// Constructor. - TP_Collocated_Synch_With_Server_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state); - - /// Virtual Destructor. - virtual ~TP_Collocated_Synch_With_Server_Request(); - - /// Wait until the request has been dispatched (but not completed), or - /// until it has been cancelled. Note that this will wait until just - /// *before* the request is dispatched by a worker thread. This is - /// different than the TP_Collocated_Synch_Request which waits until - /// just *after* the request is dispatched by a worker thread. - /// Returns true if the request has been dispatched, and returns - /// false if the request has been cancelled. - bool wait(ACE_ENV_SINGLE_ARG_DECL); - - - protected: - - /// Prepare this TP_Collocated_Synch_With_Server_Request object to be - /// placed into the request queue. This will cause the underlying - /// TAO_ServerRequest object to be cloned. - virtual void prepare_for_queue_i(); - - /// Dispatch the request to the servant. - virtual void dispatch_i(); - - /// Cancel the request. - virtual void cancel_i(); - - - private: - - /// Helper used to block and unblock the thread that invokes our - /// wait() method. - TP_Synch_Helper synch_helper_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_COLLOCATED_SYNCH_WITH_SERVER_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl deleted file mode 100644 index 1ff0407d6fd..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl +++ /dev/null @@ -1,32 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Server_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state) - : TP_Corba_Request(object_id, - poa, - operation, - servant, - servant_state, - server_request) -{ -} - - -ACE_INLINE -bool -TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -{ - return this->synch_helper_.wait_while_pending(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp deleted file mode 100644 index ff2aa4709c9..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Corba_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Corba_Request::~TP_Corba_Request() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h deleted file mode 100644 index 2e0a6c7996f..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h +++ /dev/null @@ -1,103 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Corba_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_CORBA_REQUEST_H -#define TAO_CSD_TP_CORBA_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" -#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Base.h" -#include "ace/SString.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Corba_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Corba_Request> - TP_Corba_Request_Handle; - - /** - * @class TP_Corba_Request - * - * @brief Base class for "queue-able" CORBA requests. - * - * TBD - Add description - * - */ - class TAO_CSD_TP_Export TP_Corba_Request : public TP_Request - { - public: - - /// Virtual Destructor. - virtual ~TP_Corba_Request(); - - - protected: - - /// Constructor. - TP_Corba_Request(const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state, - TAO_ServerRequest& server_request); - - /// Delegate to the FW_Server_Request_Wrapper clone() method. - void do_clone(); - - /// Delegate to the FW_Server_Request_Wrapper dispatch() method. - void do_dispatch(ACE_ENV_SINGLE_ARG_DECL); - - /// Delegate to the FW_Server_Request_Wrapper cancel() method. - void do_cancel(); - - - private: - - /// The ObjectId for the target servant. - PortableServer::ObjectId object_id_; - - /// The POA. - PortableServer::POA_var poa_; - - /// The name of the IDL operation. - ACE_CString operation_; - - /// The TAO_ServerRequest object wrapper. - FW_Server_Request_Wrapper server_request_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_CORBA_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl deleted file mode 100644 index 18d273c34a5..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl +++ /dev/null @@ -1,45 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Corba_Request::TP_Corba_Request - (const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state, - TAO_ServerRequest& server_request) - : TP_Request(servant,servant_state), - object_id_(object_id), - operation_(operation), - server_request_(server_request) -{ - this->poa_ = PortableServer::POA::_duplicate(poa); -} - -ACE_INLINE -void -TAO::CSD::TP_Corba_Request::do_clone() -{ - this->server_request_.clone(); -} - -ACE_INLINE -void -TAO::CSD::TP_Corba_Request::do_dispatch(ACE_ENV_SINGLE_ARG_DECL) -{ - this->server_request_.dispatch(this->servant() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -ACE_INLINE -void -TAO::CSD::TP_Corba_Request::do_cancel() -{ - this->server_request_.cancel(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp deleted file mode 100644 index 6765f02eff6..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Custom_Asynch_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Custom_Asynch_Request::~TP_Custom_Asynch_Request() -{ -} - - -void -TAO::CSD::TP_Custom_Asynch_Request::dispatch_i() -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->execute_op(); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#endif - ACE_ENDTRY; -} - -void -TAO::CSD::TP_Custom_Asynch_Request::cancel_i() -{ - this->cancel_op(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h deleted file mode 100644 index aed6d8f88f5..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Custom_Asynch_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_CUSTOM_ASYNCH_REQUEST_H -#define TAO_CSD_TP_CUSTOM_ASYNCH_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Custom_Asynch_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Asynch_Request> - TP_Custom_Asynch_Request_Handle; - - /** - * @class TP_Custom_Asynch_Request - * - * @brief Base class for "queue-able", Custom (non-CORBA), - * Synchronous requests. - * - * TBD - Add description - * - */ - class TAO_CSD_TP_Export TP_Custom_Asynch_Request - : public TP_Custom_Request - { - public: - - /// Constructor. - TP_Custom_Asynch_Request(TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state); - - /// Virtual Destructor. - virtual ~TP_Custom_Asynch_Request(); - - - protected: - - /// Dispatch the request to the servant. - virtual void dispatch_i(); - - /// Cancel the request. - virtual void cancel_i(); - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_CUSTOM_ASYNCH_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl deleted file mode 100644 index 4242ce41e5d..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl +++ /dev/null @@ -1,15 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Custom_Asynch_Request::TP_Custom_Asynch_Request - (TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state) - : TP_Custom_Request(op,servant_state) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp deleted file mode 100644 index fbe24fc0c53..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Custom_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Custom_Request::~TP_Custom_Request() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h deleted file mode 100644 index c4c5bcbb0b4..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h +++ /dev/null @@ -1,81 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Custom_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_CUSTOM_REQUEST_H -#define TAO_CSD_TP_CUSTOM_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h" -#include "tao/PortableServer/Servant_Base.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Custom_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request> - TP_Custom_Request_Handle; - - /** - * @class TP_Custom_Request - * - * @brief Base class for "queue-able" Custom (non-CORBA) requests. - * - * TBD - Add description - * - */ - class TAO_CSD_TP_Export TP_Custom_Request : public TP_Request - { - public: - - /// Virtual Destructor. - virtual ~TP_Custom_Request(); - - - protected: - - /// Constructor. - TP_Custom_Request(TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state); - - void execute_op(); - void cancel_op(); - - - private: - - TP_Custom_Request_Operation_Handle op_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_CUSTOM_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl deleted file mode 100644 index c63696ab628..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ - -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Custom_Request::TP_Custom_Request - (TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state) - : TP_Request(op->servant(),servant_state), - op_(op, false) -{ -} - - -ACE_INLINE -void -TAO::CSD::TP_Custom_Request::execute_op() -{ - this->op_->execute(); - - // Now drop the reference to the custom operation object. - // This is necessary so that custom operation objects can be created - // on the stack for synchronous custom requests. If we do not do this, - // then there is a race condition which could result in the stack-created - // custom operation object having a reference count of 2 when it falls - // out of scope (and destructs). Our op_ data member would be the one - // that held the other reference, and when our op_ data member destructs, - // it attempts to perform a _remove_ref() on the underlying operation - // object - which has already been destructed! Thus, we reset the op_ - // data member here to the 'nil' state - causing the _remove_ref() to - // be performed now. - this->op_ = 0; -} - - -ACE_INLINE -void -TAO::CSD::TP_Custom_Request::cancel_op() -{ - this->op_->cancel(); - - // See comments in the execute_op() method. - this->op_ = 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp deleted file mode 100644 index e2702b6c5a5..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Custom_Request_Operation, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Custom_Request_Operation::~TP_Custom_Request_Operation() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h deleted file mode 100644 index e3b85853f9f..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h +++ /dev/null @@ -1,99 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Custom_Request_Operation.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_CUSTOM_REQUEST_OPERATION_H -#define TAO_CSD_TP_CUSTOM_REQUEST_OPERATION_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Intrusive_Ref_Count_Base_T.h" -#include "tao/Intrusive_Ref_Count_Handle_T.h" -#include "tao/PortableServer/Servant_Base.h" -#include "ace/Synch.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Custom_Request_Operation; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request_Operation> - TP_Custom_Request_Operation_Handle; - - - /** - * @class TP_Custom_Request_Operation - * - * @brief Base class for all custom request operations. - * - * @note The caller that creates a new TP_Custom_Request_Operation - * object needs call _add_ref () on the servant before - * constructing it and the TP_Custom_Request_Operation object - * is responsible to decrement the reference count. - * - * TBD - Add description - */ - class TAO_CSD_TP_Export TP_Custom_Request_Operation - : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX> - { - public: - - /// Virtual Destructor. - virtual ~TP_Custom_Request_Operation(); - - /// Invoked by a worker thread to perform the operation. - void execute(); - - /// Invoked when the request has been cancelled. - void cancel(); - - /// Used by the TP_Strategy to obtain the target servant in order - /// to construct the custom request object. Returns the servant as - /// an "in" argument (the caller does not get a new 'copy'). This - /// is useful for chaining. - PortableServer::Servant servant(); - - - protected: - - /// Constructor. - TP_Custom_Request_Operation(PortableServer::Servant servant); - - virtual void execute_i() = 0; - virtual void cancel_i() = 0; - - - private: - - PortableServer::ServantBase_var servant_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_CUSTOM_REQUEST_OPERATION_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl deleted file mode 100644 index 6a05c5df7ee..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl +++ /dev/null @@ -1,51 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation - (PortableServer::Servant servant) -: servant_ (servant) -{ - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception - // then this constructor needs deal with the exception. - ACE_TRY_NEW_ENV - { - this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHALL - { - } - ACE_ENDTRY; -} - - -ACE_INLINE -void -TAO::CSD::TP_Custom_Request_Operation::execute() -{ - this->execute_i(); -} - - -ACE_INLINE -void -TAO::CSD::TP_Custom_Request_Operation::cancel() -{ - this->cancel_i(); -} - - -ACE_INLINE -PortableServer::Servant -TAO::CSD::TP_Custom_Request_Operation::servant() -{ - return this->servant_.in(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp deleted file mode 100644 index 287e516d7b4..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Custom_Synch_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Custom_Synch_Request::~TP_Custom_Synch_Request() -{ -} - - -void -TAO::CSD::TP_Custom_Synch_Request::dispatch_i() -{ - this->execute_op(); - this->synch_helper_.dispatched(); -} - - -void -TAO::CSD::TP_Custom_Synch_Request::cancel_i() -{ - this->cancel_op(); - this->synch_helper_.cancelled(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h deleted file mode 100644 index 02d66b20597..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Custom_Synch_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_CUSTOM_SYNCH_REQUEST_H -#define TAO_CSD_TP_CUSTOM_SYNCH_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Custom_Synch_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Synch_Request> - TP_Custom_Synch_Request_Handle; - - /** - * @class TP_Custom_Synch_Request - * - * @brief Base class for "queue-able", Custom (non-CORBA), - * Synchronous requests. - * - * TBD - Add description - * - */ - class TAO_CSD_TP_Export TP_Custom_Synch_Request : public TP_Custom_Request - { - public: - - /// Constructor. - TP_Custom_Synch_Request(TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state); - - /// Virtual Destructor. - virtual ~TP_Custom_Synch_Request(); - - /// Wait until the request has been executed (and completes), or - /// until it has been cancelled. Returns true if the request has - /// been executed/completed, and returns false if the request has - /// been cancelled. - bool wait(); - - - protected: - - /// Dispatch the request to the servant. - virtual void dispatch_i(); - - /// Cancel the request. - virtual void cancel_i(); - - - private: - - /// Helper used to block and unblock the thread that invokes our - /// wait() method. - TP_Synch_Helper synch_helper_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_CUSTOM_SYNCH_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl deleted file mode 100644 index cec37afcdac..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Custom_Synch_Request::TP_Custom_Synch_Request - (TP_Custom_Request_Operation* op, - TP_Servant_State* servant_state) - : TP_Custom_Request(op,servant_state) -{ -} - - -ACE_INLINE -bool -TAO::CSD::TP_Custom_Synch_Request::wait() -{ - return this->synch_helper_.wait_while_pending(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp deleted file mode 100644 index aeb5454c252..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h" - -ACE_RCSID (CSD_TP, - Dispatchable_Visitor, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Dispatchable_Visitor::~TP_Dispatchable_Visitor() -{ -} - - -bool -TAO::CSD::TP_Dispatchable_Visitor::visit_request(TP_Request* request, - bool& remove_flag) -{ - // Ask the request object if the target servant is "ready" to accept - // a request being dispatched to it. - if (request->is_ready()) - { - // Ok. This request is a "dispatchable" request. It is what we were - // hoping to find. - - // Save a copy of the request in our handle data member. - request->_add_ref(); - this->request_ = request; - - // Make sure that the queue will extract the request from the queue - // upon our return. - remove_flag = true; - - // Mark the target servant as being "busy". - request->mark_as_busy(); - - // Stop the visitation by returning false. - return false; - } - - // The target servant object of the request isn't ready, so the request - // is not considered to be a "dispatchable" request. - - // Return true to visit the next request in the queue (if there is one). - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h deleted file mode 100644 index 01aea59828a..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h +++ /dev/null @@ -1,94 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Dispatchable_Visitor.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_DISPATCHABLE_VISITOR_H -#define TAO_CSD_TP_DISPATCHABLE_VISITOR_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - /** - * @class TP_Dispatchable_Visitor - * - * @brief Used to extract the first "dispatchable" request from the queue. - * - * An instance of this visitor class is used by one of the worker - * threads to locate the first "dispatchable" request in the queue. If - * such a request is visited, then this visitor will save a "copy" of - * the request, indicate that the request should be removed from the - * queue, and indicate that visitation should stop. - * - * An method is provided to retrieve a "copy" of the "dispatchable" - * request that was saved off during visitation. A nil reference - * (ie, a NULL pointer) will be returned if no dispatchable request - * was found. - * - */ - class TAO_CSD_TP_Export TP_Dispatchable_Visitor : public TP_Queue_Visitor - { - public: - - /// Default Constructor. - TP_Dispatchable_Visitor(); - - /// Virtual Destructor. - virtual ~TP_Dispatchable_Visitor(); - - /// Reset this visitor object in order to re-use it for another - /// visitation of the request queue. This sets the vistor's "result" - /// (the TP_Request* data member) to its default value (a nil handle). - void reset(); - - /// Returns true to continue visitation. Returns false to stop - /// visitation. Sets the remove_flag to true if the request should - /// be removed from the queue as a result of the visit. Leaves the - /// remove_flag alone otherwise. - virtual bool visit_request(TP_Request* request, bool& remove_flag); - - /// This returns a "copy" of the located request, or 0 if no request - /// was located. - TP_Request* request(); - - - private: - - /// A handle to the located request. - TP_Request_Handle request_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_DISPATCHABLE_VISITOR_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl deleted file mode 100644 index c2c16d34e26..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl +++ /dev/null @@ -1,31 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Dispatchable_Visitor::TP_Dispatchable_Visitor() -{ -} - - -ACE_INLINE -void -TAO::CSD::TP_Dispatchable_Visitor::reset() -{ - // Set the handle to 0 to have it release any request it may currently - // be referencing. - this->request_ = 0; -} - - -ACE_INLINE -TAO::CSD::TP_Request* -TAO::CSD::TP_Dispatchable_Visitor::request() -{ - TP_Request_Handle handle(this->request_.in(), false); - return handle._retn(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h deleted file mode 100644 index 1eeb556e4f8..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -s TAO_CSD_TP -// ------------------------------ -#ifndef TAO_CSD_TP_EXPORT_H -#define TAO_CSD_TP_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_CSD_TP_HAS_DLL) -# define TAO_CSD_TP_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && TAO_CSD_TP_HAS_DLL */ - -#if !defined (TAO_CSD_TP_HAS_DLL) -# define TAO_CSD_TP_HAS_DLL 1 -#endif /* ! TAO_CSD_TP_HAS_DLL */ - -#if defined (TAO_CSD_TP_HAS_DLL) && (TAO_CSD_TP_HAS_DLL == 1) -# if defined (TAO_CSD_TP_BUILD_DLL) -# define TAO_CSD_TP_Export ACE_Proper_Export_Flag -# define TAO_CSD_TP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_CSD_TP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_CSD_TP_BUILD_DLL */ -# define TAO_CSD_TP_Export ACE_Proper_Import_Flag -# define TAO_CSD_TP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_CSD_TP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_CSD_TP_BUILD_DLL */ -#else /* TAO_CSD_TP_HAS_DLL == 1 */ -# define TAO_CSD_TP_Export -# define TAO_CSD_TP_SINGLETON_DECLARATION(T) -# define TAO_CSD_TP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_CSD_TP_HAS_DLL == 1 */ - -// Set TAO_CSD_TP_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (TAO_CSD_TP_NTRACE) -# if (ACE_NTRACE == 1) -# define TAO_CSD_TP_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define TAO_CSD_TP_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !TAO_CSD_TP_NTRACE */ - -#if (TAO_CSD_TP_NTRACE == 1) -# define TAO_CSD_TP_TRACE(X) -#else /* (TAO_CSD_TP_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define TAO_CSD_TP_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (TAO_CSD_TP_NTRACE == 1) */ - -#endif /* TAO_CSD_TP_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp deleted file mode 100644 index cb7b0ecf8e1..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp +++ /dev/null @@ -1,127 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Queue.h" -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Queue, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Queue.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -void -TAO::CSD::TP_Queue::put(TP_Request* request) -{ - // The request is passed in as an "in" argument, and we would like to - // hold on to a "copy" within the queue (the linked list). We will - // perform an _add_ref() on the request now to make the queue's "copy". - request->_add_ref(); - - if (this->tail_ == 0) - { - // The tail_ is a NULL pointer only when the queue is empty. - // Make the request be the only element in the queue. - this->head_ = this->tail_ = request; - - // Make sure the request's prev_ and next_ pointers are set to NULL. - request->prev_ = request->next_ = 0; - } - else - { - // There is at least one request already in the queue. "Append" the - // supplied request object to the end of the queue. - request->prev_ = this->tail_; - request->next_ = 0; - this->tail_->next_ = request; - this->tail_ = request; - } -} - - -void -TAO::CSD::TP_Queue::accept_visitor(TP_Queue_Visitor& visitor) -{ - TP_Request* cur = this->head_; - - while (cur != 0) - { - TP_Request* prev = cur->prev_; - TP_Request* next = cur->next_; - - // Pass the current request to the visitor. Also pass-in a reference - // to the remove_from_queue flag. The visitor may decide that it - // wants to keep the current request for itself, and desires that the - // request be (surgically) removed from the queue. The visitor also - // gets to decide, via its return value, whether or not visitation - // should continue (or cease to continue). - bool remove_from_queue = false; - - bool continue_visitation = visitor.visit_request(cur,remove_from_queue); - - if (remove_from_queue) - { - // Create a local handle to release the current request once - // the handle falls out of scope. We need to do this because the - // queue "owns" a "copy" of each request in the queue. - TP_Request_Handle handle = cur; - - if (this->head_ == cur) - { - // The current request is at the front (the head_) of the queue. - - // Move the head_ to the next request in the queue. - this->head_ = next; - - if (this->head_ == 0) - { - // Not only was the current request at the front of the - // queue - it was the *only* request in the queue. - // Update the tail_ pointer now that the queue is empty. - this->tail_ = 0; - } - else - { - // Set the (new) head_ request's prev_ pointer to be NULL. - this->head_->prev_ = 0; - } - } - else if (this->tail_ == cur) - { - // The current request is not at the front of the queue, - // but it is at the back of the queue. This implies that - // the queue currently contains at least two requests - - // the current request (cur), and the previous request (prev). - // The point is that we can now assume that the 'prev' pointer - // is never NULL in this case. - this->tail_ = prev; - this->tail_->next_ = 0; - } - else - { - // The current request is not at the front or at the back. - // This implies that there are at least three requests in - // the queue. We can assume that the 'next' and 'prev' - // pointers are never NULL in this case. - prev->next_ = next; - next->prev_ = prev; - } - } - - if (!continue_visitation) - { - // The visitor doesn't want to procede with any further visitation. - // Break out of the visitation loop now. - break; - } - - // Move on to the next request in the queue. - cur = next; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h deleted file mode 100644 index 9912c0e613a..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h +++ /dev/null @@ -1,101 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Queue.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_QUEUE_H -#define TAO_CSD_TP_QUEUE_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Request; - class TP_Queue_Visitor; - - /** - * @class TP_Queue - * - * @brief Queue of servant requests that need to be dispatched. - * - * This is the queue of pending servant requests that is "owned" - * by a TP_Strategy object. When an ORB thread dispatches - * a servant request to the strategy object, it will create the - * appropriate (subclass of) TP_Request object to "wrap" - * the servant request in a "queue-friendly" wrapper. The ORB thread - * will then place the TP_Request object on to the queue. Note that - * this scenario pertains to what are being called "remote requests". - * There are other scenarios in which other types of requests can - * get added to this queue. - * - * The strategy object will employ a set of worker threads that are - * responsible for "servicing" the servant requests in the queue. - * - * Note: In the future, support will be added to allow the client - * application inject "custom" TP_Request objects into - * a TP_Strategy object, causing them to be placed in - * the queue. - */ - class TAO_CSD_TP_Export TP_Queue - { - public: - - /// Default Constructor. - TP_Queue(); - - /// Destructor. - ~TP_Queue(); - - /// Place a request at the end of the queue. - void put(TP_Request* request); - - /// Returns true if the queue is empty. Returns false otherwise. - bool is_empty() const; - - /// Visitors will visit each request in the queue, from front to back, - /// and have the ability to stop visiting at any time (ie, before - /// visiting every request). - void accept_visitor(TP_Queue_Visitor& visitor); - - - private: - - /// The request at the front of the queue. - TP_Request* head_; - - /// The request at the end of the queue. - TP_Request* tail_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Queue.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_QUEUE_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl deleted file mode 100644 index 9e26d265f10..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl +++ /dev/null @@ -1,29 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Queue::TP_Queue() - : head_(0), - tail_(0) -{ -} - - -ACE_INLINE -TAO::CSD::TP_Queue::~TP_Queue() -{ -} - - -ACE_INLINE -bool -TAO::CSD::TP_Queue::is_empty() const -{ - return (this->head_ == 0); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp deleted file mode 100644 index 3ede8818521..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Queue_Visitor, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Queue_Visitor::~TP_Queue_Visitor() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h deleted file mode 100644 index f86467ae64d..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h +++ /dev/null @@ -1,79 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Queue_Visitor.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_QUEUE_VISITOR_H -#define TAO_CSD_TP_QUEUE_VISITOR_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Request; - - - /** - * @class TP_Queue_Visitor - * - * @brief Base class for vistors of the elements in the TP_Queue. - * - * Provides a way to perform thread-safe iteration over the - * TP_Request objects contained within a TP_Queue object. - * - * This also provides a means to encapsulate each distinct algorithm - * within a distinct subclass of TP_Queue_Visitor. - * - */ - class TAO_CSD_TP_Export TP_Queue_Visitor - { - public: - - /// Virtual Destructor. - virtual ~TP_Queue_Visitor(); - - /// Returns true to continue visitation. Return false to stop - /// visitation. Sets the remove_flag to true if the request should - /// be removed from the queue as a result of the visit. Leaves the - /// remove_flag alone otherwise. - virtual bool visit_request(TP_Request* request, bool& remove_flag) = 0; - - - protected: - - /// Default Constructor. - TP_Queue_Visitor(); - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_QUEUE_VISITOR_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl deleted file mode 100644 index 36bd9fc5608..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl +++ /dev/null @@ -1,12 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Queue_Visitor::TP_Queue_Visitor() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp deleted file mode 100644 index 45529af5802..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Remote_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Remote_Request::~TP_Remote_Request() -{ -} - - -void -TAO::CSD::TP_Remote_Request::prepare_for_queue_i() -{ - this->do_clone(); -} - - -void -TAO::CSD::TP_Remote_Request::dispatch_i() -{ - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#if defined (TAO_HAS_EXCEPTIONS) - ACE_CATCHALL - { - // Eat these. We probably should log these, but since we have already - // unblocked the requesting thread there is no point in saving it or - // doing anything with it. - } -#endif - ACE_ENDTRY; -} - - -void -TAO::CSD::TP_Remote_Request::cancel_i() -{ - this->do_cancel(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h deleted file mode 100644 index 57303e81e91..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h +++ /dev/null @@ -1,102 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Remote_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_REMOTE_REQUEST_H -#define TAO_CSD_TP_REMOTE_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Remote_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Remote_Request> - TP_Remote_Request_Handle; - - /** - * @class TP_Remote_Request - * - * @brief Represents a "queue-able", remote, CORBA request. - * Both syncronous and asynchronous remote CORBA requests - * are represented by the class. - * - * TBD - Go over the following comments and clean up. - * - * Since this class derives from the TP_Request class, it can be - * added to a TP_Queue (ie, it is a "queueable" request). It - * represents a servant request that has been made by a remote - * CORBA client (as opposed to a collocated CORBA client). The - * term "CORBA client" is being used here to distinguish CORBA - * servant requests (those made thru a CORBA object reference), and - * "Custom" servant requests that can be "dispatched" to the strategy - * directly by the client application code (ie, not thru a CORBA - * object reference). Thus, there are "CORBA clients" and - * "Direct clients". - * - * In summary, this class represents a servant request made when a - * remote client invokes a method on a CORBA object reference. - * - */ - class TAO_CSD_TP_Export TP_Remote_Request : public TP_Corba_Request - { - public: - - /// Constructor. - TP_Remote_Request(TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state); - - /// Virtual Destructor. - virtual ~TP_Remote_Request(); - - - protected: - - /// Prepare this TP_Remote_Request object to be placed into the - /// request queue. This will cause the underlying TAO_ServerRequest - /// object to be cloned. - virtual void prepare_for_queue_i(); - - /// Dispatch the request to the servant. - virtual void dispatch_i(); - - /// Cancel the request. - virtual void cancel_i(); - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_REMOTE_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl deleted file mode 100644 index 14a37aa44a9..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl +++ /dev/null @@ -1,24 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Remote_Request::TP_Remote_Request - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant, - TP_Servant_State* servant_state) - : TP_Corba_Request(object_id, - poa, - operation, - servant, - servant_state, - server_request) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp deleted file mode 100644 index e1926f93e8b..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Request, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Request.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Request::~TP_Request() -{ -} - - -void -TAO::CSD::TP_Request::prepare_for_queue_i() -{ - // Default implementation is to do nothing. Subclasses can provide - // their own implementation if needed. -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h deleted file mode 100644 index 104d741d3b9..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h +++ /dev/null @@ -1,136 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Request.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_REQUEST_H -#define TAO_CSD_TP_REQUEST_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h" -#include "tao/PortableServer/Servant_Base.h" -#include "tao/Intrusive_Ref_Count_Base_T.h" -#include "tao/Intrusive_Ref_Count_Handle_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Request; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Request> TP_Request_Handle; - - class TP_Queue; - - - /** - * @class TP_Request - * - * @brief Base class for "queue-able" requests. - * - * This class serves as the abstract base class for all types of - * "servant requests" that can be inserted into a TP_Queue - * object. - */ - class TAO_CSD_TP_Export TP_Request - : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX> - { - public: - - /// Virtual Destructor. - virtual ~TP_Request(); - - /// Prepare the request to be placed into the request queue. - void prepare_for_queue(); - - /// Invoked to dispatch the request to the servant. - void dispatch(); - - /// Invoked to cancel the request. - void cancel(); - - /// Is the target servant ready to accept a request? - bool is_ready() const; - - /// Mark the target servant as being busy. - void mark_as_busy(); - - /// Mark the target servant as being ready (ie, not busy). - void mark_as_ready(); - - /// This method returns true if this request targets the supplied - /// servant object. - bool is_target(PortableServer::Servant servant); - - - protected: - - /// Constructor. - TP_Request(PortableServer::Servant servant, - TP_Servant_State* servant_state); - - /// Accessor for the servant. Does not return a new (ref counted) - /// reference! This is used for chaining. - PortableServer::Servant servant(); - - /// The subclass knows if it needs to do anything in preparation - /// of being placed into the request queue. The default implementation - /// does nothing, so only subclasses that have something to do - /// need to provide their own implementation. - virtual void prepare_for_queue_i(); - - /// The subclass knows how to carry out its own way of dispatching - /// the request to the servant. - virtual void dispatch_i() = 0; - - /// Ask the subclass to perform its duties to carry out the cancellation. - virtual void cancel_i() = 0; - - - private: - - /// The TP_Queue class is our friend since it needs access to - /// the prev_ and next_ (private) data members. - friend class TP_Queue; - - /// The previous TP_Request object (in the queue). - TP_Request* prev_; - - /// The next TP_Request object (in the queue). - TP_Request* next_; - - /// Reference to the servant object. - PortableServer::ServantBase_var servant_; - - /// Reference to the servant "state" object (contains the busy flag). - TP_Servant_State::HandleType servant_state_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Request.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_REQUEST_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl deleted file mode 100644 index 341a449091e..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl +++ /dev/null @@ -1,111 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant, - TP_Servant_State* servant_state) - : prev_(0), - next_(0), - servant_ (servant), - servant_state_(servant_state, false) -{ - // This try-catch block is not really necessary for current implementation - // since the _add_ref does not throw exception, but we have to add it to - // satisfy the non-exception builds. If _add_ref really throws an exception - // then this constructor needs deal with the exception. - ACE_TRY_NEW_ENV - { - this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHALL - { - } - ACE_ENDTRY; -} - - -ACE_INLINE -void -TAO::CSD::TP_Request::prepare_for_queue() -{ - this->prepare_for_queue_i(); -} - - -ACE_INLINE -PortableServer::Servant -TAO::CSD::TP_Request::servant() -{ - // Used for chaining so we do not return a new "copy". - return this->servant_.in(); -} - - -ACE_INLINE -bool -TAO::CSD::TP_Request::is_ready() const -{ - if (this->servant_state_.is_nil()) - { - // This means that the serialization of servants is off. - // We always answer true here to indicate that the servant is - // never busy. - return true; - } - - return !this->servant_state_->busy_flag(); -} - - -ACE_INLINE -void -TAO::CSD::TP_Request::mark_as_busy() -{ - if (!this->servant_state_.is_nil()) - { - this->servant_state_->busy_flag(true); - } -} - - -ACE_INLINE -void -TAO::CSD::TP_Request::mark_as_ready() -{ - if (!this->servant_state_.is_nil()) - { - this->servant_state_->busy_flag(false); - } -} - - -ACE_INLINE -bool -TAO::CSD::TP_Request::is_target(PortableServer::Servant servant) -{ - // Compare pointers. Return true only if these are the exact same object. - return (servant == this->servant_.in()); -} - - -ACE_INLINE -void -TAO::CSD::TP_Request::dispatch() -{ - this->dispatch_i(); - -} - - -ACE_INLINE -void -TAO::CSD::TP_Request::cancel() -{ - this->cancel_i(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp deleted file mode 100644 index 28fbc8da7ba..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h" - -ACE_RCSID (CSD_TP, - Servant_State, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Servant_State::~TP_Servant_State() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h deleted file mode 100644 index dbfebedb64c..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Servant_State.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_SERVANT_STATE_H -#define TAO_CSD_TP_SERVANT_STATE_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Intrusive_Ref_Count_Base_T.h" -#include "tao/Intrusive_Ref_Count_Handle_T.h" -#include "ace/Synch.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - /** - * @class TP_Servant_State - * - * @brief Maintains state information for a particular servant. - * - * This TP_Servant_State class is an intrusively reference-counted - * class. This allows it to be held in a "smart pointer" (aka, handle) - * object that will manage the reference-counting automagically. - * - * One TP_Servant_State object is created for each servant object for - * which a request is to be dispatched. The servant state objects are - * held (via smart pointers) in a TP_Servant_State_Map object. In turn, - * the TP_Servant_State_Map object is a data member of the TP_Stategy - * class. Each request placed on to the request queue will hold a - * reference (via a smart pointer) to the servant state object. - * - * Currently, the only "state" info held in this TP_Servant_State class - * is the servant's busy flag. - * - */ - class TAO_CSD_TP_Export TP_Servant_State - : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX> - { - public: - - /// Handle Type (aka, Smart Pointer Type). - typedef TAO_Intrusive_Ref_Count_Handle<TP_Servant_State> HandleType; - - /// Default Constructor. - TP_Servant_State(); - - /// Virtual Destructor. - virtual ~TP_Servant_State(); - - /// Accessor for the servant busy flag. - bool busy_flag() const; - - /// Mutator for the servant busy flag. - void busy_flag(bool new_value); - - private: - - /// The servant's current "busy" state (true == busy, false == not busy) - bool busy_flag_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_SERVANT_STATE_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl deleted file mode 100644 index 5ef996bcb6e..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl +++ /dev/null @@ -1,29 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Servant_State::TP_Servant_State() - : busy_flag_(false) -{ -} - - -ACE_INLINE -bool -TAO::CSD::TP_Servant_State::busy_flag() const -{ - return this->busy_flag_; -} - - -ACE_INLINE -void -TAO::CSD::TP_Servant_State::busy_flag(bool new_value) -{ - this->busy_flag_ = new_value; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp deleted file mode 100644 index 846f3a6e723..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h" - -ACE_RCSID (CSD_TP, - Servant_State_Map, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl" -#endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h deleted file mode 100644 index e6726098b72..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h +++ /dev/null @@ -1,95 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Servant_State_Map.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_SERVANT_STATE_MAP_H -#define TAO_CSD_TP_SERVANT_STATE_MAP_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h" -#include "tao/PortableServer/PortableServer.h" -#include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - /** - * @class TP_Servant_State_Map - * - * @brief Map of Servant_State objects - one per servant. - * - * A TP_Stategy object holds an instance of a TP_Servant_State_Map object - * as a (held-by-value) data member. The strategy uses this map to - * find or create the TP_Servant_State object for a particular servant - * object. - * - */ - class TAO_CSD_TP_Export TP_Servant_State_Map - { - public: - - /// Default Constructor. - TP_Servant_State_Map(); - - /// Destructor. - ~TP_Servant_State_Map(); - - /// Accessor for the servant busy flag. - TP_Servant_State* find(PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - /// Insert the servant to map. - void insert(PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - /// Remove the servant from map. - void remove(PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - - private: - - /// Underlying Map Type - Hash-Based - - /// Key Type: void*, Value Type: TP_Servant_State::HandleType - typedef ACE_Hash_Map_Manager_Ex<void*, - TP_Servant_State::HandleType, - ACE_Hash<void*>, - ACE_Equal_To<void*>, - ACE_SYNCH_MUTEX> MapType; - - /// The underlying map of servant state objects. - MapType map_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_SERVANT_STATE_MAP_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl deleted file mode 100644 index 1faeb7ad536..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Servant_State_Map::TP_Servant_State_Map() -{ -} - - -ACE_INLINE -TAO::CSD::TP_Servant_State_Map::~TP_Servant_State_Map() -{ -} - - -ACE_INLINE -TAO::CSD::TP_Servant_State* -TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - void* key = servant; - - TP_Servant_State::HandleType value; - - if (this->map_.find(key, value) != 0) - { - ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (), 0); - } - - return value._retn(); -} - - -ACE_INLINE -void -TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - void* key = servant; - - TP_Servant_State::HandleType value = new TP_Servant_State (); - - int result = this->map_.bind(key, value); - - if (result == 1) - { - ACE_THROW (PortableServer::POA::ServantAlreadyActive ()); - } - - ACE_ASSERT (result == 0); -} - - -ACE_INLINE -void -TAO::CSD::TP_Servant_State_Map::remove(PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - void* key = servant; - - if (this->map_.unbind(key) == -1) - { - ACE_THROW (PortableServer::POA::ServantNotActive ()); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp deleted file mode 100644 index 1a9c86ec8da..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp +++ /dev/null @@ -1,289 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" -#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h" -#include "ace/Trace.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Strategy, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Strategy::~TP_Strategy() -{ -} - - - -TAO::CSD::TP_Strategy::CustomRequestOutcome -TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL) -{ - TP_Servant_State::HandleType servant_state = - this->get_servant_state(op->servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (REQUEST_REJECTED); - - TP_Custom_Synch_Request_Handle request = new - TP_Custom_Synch_Request(op, servant_state.in()); - - if (!this->task_.add_request(request.in())) - { - // The request was rejected by the task. - return REQUEST_REJECTED; - } - - // Now we wait until the request is handled (executed or cancelled). - return (request->wait()) ? REQUEST_EXECUTED : REQUEST_CANCELLED; -} - - -TAO::CSD::TP_Strategy::CustomRequestOutcome -TAO::CSD::TP_Strategy::custom_asynch_request(TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL) -{ - TP_Servant_State::HandleType servant_state = - this->get_servant_state(op->servant() - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (REQUEST_REJECTED); - - TP_Custom_Asynch_Request_Handle request = new - TP_Custom_Asynch_Request(op, servant_state.in()); - - return (this->task_.add_request(request.in())) - ? REQUEST_DISPATCHED : REQUEST_REJECTED; -} - - -bool -TAO::CSD::TP_Strategy::poa_activated_event_i() -{ - // Activates the worker threads, and waits until all have been started. - return (this->task_.open(&(this->num_threads_)) == 0); -} - - -void -TAO::CSD::TP_Strategy::poa_deactivated_event_i() -{ - // Passing in a value of 1 means that we want to shutdown the task, which - // equates to causing all worker threads to shutdown. The worker threads - // themselves will also invoke the close() method, but the passed-in value - // will be 0. So, a 1 means "shutdown", and a 0 means "a single worker - // thread is going away". - this->task_.close(1); -} - - -TAO::CSD::Strategy_Base::DispatchResult -TAO::CSD::TP_Strategy::dispatch_remote_request_i - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - TP_Servant_State::HandleType servant_state = - this->get_servant_state(servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); - - // Now we can create the TP_Remote_Request object, and then add it to our - // task_'s "request queue". - // - // TBD-CSD: Need to use a Cached Allocator to "create" the - // TP_Remote_Request objects. For now, use the heap. - TP_Remote_Request_Handle request = - new TP_Remote_Request(server_request, - object_id, - poa, - operation, - servant, - servant_state.in()); - - // Hand the request object to our task so that it can add the request - // to its "request queue". - if (!this->task_.add_request(request.in())) - { - // Return the DISPATCH_REJECTED return code so that the caller (our - // base class' dispatch_request() method) knows that we did - // not handle the request, and that it should be rejected. - return TAO::CSD::Strategy_Base::DISPATCH_REJECTED; - } - - return TAO::CSD::Strategy_Base::DISPATCH_HANDLED; -} - - -TAO::CSD::Strategy_Base::DispatchResult -TAO::CSD::TP_Strategy::dispatch_collocated_request_i - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - TP_Servant_State::HandleType servant_state = - this->get_servant_state(servant - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); - - bool is_sync_with_server = server_request.sync_with_server(); - bool is_synchronous = server_request.response_expected(); - - TP_Collocated_Synch_Request_Handle synch_request; - TP_Collocated_Synch_With_Server_Request_Handle synch_with_server_request; - TP_Request_Handle request; - - // Create the request object using the appropriate concrete type. - if (is_sync_with_server) - { - synch_with_server_request = - new TP_Collocated_Synch_With_Server_Request - (server_request, - object_id, - poa, - operation, - servant, - servant_state.in()); - - // Give the request handle its own "copy". - synch_with_server_request->_add_ref(); - request = synch_with_server_request.in(); - } - else if (is_synchronous) - { - synch_request = new TP_Collocated_Synch_Request(server_request, - object_id, - poa, - operation, - servant, - servant_state.in()); - - // Give the request handle its own "copy". - synch_request->_add_ref(); - request = synch_request.in(); - } - else - { - // Just use the (base) request handle to hold the request object. - request = new TP_Collocated_Asynch_Request(server_request, - object_id, - poa, - operation, - servant, - servant_state.in()); - } - - // Hand the request object to our task so that it can add the request - // to its "request queue". - if (!this->task_.add_request(request.in())) - { - // Return the DISPATCH_REJECTED return code so that the caller (our - // base class' dispatch_request() method) knows that we did - // not handle the request, and that it should be rejected. - return DISPATCH_REJECTED; - } - - // We need to wait on the request object if the request type is a - // synchronous request. - if (!synch_request.is_nil()) - { - int srw = synch_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); - if (srw == false) - { - // Raise exception when request was cancelled. - ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), DISPATCH_REJECTED); - } - } - else if (!synch_with_server_request.is_nil()) - { - bool swsr = synch_with_server_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DISPATCH_REJECTED); - if (swsr == false) - { - // Raise exception when request was cancelled. - ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), DISPATCH_REJECTED); - } - } - - return DISPATCH_HANDLED; -} - - -void -TAO::CSD::TP_Strategy::servant_activated_event_i - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - ACE_UNUSED_ARG(oid); - - if (this->serialize_servants_) - { - // Add the servant to the servant state map. - this->servant_state_map_.insert(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } -} - - -void -TAO::CSD::TP_Strategy::servant_deactivated_event_i - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL) -{ - ACE_UNUSED_ARG(oid); - - // Cancel all requests stuck in the queue for the specified servant. - this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (this->serialize_servants_) - { - // Remove the servant from the servant state map. - this->servant_state_map_.remove(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } -} - - -void -TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - // Cancel all requests stuck in the queue for the specified servant. - this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - - -TAO::CSD::TP_Servant_State::HandleType -TAO::CSD::TP_Strategy::get_servant_state(PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - TP_Servant_State::HandleType servant_state; - - if (this->serialize_servants_) - { - servant_state = this->servant_state_map_.find(servant - ACE_ENV_ARG_PARAMETER); - } - - return servant_state; -} -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h deleted file mode 100644 index 2e069caeb6d..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h +++ /dev/null @@ -1,210 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Strategy.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_STRATEGY_H -#define TAO_CSD_TP_STRATEGY_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Task.h" -#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/CSD_Framework/CSD_Strategy_Base.h" -#include "tao/Intrusive_Ref_Count_Handle_T.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - class TP_Strategy; - typedef TAO_Intrusive_Ref_Count_Handle<TP_Strategy> TP_Strategy_Handle; - - class TP_Custom_Request_Operation; - - /** - * @class TP_Strategy - * - * @brief A simple custom Thread-Pool servant dispatching strategy class. - * - * This class represents a concrete implementation of a "Custom - * Servant Dispatching Strategy". This implementation is being called - * the "Thread Pool Strategy" reference implementation. - * - * A custom servant dispatching strategy object can be applied to a - * POA object in order to carry out the servant dispatching duties - * for that POA. - * - */ - class TAO_CSD_TP_Export TP_Strategy - : public Strategy_Base - { - public: - - /// Constructor. - TP_Strategy(Thread_Counter num_threads = 1, - bool serialize_servants = true); - - /// Virtual Destructor. - virtual ~TP_Strategy(); - - /// Set the number of threads in the pool (must be > 0). - void set_num_threads(Thread_Counter num_threads); - - /// Turn on/off serialization of servants. - void set_servant_serialization(bool serialize_servants); - - /// Return codes for the custom dispatch_request() methods. - enum CustomRequestOutcome - { - /// The request was successfully put on the request queue. - REQUEST_DISPATCHED, - /// The request has been executed/completed by a worker thread. - REQUEST_EXECUTED, - /// The request was removed from the queue and cancelled. - REQUEST_CANCELLED, - /// The request queue rejected the request - REQUEST_REJECTED - }; - - /// Inject a synchronous, custom request into the request queue. - /// This will block the calling thread until the request is handled - /// (dispatched or cancelled) or rejected. - /// Will return REQUEST_EXECUTED, REQUEST_CANCELLED, or REQUEST_REJECTED. - CustomRequestOutcome custom_synch_request - (TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL); - - /// Inject an asynchronous, custom request into the request queue. - /// This will return control to the calling thread once the request - /// has been placed into the queue (or rejected). - /// Will return REQUEST_DISPATCHED or REQUEST_REJECTED. - CustomRequestOutcome custom_asynch_request - (TP_Custom_Request_Operation* op - ACE_ENV_ARG_DECL); - - /// Cancel all requests that are targeted for the provided servant. - /// This is requested on the user application level. - void cancel_requests(PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - protected: - - /// Handle the dispatching of a remote request. - /// - /// This will cause a new "request" object to be created and pushed - /// on to a "request queue". The worker threads are responsible for - /// servicing the queue, and performing the actual dispatch logic. - virtual Strategy_Base::DispatchResult dispatch_remote_request_i - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - /// Handle the dispatching of a collocated request. - /// - /// This will cause a new "request" object to be created and pushed - /// on to a "request queue". The worker threads are responsible for - /// servicing the queue, and performing the actual dispatch logic. - virtual Strategy_Base::DispatchResult dispatch_collocated_request_i - (TAO_ServerRequest& server_request, - const PortableServer::ObjectId& object_id, - PortableServer::POA_ptr poa, - const char* operation, - PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - /// Event - The POA has been activated. - /// This will activate the worker thread(s). - /// Returns true if the worker threads were activated successfully. - /// Otherwise, returns false. - virtual bool poa_activated_event_i(); - - /// Event - The POA has been deactivated. - /// This will shutdown the worker thread(s). - virtual void poa_deactivated_event_i(); - - /// Event - A servant has been activated - virtual void servant_activated_event_i - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// Event - A servant has been deactivated - virtual void servant_deactivated_event_i - (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - - private: - - /** - * Helper method that is responsible for looking up the servant - * state object in the servant state map *if* the "serialize - * servants" flag is set to true. In the case where the - * "serialize servants" flag is set to false, then a "nil" - * servant state handle object is returned. - * - * @param servant - input - a pointer to the servant object. - * - * @returns a handle to a servant state object. - * - * @throw PortableServer::POA::ServantNotActive if the servant - * state cannot be determined. - */ - TP_Servant_State::HandleType get_servant_state - (PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - - /// This is the active object used by the worker threads. - /// The request queue is owned/managed by the task object. - /// The strategy object puts requests into the task's request - /// queue, and the worker threads service the queued requests - /// by performing the actual servant request dispatching logic. - TP_Task task_; - - /// The number of worker threads to use for the task. - Thread_Counter num_threads_; - - /// The "serialize servants" flag. - bool serialize_servants_; - - /// The map of servant state objects - only used when the - /// "serialize servants" flag is set to true. - TP_Servant_State_Map servant_state_map_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_STRATEGY_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl deleted file mode 100644 index 312484f5c8c..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl +++ /dev/null @@ -1,35 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Strategy::TP_Strategy(Thread_Counter num_threads, - bool serialize_servants) - : num_threads_(num_threads), - serialize_servants_(serialize_servants) -{ - // Assumes that num_threads > 0. -} - - -ACE_INLINE -void -TAO::CSD::TP_Strategy::set_num_threads(Thread_Counter num_threads) -{ - // Simple Mutator. Assumes that num_threads > 0. - this->num_threads_ = num_threads; -} - - -ACE_INLINE -void -TAO::CSD::TP_Strategy::set_servant_serialization(bool serialize_servants) -{ - // Simple Mutator. - this->serialize_servants_ = serialize_servants; -} - - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp deleted file mode 100644 index 71aa9aa9b8c..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp +++ /dev/null @@ -1,154 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h" -#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" -#include "tao/CSD_ThreadPool/CSD_ThreadPool.h" -#include "tao/CSD_Framework/CSD_Strategy_Repository.h" -#include "tao/debug.h" -#include "ace/Dynamic_Service.h" -#include "ace/OS_NS_strings.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Strategy_Factory, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Strategy_Factory::TP_Strategy_Factory() -{ -} - - -TAO::CSD::TP_Strategy_Factory::~TP_Strategy_Factory() -{ -} - - -int -TAO::CSD::TP_Strategy_Factory::init (int argc, - ACE_TCHAR* argv[]) -{ - ACE_TRACE ("TAO::CSD::TP_Strategy_Factory::init"); - - static int initialized = 0; - - // Only allow initialization once. - if (initialized) - return 0; - - initialized = 1; - TAO_CSD_Strategy_Repository *repo = - ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository"); - - if (repo != 0) - repo->init(0,0); - - // Parse any service configurator parameters. - for (int curarg = 0; curarg < argc; curarg++) - if (ACE_OS::strcasecmp (argv[curarg], - ACE_TEXT("-CSDtp")) == 0) - { - ACE_CString poa_name; - unsigned long num_threads = 1; - bool serialize_servants = true; - - curarg++; - if (curarg < argc) - { - // Parse the parameter - ACE_CString arg ((const char *)argv[curarg]); - ssize_t pos = arg.find (':'); - - if (pos == ACE_CString::npos) - { - poa_name = arg; - } - else - { - poa_name = arg.substr (0, pos); - - ACE_CString arg_remainder = - arg.substr (pos + 1, arg.length () - pos); - - ACE_CString num_thread_str; - - pos = arg_remainder.find (':'); - - if (pos == ACE_CString::npos) - { - num_thread_str = arg_remainder; - } - else - { - num_thread_str = arg_remainder.substr (0, pos); - - ACE_CString off_str = - arg_remainder.substr (pos + 1, arg.length () - pos); - - // Case-insensitive string comparison. - if (ACE_OS::strcasecmp (off_str.c_str(), - ACE_TEXT("OFF")) == 0) - { - serialize_servants = false; - } - } - - num_threads = ACE_OS::strtoul (num_thread_str.c_str (), 0, 10); - - if (num_threads == 0) - { - // Minimum of 1 thread required. - num_threads = 1; - } - } - - // Create the ThreadPool strategy for each named poa. - TP_Strategy* strategy = 0; - ACE_NEW_RETURN (strategy, - TP_Strategy (num_threads, serialize_servants), - -1); - CSD_Framework::Strategy_var objref = strategy; - - TAO_CSD_Strategy_Repository *repo = - ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance - ("TAO_CSD_Strategy_Repository"); - - if (repo == 0) - { - TAO_CSD_ThreadPool::init (); - repo = ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ( - "TAO_CSD_Strategy_Repository" - ); - } - - - repo->add_strategy (poa_name, strategy); - } - } - else - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT("CSD_ORB_Loader: Unknown option ") - ACE_TEXT("<%s>.\n"), - argv[curarg])); - } - } - - - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE(TAO_CSD_TP, - TAO_CSD_TP_Strategy_Factory, - TAO::CSD::TP_Strategy_Factory) - -ACE_STATIC_SVC_DEFINE(TAO_CSD_TP_Strategy_Factory, - ACE_TEXT("TAO_CSD_TP_Strategy_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME(TAO_CSD_TP_Strategy_Factory), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h deleted file mode 100644 index abc3da5b005..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Strategy_Factory.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_STRATEGY_FACTORY_H -#define TAO_CSD_TP_STRATEGY_FACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" -#include "tao/Versioned_Namespace.h" -#include "ace/Service_Object.h" -#include "ace/Service_Config.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - /** - * @class TP_Strategy_Factory - * - * @brief An ACE_Service_Object capable of creating TP_Strategy objects. - * - * TBD - Explain in more detail. - * - */ - class TAO_CSD_TP_Export TP_Strategy_Factory : public ACE_Service_Object - { - public: - - /// Constructor. - TP_Strategy_Factory(); - - /// Virtual Destructor. - virtual ~TP_Strategy_Factory(); - - int init (int argc, ACE_TCHAR* argv[]); - }; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory) -ACE_FACTORY_DECLARE(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory) - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_STRATEGY_FACTORY_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp deleted file mode 100644 index 79a0a195097..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Synch_Helper, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl" -#endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h deleted file mode 100644 index 2056f1ab032..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h +++ /dev/null @@ -1,110 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Synch_Helper.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_SYNCH_HELPER_H -#define TAO_CSD_TP_SYNCH_HELPER_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" -#include "tao/Condition.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Synch.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - - /** - * @class TP_Synch_Helper - * - * @brief Helper class for synchronous requests to block the requesting - * thread until the appropriate time (when it will be un-blocked). - * - * TBD - Description here - * - */ - class TAO_CSD_TP_Export TP_Synch_Helper - { - public: - - /// Constructor. Sets initial state to PENDING. - TP_Synch_Helper(); - - /// Destructor. - ~TP_Synch_Helper(); - - /// Returns true if the helper state is DISPATCHED, and false if - /// the helper state is CANCELLED. However, if the helper state - /// is PENDING, then this method will block the calling thread - /// until the state changes to something other than PENDING - /// (ie, DISPATCHED or CANCELLED). - bool wait_while_pending(); - - /// Change the state of this helper to DISPATCHED, which will cause - /// wait_while_pending() to unblock. - void dispatched(); - - /// Change the state of this helper to CANCELLED, which will cause - /// wait_while_pending() to unblock. - void cancelled(); - - - private: - - /// Enumeration Type for all possible states of this helper object. - enum HelperState - { - PENDING, - DISPATCHED, - CANCELLED - }; - - /// Thread lock type - typedef ACE_SYNCH_MUTEX LockType; - - /// Thread guard type - typedef ACE_Guard<LockType> GuardType; - - /// Thread condition type - typedef TAO_Condition<LockType> ConditionType; - - /// Lock used to protect the state and condition. - LockType lock_; - - /// Used to denote the state of the request dispatching. - HelperState state_; - - /// The condition used to block the calling thread until the - /// state is something other than the PENDING state. - ConditionType condition_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_SYNCH_HELPER_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl deleted file mode 100644 index f4c5a1380c1..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Synch_Helper::TP_Synch_Helper() - : state_(PENDING), - condition_(this->lock_) -{ -} - - -ACE_INLINE -TAO::CSD::TP_Synch_Helper::~TP_Synch_Helper() -{ -} - - -ACE_INLINE -bool -TAO::CSD::TP_Synch_Helper::wait_while_pending() -{ - GuardType guard(this->lock_); - - while (this->state_ == PENDING) - { - this->condition_.wait(); - } - - return (this->state_ == DISPATCHED); -} - - -ACE_INLINE -void -TAO::CSD::TP_Synch_Helper::dispatched() -{ - GuardType guard(this->lock_); - this->state_ = DISPATCHED; - this->condition_.signal(); -} - - -ACE_INLINE -void -TAO::CSD::TP_Synch_Helper::cancelled() -{ - GuardType guard(this->lock_); - this->state_ = CANCELLED; - this->condition_.signal(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp deleted file mode 100644 index adc18ab7c7f..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ /dev/null @@ -1,313 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_TP_Task.h" -#include "tao/CSD_ThreadPool/CSD_TP_Request.h" -#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h" -#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h" - -ACE_RCSID (CSD_ThreadPool, - TP_Task, - "$Id$") - -#if !defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Task.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::CSD::TP_Task::~TP_Task() -{ -} - - -bool -TAO::CSD::TP_Task::add_request(TP_Request* request) -{ - GuardType guard(this->lock_); - - if (!this->accepting_requests_) - { - ACE_DEBUG((LM_DEBUG,"(%P|%t) TP_Task::add_request() - " - "not accepting requests\n")); - return false; - } - - // We have made the decision that the request is going to be placed upon - // the queue_. Inform the request that it is about to be placed into - // a request queue. Some requests may not need to do anything in - // preparation of being placed into a queue. Others, however, may need - // to perfom a "clone" operation on some underlying request data before - // the request can be properly placed into a queue. - request->prepare_for_queue(); - - this->queue_.put(request); - - this->work_available_.signal(); - - return true; -} - - -int -TAO::CSD::TP_Task::open(void* num_threads_ptr) -{ - Thread_Counter num = 1; - - if (num_threads_ptr != 0) - { - Thread_Counter* tmp = static_cast<Thread_Counter*> (num_threads_ptr); - - if (tmp == 0) - { - ACE_ERROR_RETURN((LM_ERROR, - "(%P|%t) TP_Task failed to open. " - "Invalid argument type passed to open().\n"), - -1); - } - - num = *tmp; - } - - // We can't activate 0 threads. Make sure this isn't the case. - if (num < 1) - { - ACE_ERROR_RETURN((LM_ERROR, - "(%P|%t) TP_Task failed to open. " - "num_threads (%u) is less-than 1.\n", - num), - -1); - } - - // Likewise, we can't activate too many. Make sure this isn't the case. - if (num > MAX_THREADPOOL_TASK_WORKER_THREADS) - { - ACE_ERROR_RETURN((LM_ERROR, - "(%P|%t) TP_Task failed to open. " - "num_threads (%u) is too large. Max is %d.\n", - num, MAX_THREADPOOL_TASK_WORKER_THREADS), - -1); - } - - // We need the lock acquired from here on out. - GuardType guard(this->lock_); - - // We can assume that we are in the proper state to handle this open() - // call as long as we haven't been open()'ed before. - if (this->opened_) - { - ACE_ERROR_RETURN((LM_ERROR, - "(%P|%t) TP_Task failed to open. " - "Task has previously been open()'ed.\n"), - -1); - } - - // Activate this task object with 'num' worker threads. - if (this->activate(THR_NEW_LWP | THR_JOINABLE, num) != 0) - { - // Assumes that when activate returns non-zero return code that - // no threads were activated. - ACE_ERROR_RETURN((LM_ERROR, - "(%P|%t) TP_Task failed to activate " - "(%d) worker threads.\n", - num), - -1); - } - - // Now we have past the point where we can say we've been open()'ed before. - this->opened_ = true; - - // Now we wait until all of the threads have started. - while (this->num_threads_ != num) - { - this->active_workers_.wait(); - } - - // We can now accept requests (via our add_request() method). - this->accepting_requests_ = true; - - return 0; -} - - -int -TAO::CSD::TP_Task::svc() -{ - // Account for this current worker thread having started the - // execution of this svc() method. - { - GuardType guard(this->lock_); - // Put the thread id into a collection which is used to check whether - // the orb shutdown is called by one of the threads in the pool. - ACE_thread_t thr_id = ACE_OS::thr_self (); - if (this->activated_threads_.set(thr_id, this->num_threads_) == -1) - { - ACE_ERROR_RETURN((LM_ERROR, - ACE_TEXT("(%P|%t)TP_Task::svc: number of threads is out of range \n")), - 0); - } - ++this->num_threads_; - this->active_workers_.signal(); - } - - // This visitor object will be re-used over and over again as part of - // the "GetWork" logic below. - TP_Dispatchable_Visitor dispatchable_visitor; - - // Start the "GetWork-And-PerformWork" loop for the current worker thread. - while (1) - { - TP_Request_Handle request; - - // Do the "GetWork" step. - { - // Acquire the lock until just before we decide to "PerformWork". - GuardType guard(this->lock_); - - // Start the "GetWork" loop. - while (request.is_nil()) - { - if (this->shutdown_initiated_) - { - // This breaks us out of all loops with one fell swoop. - return 0; - } - - // There is no need to visit the queue if it is empty. - if (!this->queue_.is_empty()) - { - // Reset the visitor since we use it over and over. This - // will cause the visitor to drop any reference to - // a request that it may still be holding from a prior - // call to accept_visitor(). - dispatchable_visitor.reset(); - - // Visit the requests in the queue in hopes of - // locating the first "dispatchable" (ie, not busy) request. - // If a dispatchable request is located, it is extracted - // from the queue and saved in a handle data member in the - // visitor object. - this->queue_.accept_visitor(dispatchable_visitor); - - // If a dispatchable request is located, it is extracted - // from the queue and saved in a handle data member in the - // visitor object. Let's get a "copy" (or a NULL pointer - // if the visitor didn't locate/extract one). - request = dispatchable_visitor.request(); - } - - // Either the queue is empty or we couldn't find any dispatchable - // requests in the queue at this time. - if (request.is_nil()) - { - // Let's wait until we hear about the possibility of - // work before we go look again. - this->work_available_.wait(); - } - } - - // We have dropped out of the "while (request.is_nil())" loop. - // We only get here is we located/extracted a dispatchable request - // from the queue. Note that the visitor will have already - // marked the target servant as now being busy (because of us). - // We can now safely release the lock. - } - - // Do the "PerformWork" step. We don't need the lock_ to do this. - request->dispatch(); - - // Now that the request has been dispatched, we need to mark the target - // servant as no longer being busy, and we need to signal any wait()'ing - // worker threads that there may be some dispatchable requests in the - // queue now for this not-busy servant. We need the lock_ to do this. - { - GuardType guard(this->lock_); - request->mark_as_ready(); - this->work_available_.signal(); - } - - // Note that the request will be "released" here when the request - // handle falls out of scope and its destructor performs the - // _remove_ref() call on the underlying TP_Request object. - } - - // This will never get executed. - return 0; -} - - -int -TAO::CSD::TP_Task::close(u_long flag) -{ - GuardType guard(this->lock_); - - if (flag == 0) - { - // Worker thread is closing. - --this->num_threads_; - this->active_workers_.signal(); - } - else - { - // Strategy object is shutting down the task. - - // Do nothing if this task has never been open()'ed. - if (!this->opened_) - { - return 0; - } - - // Set the shutdown flag to true. - this->shutdown_initiated_ = true; - - // Stop accepting requests. - this->accepting_requests_ = false; - - // Signal all worker threads waiting on the work_available_ condition. - this->work_available_.broadcast(); - - size_t num_waiting_threads = 0; - - ACE_thread_t my_thr_id = ACE_OS::thr_self (); - - // Check whether the calling thread(calling orb shutdown) is one of the - // threads in the pool. If it is then it should not wait itself. - size_t size = this->activated_threads_.size (); - - for (size_t i = 0; i < size; i ++) - { - ACE_thread_t thr_id = 0; - if (activated_threads_.get (thr_id, i) == 0 && thr_id == my_thr_id) - { - num_waiting_threads = 1; - break; - } - } - - // Wait until all worker threads have shutdown. - while (this->num_threads_ != num_waiting_threads) - { - this->active_workers_.wait(); - } - - // Cancel all requests. - TP_Cancel_Visitor cancel_visitor; - this->queue_.accept_visitor(cancel_visitor); - } - - return 0; -} - - - -void -TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) -{ - GuardType guard(this->lock_); - - // Cancel the requests targeted for the provided servant. - TP_Cancel_Visitor cancel_visitor(servant); - this->queue_.accept_visitor(cancel_visitor); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h deleted file mode 100644 index 65839aeb3b7..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h +++ /dev/null @@ -1,164 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_TP_Task.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_TP_TASK_H -#define TAO_CSD_TP_TASK_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Queue.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/Condition.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Task.h" -#include "ace/Synch.h" -#include "ace/Containers_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - /// Typedef for the number of threads. - typedef unsigned long Thread_Counter; - - /** - * @class TP_Task - * - * @brief Active Object managing a queue of request objects. - * - * There are two types of "users" of a TP_Task object: - * - * 1) The TP_Strategy object that "owns" this task object. - * 2) The worker threads that "run" this task object as an - * "active object". - * - * The TP_Strategy object that "owns" this task object dictates - * when the worker threads are activated and when they are shutdown. It - * also injects requests into this task's queue via calls to the - * add_request() method. It is also the TP_Strategy object that - * dictates the number of worker threads to be activated via a call to - * the set_num_threads() method. - * - * The active object pattern is implemented via the use of the - * the ACE_Task_Base base class, and each worker thread will - * invoke this task's svc() method, and when the svc() returns, the - * worker thread will invoke this task's close() method (with the - * flag argument equal to 0). - * - * @note I just wanted to document an idea... When the pool consists - * of only one worker thread, we could care less about checking - * if target servant objects are busy or not. The simple fact - * that only one thread will be dispatching all requests means - * that servant objects will never be busy when the thread - * tests to see if a request is "ready_for_dispatch()". I'm - * just wondering if this knowledge can be applied to the - * implementation such that the "pool with one worker thread" case - * performs more efficiently. This is STP vs SSTP. - * - */ - class TAO_CSD_TP_Export TP_Task : public ACE_Task_Base - { - public: - - /// Default Constructor. - TP_Task(); - - /// Virtual Destructor. - virtual ~TP_Task(); - - /// Put a request object on to the request queue. - /// Returns true if successful, false otherwise (it has been "rejected"). - bool add_request(TP_Request* request); - - /// Activate the worker threads - virtual int open(void* num_threads_ptr = 0); - - /// The "mainline" executed by each worker thread. - virtual int svc(); - - /// Multi-purpose: argument value is used to differentiate purpose. - /// - /// 0) Invoked by each worker thread after its invocation of the - /// svc() method has completed (ie, returned). - /// 1) Invoked by the strategy object to shutdown all worker threads. - virtual int close(u_long flag = 0); - - /// Cancel all requests that are targeted for the provided servant. - void cancel_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL); - - - private: - - typedef TAO_SYNCH_MUTEX LockType; - typedef ACE_Guard<LockType> GuardType; - typedef TAO_Condition<LockType> ConditionType; - - - /// Lock to protect the "state" (all of the data members) of this object. - LockType lock_; - - /// Condition used to signal worker threads that they may be able to - /// find a request in the queue_ that needs to be dispatched to a - /// servant that is currently "not busy". - /// This condition will be signal()'ed each time a new request is - /// added to the queue_, and also when a servant has become "not busy". - ConditionType work_available_; - - /// This condition will be signal()'ed each time the num_threads_ - /// data member has its value changed. This is used to keep the - /// close(1) invocation (ie, a shutdown request) blocked until all - /// of the worker threads have stopped running. - ConditionType active_workers_; - - /// Flag used to indicate when this task will (or will not) accept - /// requests via the the add_request() method. - bool accepting_requests_; - - /// Flag used to initiate a shutdown request to all worker threads. - bool shutdown_initiated_; - - /// Flag used to avoid multiple open() calls. - bool opened_; - - /// The number of currently active worker threads. - Thread_Counter num_threads_; - - /// The queue of pending servant requests (a.k.a. the "request queue"). - TP_Queue queue_; - - typedef ACE_Array <ACE_thread_t> Thread_Ids; - - /// The list of ids for the threads launched by this task. - Thread_Ids activated_threads_; - }; - - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/CSD_ThreadPool/CSD_TP_Task.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_TP_TASK_H */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl deleted file mode 100644 index d9c203f45ce..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl +++ /dev/null @@ -1,22 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -namespace { enum { MAX_THREADPOOL_TASK_WORKER_THREADS = 50 }; } -namespace { const ACE_thread_t default_thread_id = 0; } - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO::CSD::TP_Task::TP_Task() - : work_available_(this->lock_), - active_workers_(this->lock_), - accepting_requests_(false), - shutdown_initiated_(false), - opened_(false), - num_threads_(0), - activated_threads_ ((size_t)MAX_THREADPOOL_TASK_WORKER_THREADS, default_thread_id) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp deleted file mode 100644 index 2ae022711f5..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// $Id$ - -#include "tao/CSD_ThreadPool/CSD_ThreadPool.h" -#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h" -#include "tao/CSD_Framework/CSD_Framework_Loader.h" -#include "tao/debug.h" -#include "ace/Dynamic_Service.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -int -TAO_CSD_ThreadPool::init (void) -{ - static int initialized = 0; - if (initialized == 1) - return 0; - initialized = 1; - - TAO_CSD_Framework_Loader::init(); - return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_TP_Strategy_Factory); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h deleted file mode 100644 index bb1bd448284..00000000000 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file CSD_ThreadPool.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CSD_THREADPOOL_H -#define TAO_CSD_THREADPOOL_H - -#include /**/ "ace/pre.h" - -#include "tao/CSD_ThreadPool/CSD_TP_Export.h" -#include "tao/Versioned_Namespace.h" -#include "ace/Service_Object.h" -#include "ace/Service_Config.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TP_Strategy_Factory - * - * @brief An ACE_Service_Object capable of creating TP_Strategy objects. - * - * TBD - Explain in more detail. - * - */ -class TAO_CSD_TP_Export TAO_CSD_ThreadPool -{ - public: - /// Used to force the initialization of the ORB code. - static int init (void); -}; - -#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS) - -typedef int (*TAO_CSD_Threadpool) (void); - -static TAO_CSD_Threadpool -TAO_Requires_CSD_Threadpool = - &TAO_CSD_ThreadPool::init; - -#else - -static int -TAO_Requires_CSD_Threadpool = - TAO_CSD_ThreadPool::init (); - -#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* TAO_CSD_THREADPOOL_H */ diff --git a/TAO/tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in b/TAO/tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in deleted file mode 100644 index 7b2b894a6d7..00000000000 --- a/TAO/tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: TAO_CSD_ThreadPool -Description: TAO CSD ThreadPool Library -Requires: TAO_CSD_Framework -Version: @VERSION@ -Libs: -L${libdir} -lTAO -Cflags: -I${includedir} diff --git a/TAO/tao/Cache_Entries.cpp b/TAO/tao/Cache_Entries.cpp index 99ecb2ad72b..b4540ba96b3 100644 --- a/TAO/tao/Cache_Entries.cpp +++ b/TAO/tao/Cache_Entries.cpp @@ -13,8 +13,6 @@ ACE_RCSID(tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Cache_IntId::Cache_IntId (TAO_Transport *transport) @@ -48,5 +46,3 @@ namespace TAO return *this; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h index 993cc36de11..eea2967b2fc 100644 --- a/TAO/tao/Cache_Entries.h +++ b/TAO/tao/Cache_Entries.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + class TAO_Transport; @@ -197,7 +197,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Cache_Entries.inl" diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl index 475f8865a0d..711f635b20e 100644 --- a/TAO/tao/Cache_Entries.inl +++ b/TAO/tao/Cache_Entries.inl @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE @@ -191,5 +188,3 @@ namespace TAO return this->transport_property_; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl index a9a89c2735b..e782b819123 100644 --- a/TAO/tao/CharSeq.pidl +++ b/TAO/tao/CharSeq.pidl @@ -15,8 +15,6 @@ * -Wb,export_include=tao/TAO_Export.h * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * CharSeq.pidl */ diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index dda2d2a7878..7ed29c4865a 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/CharSeqC.h" +#include "CharSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ void CORBA::CharSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h index 39ead7275b3..4e7d783a866 100644 --- a/TAO/tao/CharSeqC.h +++ b/TAO/tao/CharSeqC.h @@ -52,8 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -141,8 +139,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp index 9b89b0f32d8..0c574d13b87 100644 --- a/TAO/tao/Cleanup_Func_Registry.cpp +++ b/TAO/tao/Cleanup_Func_Registry.cpp @@ -1,7 +1,7 @@ -#include "tao/Cleanup_Func_Registry.h" +#include "Cleanup_Func_Registry.h" #if !defined (__ACE_INLINE__) -# include "tao/Cleanup_Func_Registry.inl" +# include "Cleanup_Func_Registry.inl" #endif /* __ACE_INLINE__ */ #include "ace/Log_Msg.h" @@ -10,14 +10,21 @@ ACE_RCSID (tao, Cleanup_Func_Registry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) + : cleanup_funcs_ () +{ +} + +TAO_Cleanup_Func_Registry::~TAO_Cleanup_Func_Registry (void) +{ +} int TAO_Cleanup_Func_Registry::register_cleanup_function ( ACE_CLEANUP_FUNC func, size_t &slot_id) { - size_t const slot = this->cleanup_funcs_.size (); + size_t slot = this->cleanup_funcs_.size (); if (this->cleanup_funcs_.size (slot + 1) != 0) return -1; @@ -31,7 +38,7 @@ TAO_Cleanup_Func_Registry::register_cleanup_function ( void TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects) { - size_t const len = ts_objects.size (); + size_t len = ts_objects.size (); // The allocated slot may never have been used. It is therefore // possible that the TSS array size may be less than the cleanup @@ -49,4 +56,3 @@ TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects) } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index cc2c6162c97..6d42d4342ec 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -15,19 +15,14 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Array_Base.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Cleanup_Func_Registry * @@ -37,15 +32,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * invoking the corresponding cleanup function on each object. Hence, * there is a tight coupling between this class and the TAO ORB Core. */ -class TAO_Cleanup_Func_Registry +class TAO_Export TAO_Cleanup_Func_Registry { friend class TAO_ORB_Core; public: - /// Constructor. + /// Constructor TAO_Cleanup_Func_Registry (void); + /// Destructor + ~TAO_Cleanup_Func_Registry (void); + /// Return the number of registered cleanup functions. size_t size (void) const; @@ -67,8 +65,9 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. - TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &); - void operator= (const TAO_Cleanup_Func_Registry &); + ACE_UNIMPLEMENTED_FUNC ( + TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Cleanup_Func_Registry &)) private: @@ -80,10 +79,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Cleanup_Func_Registry.inl" +# include "Cleanup_Func_Registry.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl index 2216dce7c34..1e2a8362075 100644 --- a/TAO/tao/Cleanup_Func_Registry.inl +++ b/TAO/tao/Cleanup_Func_Registry.inl @@ -2,18 +2,8 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) - : cleanup_funcs_ () -{ -} - ACE_INLINE size_t TAO_Cleanup_Func_Registry::size (void) const { return this->cleanup_funcs_.size (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp index bf3d334201e..1bf7fb37f7b 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp @@ -1,13 +1,14 @@ -#include "tao/ClientRequestInterceptor_Adapter.h" +#include "ClientRequestInterceptor_Adapter.h" ACE_RCSID (tao, ClientInterceptorAdapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void) +namespace TAO { + ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void) + { + } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 0a5c83b8b94..7ccb34738c9 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,8 +30,6 @@ #include "tao/SystemException.h" #include "tao/Invocation_Utils.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ClientRequestInfo; namespace PortableInterceptor @@ -42,11 +40,6 @@ namespace PortableInterceptor typedef CORBA::Short ReplyStatus; } -namespace CORBA -{ - class PolicyList; -} - namespace TAO { class Invocation_Base; @@ -100,12 +93,6 @@ namespace TAO PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL) = 0; - /// Register an interceptor with policies. - virtual void add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) = 0; - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Convert TAO Invocation status to a PI status @@ -114,9 +101,6 @@ namespace TAO }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CLIENT_REQUEST_INTERCEPTOR_ADAPTER_H */ diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp index ee3178eea83..0aa32cabbc2 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp @@ -1,13 +1,10 @@ -#include "tao/ClientRequestInterceptor_Adapter_Factory.h" +#include "ClientRequestInterceptor_Adapter_Factory.h" ACE_RCSID (tao, ClientRequestInterceptorAdapterFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ClientRequestInterceptor_Adapter_Factory::~TAO_ClientRequestInterceptor_Adapter_Factory (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h index 805608c2af0..f9878697bb9 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,11 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Service_Object.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -47,8 +44,6 @@ public: virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CLIENTREQUESTINTERCEPTOR_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp index f459955e2bf..ba7d37b5612 100644 --- a/TAO/tao/Client_Strategy_Factory.cpp +++ b/TAO/tao/Client_Strategy_Factory.cpp @@ -4,7 +4,9 @@ ACE_RCSID(tao, Client_Strategy_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void) +{ +} TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void) { @@ -63,5 +65,3 @@ TAO_Client_Strategy_Factory::use_cleanup_options (void) const { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index 3c63290ad4a..fa3ec2eb1b4 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -13,25 +13,17 @@ #ifndef TAO_CLIENT_STRATEGY_FACTORY_H #define TAO_CLIENT_STRATEGY_FACTORY_H - #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/Service_Object.h" +#include "TAO_Export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport_Mux_Strategy; class TAO_Wait_Strategy; class TAO_Transport; @@ -47,6 +39,9 @@ class TAO_Connect_Strategy; class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object { public: + // = Intialization and termination methods. + /// Constructor. + TAO_Client_Strategy_Factory (void); /// Destructor virtual ~TAO_Client_Strategy_Factory (void); @@ -85,7 +80,5 @@ public: virtual bool use_cleanup_options (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CLIENT_STRATEGY_FACTORY_H */ diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index 215bac88618..28e8cc27453 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -1,6 +1,8 @@ +// -*- C++ -*- +// // $Id$ -#include "tao/CodecFactory/CDR_Encaps_Codec.h" +#include "CDR_Encaps_Codec.h" #include "tao/CDR.h" #include "tao/OctetSeqC.h" @@ -12,29 +14,22 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" -#include "tao/Codeset_Translator_Base.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" -ACE_RCSID (CodecFactory, +ACE_RCSID (tao, CDR_Encaps_Codec, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec ( - CORBA::Octet major, - CORBA::Octet minor, - TAO_ORB_Core * orb_core, - TAO_Codeset_Translator_Base * char_trans, - TAO_Codeset_Translator_Base * wchar_trans) +TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major, + CORBA::Octet minor, + TAO_ORB_Core * orb_core) : major_ (major), minor_ (minor), - orb_core_ (orb_core), - char_translator_ (char_trans), - wchar_translator_ (wchar_trans) + orb_core_ (orb_core) { } @@ -63,15 +58,6 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data this->major_, this->minor_); - if (this->char_translator_) - { - this->char_translator_->assign (&cdr); - } - if (this->wchar_translator_) - { - this->wchar_translator_->assign (&cdr); - } - if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)) && (cdr << data)) { @@ -137,15 +123,6 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data this->minor_, this->orb_core_); - if (this->char_translator_) - { - this->char_translator_->assign (&cdr); - } - if (this->wchar_translator_) - { - this->wchar_translator_->assign (&cdr); - } - CORBA::Boolean byte_order; if (cdr >> TAO_InputCDR::to_boolean (byte_order)) { @@ -191,15 +168,6 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data this->major_, this->minor_); - if (this->char_translator_) - { - this->char_translator_->assign (&cdr); - } - if (this->wchar_translator_) - { - this->wchar_translator_->assign (&cdr); - } - if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))) { TAO::Any_Impl *impl = data.impl (); @@ -308,15 +276,6 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, this->minor_, this->orb_core_); - if (this->char_translator_) - { - this->char_translator_->assign (&cdr); - } - if (this->wchar_translator_) - { - this->wchar_translator_->assign (&cdr); - } - CORBA::Boolean byte_order; if (cdr >> TAO_InputCDR::to_boolean (byte_order)) @@ -364,5 +323,3 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding ( && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER)) ACE_THROW (IOP::Codec::InvalidTypeForEncoding ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index 37672c1e4de..3ee1e43137c 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/CodecFactory/IOP_Codec_includeC.h" +#include "IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,10 +23,6 @@ #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Codeset_Translator_Base; - /** * @class TAO_CDR_Encaps_Codec * @@ -52,9 +48,7 @@ public: /// Constructor. TAO_CDR_Encaps_Codec (CORBA::Octet major, CORBA::Octet minor, - TAO_ORB_Core * orb_core, - TAO_Codeset_Translator_Base * char_trans, - TAO_Codeset_Translator_Base * wchar_trans); + TAO_ORB_Core * orb_core); /// Encode the given data, including the TypeCode, into an octet /// sequence. @@ -109,8 +103,9 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. - TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &); - void operator= (const TAO_CDR_Encaps_Codec &); + ACE_UNIMPLEMENTED_FUNC ( + TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &)) private: @@ -124,15 +119,8 @@ private: /// encapsulation. TAO_ORB_Core * const orb_core_; - /// Char codeset translator - TAO_Codeset_Translator_Base * char_translator_; - - /// WChar codeset translator - TAO_Codeset_Translator_Base * wchar_translator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CDR_ENCAPS_CODEC_H */ diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp index f532539a4fd..646a88b28a2 100644 --- a/TAO/tao/CodecFactory/CodecFactory.cpp +++ b/TAO/tao/CodecFactory/CodecFactory.cpp @@ -1,3 +1,5 @@ +/* -*- C++ -*- */ + // ================================================================= /** * @file CodecFactory.cpp @@ -5,11 +7,12 @@ * $Id$ * * @author Johnny Willemsen <jwillemsen@remedy.nl> + * */ // ================================================================= -#include "tao/CodecFactory/CodecFactory.h" -#include "tao/CodecFactory/CodecFactory_impl.h" +#include "CodecFactory.h" +#include "CodecFactory_impl.h" #include "tao/ORB.h" #include "tao/debug.h" @@ -18,8 +21,6 @@ ACE_RCSID (CodecFactory, CodecFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Object_ptr TAO_CodecFactory_Loader::create_object ( CORBA::ORB_ptr orb, @@ -41,8 +42,6 @@ TAO_CodecFactory_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CodecFactory_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader, ACE_TEXT ("CodecFactory_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 230914bbbac..82c6f95b05d 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -16,21 +17,19 @@ #include /**/ "ace/pre.h" -#include "tao/CodecFactory/codecfactory_export.h" +#include "codecfactory_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_CODECFACTORY_SAFE_INCLUDE -#include "tao/CodecFactory/IOP_CodecC.h" +#include "IOP_CodecC.h" #undef TAO_CODECFACTORY_SAFE_INCLUDE #include "tao/Object_Loader.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_CodecFactory_Export TAO_CodecFactory_Loader : public TAO_Object_Loader { @@ -46,14 +45,12 @@ public: static int Initializer (void); }; -static int -TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader) ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) +static int +TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); + #include /**/ "ace/post.h" #endif /* TAO_CODECFACTORY_H */ diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index 2b1462c9693..96d1448d55b 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -2,102 +2,26 @@ // // $Id$ -#include "tao/CodecFactory/CodecFactory_impl.h" -#include "tao/CodecFactory/CDR_Encaps_Codec.h" +#include "CodecFactory_impl.h" +#include "CDR_Encaps_Codec.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" -#include "tao/ORB_Core.h" -#include "tao/Codeset_Manager.h" -#include "ace/Codeset_Symbols.h" ACE_RCSID (CodecFactory_impl, CodecFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core) : orb_core_ (orb_core) { } IOP::Codec_ptr -TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding, - IOP::CodecFactory::UnsupportedCodeset)) -{ - TAO_Codeset_Translator_Base *char_trans = 0; - TAO_Codeset_Translator_Base *wchar_trans = 0; - CONV_FRAME::CodeSetId ncsc; - CONV_FRAME::CodeSetId ncsw; - - TAO_Codeset_Manager *csm = this->orb_core_->codeset_manager (); - - if (csm) - { - char_trans = csm->get_char_trans (enc.char_codeset); - wchar_trans = csm->get_wchar_trans (enc.wchar_codeset); - csm->get_ncs (ncsc,ncsw); // pass by reference - } - else - { - // No codeset manager, so also raise an unsupported codeset - ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset ( - enc.wchar_codeset), - IOP::Codec::_nil ()); - } - - if (wchar_trans == 0 && - enc.wchar_codeset != ACE_CODESET_ID_ISO_UTF_16 && - enc.wchar_codeset != ncsw) - { - ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset ( - enc.wchar_codeset), - IOP::Codec::_nil ()); - } - - if (char_trans == 0 && - enc.char_codeset != ncsc) - { - ACE_THROW_RETURN (IOP::CodecFactory::UnsupportedCodeset ( - enc.char_codeset), - IOP::Codec::_nil ()); - } - - return this->create_codec_i (enc.major_version, - enc.minor_version, - enc.format, - char_trans, - wchar_trans - ACE_ENV_ARG_PARAMETER); -} - -IOP::Codec_ptr TAO_CodecFactory::create_codec (const IOP::Encoding & enc ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)) { - return this->create_codec_i (enc.major_version, - enc.minor_version, - enc.format, - 0, - 0 - ACE_ENV_ARG_PARAMETER); -} - -IOP::Codec_ptr -TAO_CodecFactory::create_codec_i (CORBA::Octet major, - CORBA::Octet minor, - IOP::EncodingFormat encoding_format, - TAO_Codeset_Translator_Base * char_trans, - TAO_Codeset_Translator_Base * wchar_trans - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)) -{ // @todo: Ideally we should have some sort of CodecFactory // registry to make it possible to add factories // dynamically. However, there currently isn't a need to @@ -107,14 +31,14 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, IOP::Codec_ptr codec = IOP::Codec::_nil (); - switch (encoding_format) + switch (enc.format) { // @@ MSVC 6 gets confused and thinks that // IOP::ENCODING_CDR_ENCAPS is not a constant, so its actual // value (0) is used instead. case 0 /* IOP::ENCODING_CDR_ENCAPS */: - if (major < 1) + if (enc.major_version < 1) { // There is no such thing as a "0.x" CDR encapsulation. ACE_THROW_RETURN (CORBA::BAD_PARAM ( @@ -126,11 +50,9 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, } ACE_NEW_THROW_EX (codec, - TAO_CDR_Encaps_Codec (major, - minor, - this->orb_core_, - char_trans, - wchar_trans), + TAO_CDR_Encaps_Codec (enc.major_version, + enc.minor_version, + this->orb_core_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( 0, @@ -147,5 +69,3 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, return codec; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index ba0859f667b..6699719071a 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/CodecFactory/IOP_Codec_includeC.h" +#include "IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,10 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Codeset_Translator_Base; - /** * @class TAO_CodecFactory * @@ -57,27 +53,14 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)); - /// Create a Coder/Decoder for the given type of encoding and codesets. - virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding, - IOP::CodecFactory::UnsupportedCodeset)); - private: + /// Prevent copying through the copy constructor and the assignment /// operator. - TAO_CodecFactory (const TAO_CodecFactory &); - void operator= (const TAO_CodecFactory &); - - IOP::Codec_ptr create_codec_i (CORBA::Octet major, - CORBA::Octet minor, - IOP::EncodingFormat encoding_format, - TAO_Codeset_Translator_Base * char_trans, - TAO_Codeset_Translator_Base * wchar_trans - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)); + ACE_UNIMPLEMENTED_FUNC ( + TAO_CodecFactory (const TAO_CodecFactory &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &)) + private: /// Pointer to the ORB Core. @@ -89,8 +72,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/CodecFactory/IOP_Codec.pidl b/TAO/tao/CodecFactory/IOP_Codec.pidl index be4caae91b3..d322ae98bc1 100644 --- a/TAO/tao/CodecFactory/IOP_Codec.pidl +++ b/TAO/tao/CodecFactory/IOP_Codec.pidl @@ -11,13 +11,11 @@ * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * IOP_Codec.pidl * */ @@ -25,9 +23,8 @@ #ifndef TAO_IOP_CODEC_PIDL #define TAO_IOP_CODEC_PIDL -#include "tao/Typecode_types.pidl" -#include "tao/OctetSeq.pidl" -#include "tao/CONV_FRAME.pidl" +#include <Typecode_types.pidl> +#include <OctetSeq.pidl> #pragma prefix "omg.org" @@ -54,25 +51,13 @@ module IOP octet minor_version; }; - struct Encoding_1_2 { - EncodingFormat format; - octet major_version; - octet minor_version; - CONV_FRAME::CodeSetId char_codeset; - CONV_FRAME::CodeSetId wchar_codeset; - }; - local interface CodecFactory { exception UnknownEncoding {}; - exception UnsupportedCodeset { - CONV_FRAME::CodeSetId codeset; - }; Codec create_codec (in Encoding enc) raises (UnknownEncoding); - Codec create_codec_with_codesets (in Encoding_1_2 enc) raises (UnknownEncoding, UnsupportedCodeset); }; }; #pragma prefix "" -#endif /* TAO_IOP_CODEC_PIDL */ +#endif /* TAO_IOP_PIDL */ diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp new file mode 100644 index 00000000000..2e54165d86c --- /dev/null +++ b/TAO/tao/CodecFactory/IOP_CodecA.cpp @@ -0,0 +1,704 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "CodecFactory.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" +#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Impl_T.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_Codec_InvalidTypeForEncoding ( + CORBA::tk_except, + "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", + "InvalidTypeForEncoding", + _tao_fields_IOP_Codec_InvalidTypeForEncoding, + 0); + +::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding = + &_tao_tc_IOP_Codec_InvalidTypeForEncoding; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_Codec_FormatMismatch ( + CORBA::tk_except, + "IDL:omg.org/IOP/Codec/FormatMismatch:1.0", + "FormatMismatch", + _tao_fields_IOP_Codec_FormatMismatch, + 0); + +::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch = + &_tao_tc_IOP_Codec_FormatMismatch; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_Codec_TypeMismatch ( + CORBA::tk_except, + "IDL:omg.org/IOP/Codec/TypeMismatch:1.0", + "TypeMismatch", + _tao_fields_IOP_Codec_TypeMismatch, + 0); + +::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch = + &_tao_tc_IOP_Codec_TypeMismatch; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/objref_typecode.cpp:76 + +static TAO::TypeCode::Objref<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_Codec ( + CORBA::tk_local_interface, + "IDL:omg.org/IOP/Codec:1.0", + "Codec"); + +namespace IOP +{ + ::CORBA::TypeCode_ptr const _tc_Codec = + &_tao_tc_IOP_Codec; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:31 + +static TAO::TypeCode::Alias<char const *, + CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_EncodingFormat ( + CORBA::tk_alias, + "IDL:omg.org/IOP/EncodingFormat:1.0", + "EncodingFormat", + &CORBA::_tc_short); + +namespace IOP +{ + ::CORBA::TypeCode_ptr const _tc_EncodingFormat = + &_tao_tc_IOP_EncodingFormat; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] = + { + { "format", &IOP::_tc_EncodingFormat }, + { "major_version", &CORBA::_tc_octet }, + { "minor_version", &CORBA::_tc_octet } + + }; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_Encoding ( + CORBA::tk_struct, + "IDL:omg.org/IOP/Encoding:1.0", + "Encoding", + _tao_fields_IOP_Encoding, + 3); + +namespace IOP +{ + ::CORBA::TypeCode_ptr const _tc_Encoding = + &_tao_tc_IOP_Encoding; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_CodecFactory_UnknownEncoding ( + CORBA::tk_except, + "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", + "UnknownEncoding", + _tao_fields_IOP_CodecFactory_UnknownEncoding, + 0); + +::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding = + &_tao_tc_IOP_CodecFactory_UnknownEncoding; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/objref_typecode.cpp:76 + +static TAO::TypeCode::Objref<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_IOP_CodecFactory ( + CORBA::tk_local_interface, + "IDL:omg.org/IOP/CodecFactory:1.0", + "CodecFactory"); + +namespace IOP +{ + ::CORBA::TypeCode_ptr const _tc_CodecFactory = + &_tao_tc_IOP_CodecFactory; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<IOP::Codec>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + IOP::Codec_ptr _tao_elem + ) +{ + IOP::Codec_ptr _tao_objptr = + IOP::Codec::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + IOP::Codec_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<IOP::Codec>::insert ( + _tao_any, + IOP::Codec::_tao_any_destructor, + IOP::_tc_Codec, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + IOP::Codec_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<IOP::Codec>::extract ( + _tao_any, + IOP::Codec::_tao_any_destructor, + IOP::_tc_Codec, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const IOP::Codec::InvalidTypeForEncoding &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert_copy ( + _tao_any, + IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor, + IOP::Codec::_tc_InvalidTypeForEncoding, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + IOP::Codec::InvalidTypeForEncoding *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::insert ( + _tao_any, + IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor, + IOP::Codec::_tc_InvalidTypeForEncoding, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + IOP::Codec::InvalidTypeForEncoding *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const IOP::Codec::InvalidTypeForEncoding *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const IOP::Codec::InvalidTypeForEncoding *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::extract ( + _tao_any, + IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor, + IOP::Codec::_tc_InvalidTypeForEncoding, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const IOP::Codec::FormatMismatch &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert_copy ( + _tao_any, + IOP::Codec::FormatMismatch::_tao_any_destructor, + IOP::Codec::_tc_FormatMismatch, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + IOP::Codec::FormatMismatch *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::insert ( + _tao_any, + IOP::Codec::FormatMismatch::_tao_any_destructor, + IOP::Codec::_tc_FormatMismatch, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + IOP::Codec::FormatMismatch *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const IOP::Codec::FormatMismatch *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const IOP::Codec::FormatMismatch *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::extract ( + _tao_any, + IOP::Codec::FormatMismatch::_tao_any_destructor, + IOP::Codec::_tc_FormatMismatch, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const IOP::Codec::TypeMismatch &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert_copy ( + _tao_any, + IOP::Codec::TypeMismatch::_tao_any_destructor, + IOP::Codec::_tc_TypeMismatch, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + IOP::Codec::TypeMismatch *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::insert ( + _tao_any, + IOP::Codec::TypeMismatch::_tao_any_destructor, + IOP::Codec::_tc_TypeMismatch, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + IOP::Codec::TypeMismatch *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const IOP::Codec::TypeMismatch *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const IOP::Codec::TypeMismatch *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::extract ( + _tao_any, + IOP::Codec::TypeMismatch::_tao_any_destructor, + IOP::Codec::_tc_TypeMismatch, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_structure/any_op_cs.cpp:54 + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const IOP::Encoding &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy ( + _tao_any, + IOP::Encoding::_tao_any_destructor, + IOP::_tc_Encoding, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + IOP::Encoding *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::Encoding>::insert ( + _tao_any, + IOP::Encoding::_tao_any_destructor, + IOP::_tc_Encoding, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + IOP::Encoding *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const IOP::Encoding *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const IOP::Encoding *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<IOP::Encoding>::extract ( + _tao_any, + IOP::Encoding::_tao_any_destructor, + IOP::_tc_Encoding, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<IOP::CodecFactory>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + IOP::CodecFactory_ptr _tao_elem + ) +{ + IOP::CodecFactory_ptr _tao_objptr = + IOP::CodecFactory::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + IOP::CodecFactory_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<IOP::CodecFactory>::insert ( + _tao_any, + IOP::CodecFactory::_tao_any_destructor, + IOP::_tc_CodecFactory, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + IOP::CodecFactory_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<IOP::CodecFactory>::extract ( + _tao_any, + IOP::CodecFactory::_tao_any_destructor, + IOP::_tc_CodecFactory, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const IOP::CodecFactory::UnknownEncoding &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert_copy ( + _tao_any, + IOP::CodecFactory::UnknownEncoding::_tao_any_destructor, + IOP::CodecFactory::_tc_UnknownEncoding, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + IOP::CodecFactory::UnknownEncoding *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::insert ( + _tao_any, + IOP::CodecFactory::UnknownEncoding::_tao_any_destructor, + IOP::CodecFactory::_tc_UnknownEncoding, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + IOP::CodecFactory::UnknownEncoding *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const IOP::CodecFactory::UnknownEncoding *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const IOP::CodecFactory::UnknownEncoding *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::extract ( + _tao_any, + IOP::CodecFactory::UnknownEncoding::_tao_any_destructor, + IOP::CodecFactory::_tc_UnknownEncoding, + _tao_elem + ); +} diff --git a/TAO/tao/CodecFactory/IOP_CodecC.cpp b/TAO/tao/CodecFactory/IOP_CodecC.cpp index 0445a72c755..965d8fb585e 100644 --- a/TAO/tao/CodecFactory/IOP_CodecC.cpp +++ b/TAO/tao/CodecFactory/IOP_CodecC.cpp @@ -26,27 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/CodecFactory/CodecFactory.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "CodecFactory.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "ace/OS_NS_string.h" -// TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:70 +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -81,20 +74,20 @@ TAO::Objref_Traits<IOP::Codec>::nil (void) return IOP::Codec::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<IOP::Codec>::marshal ( IOP::Codec_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", "InvalidTypeForEncoding" ) @@ -106,7 +99,7 @@ IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void) } IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -116,7 +109,7 @@ IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec:: IOP::Codec::InvalidTypeForEncoding& IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -128,28 +121,28 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_po } IOP::Codec::InvalidTypeForEncoding * -IOP::Codec::InvalidTypeForEncoding::_downcast ( ::CORBA::Exception *_tao_excp) +IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<InvalidTypeForEncoding *> (_tao_excp); } const IOP::Codec::InvalidTypeForEncoding * -IOP::Codec::InvalidTypeForEncoding::_downcast ( ::CORBA::Exception const *_tao_excp) +IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const InvalidTypeForEncoding *> (_tao_excp); } -::CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void) +CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * IOP::Codec::InvalidTypeForEncoding::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::Codec::InvalidTypeForEncoding (*this), @@ -168,7 +161,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void IOP::Codec::InvalidTypeForEncoding::_tao_decode ( @@ -176,38 +169,20 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const +CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const { return ::IOP::Codec::_tc_InvalidTypeForEncoding; } // TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_Codec_InvalidTypeForEncoding ( - ::CORBA::tk_except, - "IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", - "InvalidTypeForEncoding", - _tao_fields_IOP_Codec_InvalidTypeForEncoding, - 0); - -::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding = - &_tao_tc_IOP_Codec_InvalidTypeForEncoding; - -// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IOP::Codec::FormatMismatch::FormatMismatch (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/IOP/Codec/FormatMismatch:1.0", "FormatMismatch" ) @@ -219,7 +194,7 @@ IOP::Codec::FormatMismatch::~FormatMismatch (void) } IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -229,7 +204,7 @@ IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch & IOP::Codec::FormatMismatch& IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -241,28 +216,28 @@ void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer) } IOP::Codec::FormatMismatch * -IOP::Codec::FormatMismatch::_downcast ( ::CORBA::Exception *_tao_excp) +IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<FormatMismatch *> (_tao_excp); } const IOP::Codec::FormatMismatch * -IOP::Codec::FormatMismatch::_downcast ( ::CORBA::Exception const *_tao_excp) +IOP::Codec::FormatMismatch::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const FormatMismatch *> (_tao_excp); } -::CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void) +CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * IOP::Codec::FormatMismatch::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::Codec::FormatMismatch (*this), @@ -281,7 +256,7 @@ void IOP::Codec::FormatMismatch::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void IOP::Codec::FormatMismatch::_tao_decode ( @@ -289,38 +264,20 @@ void IOP::Codec::FormatMismatch::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const +CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const { return ::IOP::Codec::_tc_FormatMismatch; } // TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_Codec_FormatMismatch ( - ::CORBA::tk_except, - "IDL:omg.org/IOP/Codec/FormatMismatch:1.0", - "FormatMismatch", - _tao_fields_IOP_Codec_FormatMismatch, - 0); - -::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch = - &_tao_tc_IOP_Codec_FormatMismatch; - -// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IOP::Codec::TypeMismatch::TypeMismatch (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/IOP/Codec/TypeMismatch:1.0", "TypeMismatch" ) @@ -332,7 +289,7 @@ IOP::Codec::TypeMismatch::~TypeMismatch (void) } IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -342,7 +299,7 @@ IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_e IOP::Codec::TypeMismatch& IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -354,28 +311,28 @@ void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer) } IOP::Codec::TypeMismatch * -IOP::Codec::TypeMismatch::_downcast ( ::CORBA::Exception *_tao_excp) +IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<TypeMismatch *> (_tao_excp); } const IOP::Codec::TypeMismatch * -IOP::Codec::TypeMismatch::_downcast ( ::CORBA::Exception const *_tao_excp) +IOP::Codec::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const TypeMismatch *> (_tao_excp); } -::CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void) +CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * IOP::Codec::TypeMismatch::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::Codec::TypeMismatch (*this), @@ -394,7 +351,7 @@ void IOP::Codec::TypeMismatch::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void IOP::Codec::TypeMismatch::_tao_decode ( @@ -402,59 +359,61 @@ void IOP::Codec::TypeMismatch::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const +CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const { return ::IOP::Codec::_tc_TypeMismatch; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_Codec_TypeMismatch ( - ::CORBA::tk_except, - "IDL:omg.org/IOP/Codec/TypeMismatch:1.0", - "TypeMismatch", - _tao_fields_IOP_Codec_TypeMismatch, - 0); - -::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch = - &_tao_tc_IOP_Codec_TypeMismatch; - IOP::Codec::Codec (void) {} IOP::Codec::~Codec (void) {} +void +IOP::Codec::_tao_any_destructor (void *_tao_void_pointer) +{ + Codec *_tao_tmp_pointer = + static_cast<Codec *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + IOP::Codec_ptr IOP::Codec::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - return Codec::_duplicate ( - dynamic_cast<Codec_ptr> (_tao_objref) - ); + if (CORBA::is_nil (_tao_objref)) + { + return Codec::_nil (); + } + + Codec_ptr proxy = + dynamic_cast<Codec_ptr> (_tao_objref); + + return Codec::_duplicate (proxy); } IOP::Codec_ptr IOP::Codec::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - return Codec::_duplicate ( - dynamic_cast<Codec_ptr> (_tao_objref) - ); + if (CORBA::is_nil (_tao_objref)) + { + return Codec::_nil (); + } + + Codec_ptr proxy = + dynamic_cast<Codec_ptr> (_tao_objref); + + return Codec::_duplicate (proxy); } IOP::Codec_ptr @@ -464,7 +423,7 @@ IOP::Codec::_duplicate (Codec_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -474,7 +433,7 @@ IOP::Codec::_tao_release (Codec_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean IOP::Codec::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -508,83 +467,16 @@ const char* IOP::Codec::_interface_repository_id (void) const return "IDL:omg.org/IOP/Codec:1.0"; } -::CORBA::Boolean +CORBA::Boolean IOP::Codec::marshal (TAO_OutputCDR &) { return false; } // TAO_IDL - Generated from -// be\be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_Codec ( - ::CORBA::tk_local_interface, - "IDL:omg.org/IOP/Codec:1.0", - "Codec"); - -namespace IOP -{ - ::CORBA::TypeCode_ptr const _tc_Codec = - &_tao_tc_IOP_Codec; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_EncodingFormat ( - ::CORBA::tk_alias, - "IDL:omg.org/IOP/EncodingFormat:1.0", - "EncodingFormat", - &CORBA::_tc_short); - -namespace IOP -{ - ::CORBA::TypeCode_ptr const _tc_EncodingFormat = - &_tao_tc_IOP_EncodingFormat; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] = - { - { "format", &IOP::_tc_EncodingFormat }, - { "major_version", &CORBA::_tc_octet }, - { "minor_version", &CORBA::_tc_octet } - - }; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_Encoding ( - ::CORBA::tk_struct, - "IDL:omg.org/IOP/Encoding:1.0", - "Encoding", - _tao_fields_IOP_Encoding, - 3); - -namespace IOP -{ - ::CORBA::TypeCode_ptr const _tc_Encoding = - &_tao_tc_IOP_Encoding; -} - - - -// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void IOP::Encoding::_tao_any_destructor ( void *_tao_void_pointer ) @@ -595,50 +487,6 @@ IOP::Encoding::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding_1_2[] = - { - { "format", &IOP::_tc_EncodingFormat }, - { "major_version", &CORBA::_tc_octet }, - { "minor_version", &CORBA::_tc_octet }, - { "char_codeset", &CONV_FRAME::_tc_CodeSetId }, - { "wchar_codeset", &CONV_FRAME::_tc_CodeSetId } - - }; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_Encoding_1_2 ( - ::CORBA::tk_struct, - "IDL:omg.org/IOP/Encoding_1_2:1.0", - "Encoding_1_2", - _tao_fields_IOP_Encoding_1_2, - 5); - -namespace IOP -{ - ::CORBA::TypeCode_ptr const _tc_Encoding_1_2 = - &_tao_tc_IOP_Encoding_1_2; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 - -void -IOP::Encoding_1_2::_tao_any_destructor ( - void *_tao_void_pointer - ) -{ - Encoding_1_2 *_tao_tmp_pointer = - static_cast<Encoding_1_2 *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -// TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for IOP::CodecFactory. @@ -665,20 +513,20 @@ TAO::Objref_Traits<IOP::CodecFactory>::nil (void) return IOP::CodecFactory::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<IOP::CodecFactory>::marshal ( IOP::CodecFactory_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", "UnknownEncoding" ) @@ -690,7 +538,7 @@ IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void) } IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -700,7 +548,7 @@ IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory:: IOP::CodecFactory::UnknownEncoding& IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -712,28 +560,28 @@ void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_po } IOP::CodecFactory::UnknownEncoding * -IOP::CodecFactory::UnknownEncoding::_downcast ( ::CORBA::Exception *_tao_excp) +IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<UnknownEncoding *> (_tao_excp); } const IOP::CodecFactory::UnknownEncoding * -IOP::CodecFactory::UnknownEncoding::_downcast ( ::CORBA::Exception const *_tao_excp) +IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const UnknownEncoding *> (_tao_excp); } -::CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void) +CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * IOP::CodecFactory::UnknownEncoding::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::IOP::CodecFactory::UnknownEncoding (*this), @@ -752,7 +600,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void IOP::CodecFactory::UnknownEncoding::_tao_decode ( @@ -760,194 +608,61 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const +CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const { return ::IOP::CodecFactory::_tc_UnknownEncoding; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_CodecFactory_UnknownEncoding ( - ::CORBA::tk_except, - "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", - "UnknownEncoding", - _tao_fields_IOP_CodecFactory_UnknownEncoding, - 0); - -::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding = - &_tao_tc_IOP_CodecFactory_UnknownEncoding; - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_cs.cpp:63 - -IOP::CodecFactory::UnsupportedCodeset::UnsupportedCodeset (void) - : ::CORBA::UserException ( - "IDL:omg.org/IOP/CodecFactory/UnsupportedCodeset:1.0", - "UnsupportedCodeset" - ) -{ -} - -IOP::CodecFactory::UnsupportedCodeset::~UnsupportedCodeset (void) -{ -} - -IOP::CodecFactory::UnsupportedCodeset::UnsupportedCodeset (const ::IOP::CodecFactory::UnsupportedCodeset &_tao_excp) - : ::CORBA::UserException ( - _tao_excp._rep_id (), - _tao_excp._name () - ) -{ - this->codeset = _tao_excp.codeset; -} - -IOP::CodecFactory::UnsupportedCodeset& -IOP::CodecFactory::UnsupportedCodeset::operator= (const ::IOP::CodecFactory::UnsupportedCodeset &_tao_excp) -{ - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); - this->codeset = _tao_excp.codeset; - return *this; -} - -void IOP::CodecFactory::UnsupportedCodeset::_tao_any_destructor (void *_tao_void_pointer) -{ - UnsupportedCodeset *_tao_tmp_pointer = - static_cast<UnsupportedCodeset *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -IOP::CodecFactory::UnsupportedCodeset * -IOP::CodecFactory::UnsupportedCodeset::_downcast ( ::CORBA::Exception *_tao_excp) -{ - return dynamic_cast<UnsupportedCodeset *> (_tao_excp); -} - -const IOP::CodecFactory::UnsupportedCodeset * -IOP::CodecFactory::UnsupportedCodeset::_downcast ( ::CORBA::Exception const *_tao_excp) -{ - return dynamic_cast<const UnsupportedCodeset *> (_tao_excp); -} - -::CORBA::Exception *IOP::CodecFactory::UnsupportedCodeset::_alloc (void) -{ - ::CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnsupportedCodeset, 0); - return retval; -} - -::CORBA::Exception * -IOP::CodecFactory::UnsupportedCodeset::_tao_duplicate (void) const -{ - ::CORBA::Exception *result = 0; - ACE_NEW_RETURN ( - result, - ::IOP::CodecFactory::UnsupportedCodeset (*this), - 0 - ); - return result; -} - -void IOP::CodecFactory::UnsupportedCodeset::_raise (void) const -{ - TAO_RAISE (*this); -} - -void IOP::CodecFactory::UnsupportedCodeset::_tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const -{ - ACE_THROW ( ::CORBA::MARSHAL ()); -} - -void IOP::CodecFactory::UnsupportedCodeset::_tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ) -{ - ACE_THROW ( ::CORBA::MARSHAL ()); -} - - - -// TAO_IDL - Generated from -// be\be_visitor_exception/exception_ctor.cpp:66 - -IOP::CodecFactory::UnsupportedCodeset::UnsupportedCodeset ( - ::CONV_FRAME::CodeSetId _tao_codeset - ) - : ::CORBA::UserException ( - "IDL:omg.org/IOP/CodecFactory/UnsupportedCodeset:1.0", - "UnsupportedCodeset" - ) -{ - this->codeset = _tao_codeset; -} - -// TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr IOP::CodecFactory::UnsupportedCodeset::_tao_type (void) const -{ - return ::IOP::CodecFactory::_tc_UnsupportedCodeset; -} - -// TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_IOP_CodecFactory_UnsupportedCodeset[] = - { - { "codeset", &CONV_FRAME::_tc_CodeSetId } - - }; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_CodecFactory_UnsupportedCodeset ( - ::CORBA::tk_except, - "IDL:omg.org/IOP/CodecFactory/UnsupportedCodeset:1.0", - "UnsupportedCodeset", - _tao_fields_IOP_CodecFactory_UnsupportedCodeset, - 1); - -::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnsupportedCodeset = - &_tao_tc_IOP_CodecFactory_UnsupportedCodeset; - IOP::CodecFactory::CodecFactory (void) {} IOP::CodecFactory::~CodecFactory (void) {} +void +IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer) +{ + CodecFactory *_tao_tmp_pointer = + static_cast<CodecFactory *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + IOP::CodecFactory_ptr IOP::CodecFactory::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - return CodecFactory::_duplicate ( - dynamic_cast<CodecFactory_ptr> (_tao_objref) - ); + if (CORBA::is_nil (_tao_objref)) + { + return CodecFactory::_nil (); + } + + CodecFactory_ptr proxy = + dynamic_cast<CodecFactory_ptr> (_tao_objref); + + return CodecFactory::_duplicate (proxy); } IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - return CodecFactory::_duplicate ( - dynamic_cast<CodecFactory_ptr> (_tao_objref) - ); + if (CORBA::is_nil (_tao_objref)) + { + return CodecFactory::_nil (); + } + + CodecFactory_ptr proxy = + dynamic_cast<CodecFactory_ptr> (_tao_objref); + + return CodecFactory::_duplicate (proxy); } IOP::CodecFactory_ptr @@ -957,7 +672,7 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -967,7 +682,7 @@ IOP::CodecFactory::_tao_release (CodecFactory_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean IOP::CodecFactory::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -1001,204 +716,33 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const return "IDL:omg.org/IOP/CodecFactory:1.0"; } -::CORBA::Boolean +CORBA::Boolean IOP::CodecFactory::marshal (TAO_OutputCDR &) { return false; } // TAO_IDL - Generated from -// be\be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_IOP_CodecFactory ( - ::CORBA::tk_local_interface, - "IDL:omg.org/IOP/CodecFactory:1.0", - "CodecFactory"); - -namespace IOP -{ - ::CORBA::TypeCode_ptr const _tc_CodecFactory = - &_tao_tc_IOP_CodecFactory; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - const IOP::Encoding &_tao_elem - ) -{ - if (0 == &_tao_elem) // Trying to de-reference NULL object - _tao_any <<= static_cast<IOP::Encoding *>( 0 ); // Use non-copying insertion of a NULL - else - TAO::Any_Dual_Impl_T<IOP::Encoding>::insert_copy ( - _tao_any, - IOP::Encoding::_tao_any_destructor, - IOP::_tc_Encoding, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - IOP::Encoding *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IOP::Encoding>::insert ( - _tao_any, - IOP::Encoding::_tao_any_destructor, - IOP::_tc_Encoding, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - IOP::Encoding *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const IOP::Encoding *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - const IOP::Encoding *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<IOP::Encoding>::extract ( - _tao_any, - IOP::Encoding::_tao_any_destructor, - IOP::_tc_Encoding, - _tao_elem - ); -} - -// TAO_IDL - Generated from -// be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - const IOP::Encoding_1_2 &_tao_elem - ) -{ - if (0 == &_tao_elem) // Trying to de-reference NULL object - _tao_any <<= static_cast<IOP::Encoding_1_2 *>( 0 ); // Use non-copying insertion of a NULL - else - TAO::Any_Dual_Impl_T<IOP::Encoding_1_2>::insert_copy ( - _tao_any, - IOP::Encoding_1_2::_tao_any_destructor, - IOP::_tc_Encoding_1_2, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - IOP::Encoding_1_2 *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IOP::Encoding_1_2>::insert ( - _tao_any, - IOP::Encoding_1_2::_tao_any_destructor, - IOP::_tc_Encoding_1_2, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - IOP::Encoding_1_2 *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const IOP::Encoding_1_2 *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - const IOP::Encoding_1_2 *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<IOP::Encoding_1_2>::extract ( - _tao_any, - IOP::Encoding_1_2::_tao_any_destructor, - IOP::_tc_Encoding_1_2, - _tao_elem - ); -} - -// TAO_IDL - Generated from // be\be_visitor_structure/cdr_op_cs.cpp:61 -::CORBA::Boolean operator<< ( +CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const IOP::Encoding &_tao_aggregate ) { return (strm << _tao_aggregate.format) && - (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.major_version)) && - (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.minor_version)); + (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) && + (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version)); } -::CORBA::Boolean operator>> ( +CORBA::Boolean operator>> ( TAO_InputCDR &strm, IOP::Encoding &_tao_aggregate ) { return (strm >> _tao_aggregate.format) && - (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.major_version)) && - (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.minor_version)); -} - -// TAO_IDL - Generated from -// be\be_visitor_structure/cdr_op_cs.cpp:61 - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const IOP::Encoding_1_2 &_tao_aggregate - ) -{ - return - (strm << _tao_aggregate.format) && - (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.major_version)) && - (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.minor_version)) && - (strm << _tao_aggregate.char_codeset) && - (strm << _tao_aggregate.wchar_codeset); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - IOP::Encoding_1_2 &_tao_aggregate - ) -{ - return - (strm >> _tao_aggregate.format) && - (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.major_version)) && - (strm >> ::ACE_InputCDR::to_octet (_tao_aggregate.minor_version)) && - (strm >> _tao_aggregate.char_codeset) && - (strm >> _tao_aggregate.wchar_codeset); + (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) && + (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h index d8d3679abf0..2cab40f9767 100644 --- a/TAO/tao/CodecFactory/IOP_CodecC.h +++ b/TAO/tao/CodecFactory/IOP_CodecC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_ #define _TAO_IDL_ORIG_IOP_CODECC_H_ @@ -44,39 +44,41 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CodecFactory/codecfactory_export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Typecode_typesA.h" -#include "tao/AnyTypeCode/OctetSeqA.h" -#include "tao/AnyTypeCode/CONV_FRAMEA.h" #include "tao/Objref_VarOut_T.h" #include "tao/VarOut_T.h" #include "tao/Typecode_typesC.h" #include "tao/OctetSeqC.h" -#include "tao/CONV_FRAMEC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif #define TAO_EXPORT_MACRO TAO_CodecFactory_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace IOP { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_IOP_CODEC__VAR_OUT_CH_) #define _IOP_CODEC__VAR_OUT_CH_ @@ -105,7 +107,7 @@ namespace IOP #define _IOP_CODEC_CH_ class TAO_CodecFactory_Export Codec - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef Codec_ptr _ptr_type; @@ -117,12 +119,12 @@ namespace IOP static void _tao_release (Codec_ptr obj); static Codec_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Codec_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -131,15 +133,15 @@ namespace IOP return static_cast<Codec_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_) #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_ - class TAO_CodecFactory_Export InvalidTypeForEncoding : public ::CORBA::UserException + class TAO_CodecFactory_Export InvalidTypeForEncoding : public CORBA::UserException { public: @@ -151,12 +153,12 @@ namespace IOP static void _tao_any_destructor (void *); - static InvalidTypeForEncoding *_downcast ( ::CORBA::Exception *); - static const InvalidTypeForEncoding *_downcast ( ::CORBA::Exception const *); + static InvalidTypeForEncoding *_downcast (CORBA::Exception *); + static const InvalidTypeForEncoding *_downcast (CORBA::Exception const *); - static ::CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (void); - virtual ::CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -170,23 +172,26 @@ namespace IOP ACE_ENV_ARG_DECL ); - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:127 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 + // be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr const _tc_InvalidTypeForEncoding; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_) #define _IOP_CODEC_FORMATMISMATCH_CH_ - class TAO_CodecFactory_Export FormatMismatch : public ::CORBA::UserException + class TAO_CodecFactory_Export FormatMismatch : public CORBA::UserException { public: @@ -198,12 +203,12 @@ namespace IOP static void _tao_any_destructor (void *); - static FormatMismatch *_downcast ( ::CORBA::Exception *); - static const FormatMismatch *_downcast ( ::CORBA::Exception const *); + static FormatMismatch *_downcast (CORBA::Exception *); + static const FormatMismatch *_downcast (CORBA::Exception const *); - static ::CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (void); - virtual ::CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -211,46 +216,49 @@ namespace IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:127 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr const _tc_FormatMismatch; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_) #define _IOP_CODEC_TYPEMISMATCH_CH_ - - class TAO_CodecFactory_Export TypeMismatch : public ::CORBA::UserException + + class TAO_CodecFactory_Export TypeMismatch : public CORBA::UserException { public: - + TypeMismatch (void); TypeMismatch (const TypeMismatch &); ~TypeMismatch (void); TypeMismatch &operator= (const TypeMismatch &); - + static void _tao_any_destructor (void *); - - static TypeMismatch *_downcast ( ::CORBA::Exception *); - static const TypeMismatch *_downcast ( ::CORBA::Exception const *); - - static ::CORBA::Exception *_alloc (void); - - virtual ::CORBA::Exception *_tao_duplicate (void) const; + + static TypeMismatch *_downcast (CORBA::Exception *); + static const TypeMismatch *_downcast (CORBA::Exception const *); + + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -258,202 +266,170 @@ namespace IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:127 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr const _tc_TypeMismatch; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * encode ( const ::CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::IOP::Codec::InvalidTypeForEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * decode ( + + virtual CORBA::Any * decode ( const ::CORBA::OctetSeq & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::IOP::Codec::FormatMismatch )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * encode_value ( const ::CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::IOP::Codec::InvalidTypeForEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * decode_value ( + + virtual CORBA::Any * decode_value ( const ::CORBA::OctetSeq & data, ::CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::IOP::Codec::FormatMismatch, ::IOP::Codec::TypeMismatch )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. Codec (void); - + virtual ~Codec (void); - + private: // Private and unimplemented for concrete interfaces. Codec (const Codec &); - + void operator= (const Codec &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Codec; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 - + typedef CORBA::Short EncodingFormat; typedef CORBA::Short_out EncodingFormat_out; - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_EncodingFormat; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Encoding; - + typedef TAO_Fixed_Var_T< Encoding > Encoding_var; - + typedef Encoding & Encoding_out; - + // TAO_IDL - Generated from - // be\be_visitor_structure/structure_ch.cpp:57 - + // be\be_visitor_structure/structure_ch.cpp:52 + struct TAO_CodecFactory_Export Encoding { typedef Encoding_var _var_type; - + static void _tao_any_destructor (void *); IOP::EncodingFormat format; - ::CORBA::Octet major_version; - ::CORBA::Octet minor_version; + CORBA::Octet major_version; + CORBA::Octet minor_version; }; - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding; - - // TAO_IDL - Generated from - // be\be_type.cpp:258 - - struct Encoding_1_2; - - typedef - TAO_Fixed_Var_T< - Encoding_1_2 - > - Encoding_1_2_var; - - typedef - Encoding_1_2 & - Encoding_1_2_out; - - // TAO_IDL - Generated from - // be\be_visitor_structure/structure_ch.cpp:57 - - struct TAO_CodecFactory_Export Encoding_1_2 - { - typedef Encoding_1_2_var _var_type; - - static void _tao_any_destructor (void *); - IOP::EncodingFormat format; - ::CORBA::Octet major_version; - ::CORBA::Octet minor_version; - CONV_FRAME::CodeSetId char_codeset; - CONV_FRAME::CodeSetId wchar_codeset; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding_1_2; - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_) #define _IOP_CODECFACTORY__VAR_OUT_CH_ - + class CodecFactory; typedef CodecFactory *CodecFactory_ptr; - + typedef TAO_Objref_Var_T< CodecFactory > CodecFactory_var; - + typedef TAO_Objref_Out_T< CodecFactory @@ -461,114 +437,66 @@ namespace IOP CodecFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODECFACTORY_CH_) #define _IOP_CODECFACTORY_CH_ - + class TAO_CodecFactory_Export CodecFactory - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef CodecFactory_ptr _ptr_type; typedef CodecFactory_var _var_type; - + // The static operations. static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); - + static void _tao_release (CodecFactory_ptr obj); - + static CodecFactory_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static CodecFactory_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static CodecFactory_ptr _nil (void) { return static_cast<CodecFactory_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_) #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_ - - class TAO_CodecFactory_Export UnknownEncoding : public ::CORBA::UserException + + class TAO_CodecFactory_Export UnknownEncoding : public CORBA::UserException { public: - + UnknownEncoding (void); UnknownEncoding (const UnknownEncoding &); ~UnknownEncoding (void); UnknownEncoding &operator= (const UnknownEncoding &); - - static void _tao_any_destructor (void *); - - static UnknownEncoding *_downcast ( ::CORBA::Exception *); - static const UnknownEncoding *_downcast ( ::CORBA::Exception const *); - - static ::CORBA::Exception *_alloc (void); - - virtual ::CORBA::Exception *_tao_duplicate (void) const; - virtual void _raise (void) const; + static void _tao_any_destructor (void *); - virtual void _tao_encode ( - TAO_OutputCDR & - ACE_ENV_ARG_DECL - ) const; - - virtual void _tao_decode ( - TAO_InputCDR & - ACE_ENV_ARG_DECL - ); - - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; - }; - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding; + static UnknownEncoding *_downcast (CORBA::Exception *); + static const UnknownEncoding *_downcast (CORBA::Exception const *); -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_exception/exception_ch.cpp:53 + static CORBA::Exception *_alloc (void); -#if !defined (_IOP_CODECFACTORY_UNSUPPORTEDCODESET_CH_) -#define _IOP_CODECFACTORY_UNSUPPORTEDCODESET_CH_ - - class TAO_CodecFactory_Export UnsupportedCodeset : public ::CORBA::UserException - { - public: - - CONV_FRAME::CodeSetId codeset; - UnsupportedCodeset (void); - UnsupportedCodeset (const UnsupportedCodeset &); - ~UnsupportedCodeset (void); - - UnsupportedCodeset &operator= (const UnsupportedCodeset &); - - static void _tao_any_destructor (void *); - - static UnsupportedCodeset *_downcast ( ::CORBA::Exception *); - static const UnsupportedCodeset *_downcast ( ::CORBA::Exception const *); - - static ::CORBA::Exception *_alloc (void); - - virtual ::CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -576,87 +504,70 @@ namespace IOP 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 - - UnsupportedCodeset ( - CONV_FRAME::CodeSetId _tao_codeset - ); - - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + // be\be_visitor_exception/exception_ch.cpp:127 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - static ::CORBA::TypeCode_ptr const _tc_UnsupportedCodeset; + // be\be_visitor_typecode/typecode_decl.cpp:44 + + static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::Codec_ptr create_codec ( const ::IOP::Encoding & enc ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::IOP::CodecFactory::UnknownEncoding )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::IOP::Codec_ptr create_codec_with_codesets ( - const ::IOP::Encoding_1_2 & enc - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::IOP::CodecFactory::UnknownEncoding, - ::IOP::CodecFactory::UnsupportedCodeset - )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. CodecFactory (void); - + virtual ~CodecFactory (void); - + private: // Private and unimplemented for concrete interfaces. CodecFactory (const CodecFactory &); - + void operator= (const CodecFactory &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module IOP @@ -667,9 +578,9 @@ namespace IOP namespace TAO { -#if !defined (_IOP_CODEC__TRAITS_) -#define _IOP_CODEC__TRAITS_ - +#if !defined (_IOP_CODEC__TRAITS_CH_) +#define _IOP_CODEC__TRAITS_CH_ + template<> struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec> { @@ -680,7 +591,7 @@ namespace TAO ::IOP::Codec_ptr ); static ::IOP::Codec_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::IOP::Codec_ptr p, TAO_OutputCDR & cdr ); @@ -688,9 +599,9 @@ namespace TAO #endif /* end #if !defined */ -#if !defined (_IOP_CODECFACTORY__TRAITS_) -#define _IOP_CODECFACTORY__TRAITS_ - +#if !defined (_IOP_CODECFACTORY__TRAITS_CH_) +#define _IOP_CODECFACTORY__TRAITS_CH_ + template<> struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory> { @@ -701,7 +612,7 @@ namespace TAO ::IOP::CodecFactory_ptr ); static ::IOP::CodecFactory_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::IOP::CodecFactory_ptr p, TAO_OutputCDR & cdr ); @@ -711,38 +622,78 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_visitor_structure/any_op_ch.cpp:53 +// be\be_visitor_interface/any_op_ch.cpp:52 -TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, const IOP::Encoding &); // copying version -TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, IOP::Encoding*); // noncopying version -TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, IOP::Encoding *&); // deprecated -TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const IOP::Encoding *&); +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &); // TAO_IDL - Generated from -// be\be_visitor_structure/any_op_ch.cpp:53 +// be\be_visitor_exception/any_op_ch.cpp:52 -TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, const IOP::Encoding_1_2 &); // copying version -TAO_CodecFactory_Export void operator<<= (::CORBA::Any &, IOP::Encoding_1_2*); // noncopying version -TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, IOP::Encoding_1_2 *&); // deprecated -TAO_CodecFactory_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const IOP::Encoding_1_2 *&); +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTypeForEncoding *&); // deprecated +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&); // TAO_IDL - Generated from -// be\be_visitor_structure/cdr_op_ch.cpp:54 +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMismatch *&); // deprecated +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&); + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMismatch *&); // deprecated +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&); + +// TAO_IDL - Generated from +// be\be_visitor_structure/any_op_ch.cpp:52 -TAO_CodecFactory_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &); -TAO_CodecFactory_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&); + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &); + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version +TAO_CodecFactory_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::UnknownEncoding *&); // deprecated +TAO_CodecFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&); // TAO_IDL - Generated from // be\be_visitor_structure/cdr_op_ch.cpp:54 -TAO_CodecFactory_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding_1_2 &); -TAO_CodecFactory_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding_1_2 &); +TAO_CodecFactory_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &); +TAO_CodecFactory_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" #endif /* ifndef */ + + diff --git a/TAO/tao/CodecFactory/IOP_Codec_include.pidl b/TAO/tao/CodecFactory/IOP_Codec_include.pidl index 7cb54a935a3..734a0a7dac7 100644 --- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl +++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl @@ -1,5 +1,3 @@ -// -*- IDL -*- - /** * @file IOP_Codec_include.pidl * @@ -22,8 +20,6 @@ * -Wb,export_include="tao/CodecFactory/codecfactory_export.h" \ * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * IOP_Codec_include.pidl * * 2. Then change this line in IOP_Codec_includeC.h: @@ -39,6 +35,6 @@ #define _IOP_CODEC_INCLUDE_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/CodecFactory/IOP_Codec.pidl" +#include <tao/CodecFactory/IOP_Codec.pidl> #endif /* _IOP_CODEC_INCLUDE_IDL_ */ diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeA.h b/TAO/tao/CodecFactory/IOP_Codec_includeA.h deleted file mode 100644 index 77742d1e1be..00000000000 --- a/TAO/tao/CodecFactory/IOP_Codec_includeA.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_IOPCODEC_INCLUDEA_H_ -#define _TAO_IDL_ORIG_IOPCODEC_INCLUDEA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/CodecFactory/IOP_Codec_includeC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h index dae38bfa7b4..7c81e3cfcf6 100644 --- a/TAO/tao/CodecFactory/IOP_Codec_includeC.h +++ b/TAO/tao/CodecFactory/IOP_Codec_includeC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_ #define _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_ @@ -42,6 +42,7 @@ #include "tao/CodecFactory/codecfactory_export.h" #include "tao/CodecFactory/CodecFactory.h" + #include "tao/ORB.h" #include "tao/Environment.h" @@ -50,20 +51,33 @@ #endif #define TAO_EXPORT_MACRO TAO_CodecFactory_Export +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CodecFactory/diff/IOP_Codec.diff b/TAO/tao/CodecFactory/diff/IOP_Codec.diff index 28debd5e9b0..46a67dc755f 100644 --- a/TAO/tao/CodecFactory/diff/IOP_Codec.diff +++ b/TAO/tao/CodecFactory/diff/IOP_Codec.diff @@ -1,5 +1,5 @@ ---- orig/IOP_COdecC.h 2005-10-24 10:11:07.404753600 +0200 -+++ IOP_COdecC.h 2005-10-24 15:16:18.314548800 +0200 +--- orig/IOP_COdecC.h 2005-06-07 13:09:58.255201600 +0200 ++++ IOP_COdecC.h 2005-06-07 13:45:14.618382400 +0200 @@ -33,6 +33,9 @@ #include /**/ "ace/pre.h" @@ -10,14 +10,25 @@ #include "ace/config-all.h" ---- orig/IOP_COdecC.cpp 2005-10-24 10:11:07.404753600 +0200 -+++ IOP_COdecC.cpp 2005-10-24 15:16:27.988459200 +0200 +--- orig/IOP_COdecC.cpp 2005-06-07 13:09:58.255201600 +0200 ++++ IOP_COdecC.cpp 2005-06-07 13:43:36.437204800 +0200 @@ -29,7 +29,7 @@ - // be\be_codegen.cpp:277 + // be\be_codegen.cpp:291 -#include "IOP_CodecC.h" +#include "CodecFactory.h" - #include "tao/AnyTypeCode/Null_RefCount_Policy.h" - #include "tao/AnyTypeCode/TypeCode_Constants.h" - #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" + #include "tao/CDR.h" + #include "tao/ORB_Core.h" + #include "ace/OS_NS_string.h" +--- orig/IOP_COdecA.cpp 2005-06-07 13:09:58.255201600 +0200 ++++ IOP_COdecA.cpp 2005-06-07 13:43:11.170873600 +0200 +@@ -25,7 +25,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#include "IOP_CodecC.h" ++#include "CodecFactory.h" + #include "tao/Null_RefCount_Policy.h" + #include "tao/TypeCode_Constants.h" + #include "tao/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp index c946ad4c3b5..aaf6c477eae 100644 --- a/TAO/tao/Codeset/Codeset.cpp +++ b/TAO/tao/Codeset/Codeset.cpp @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // ================================================================= /** @@ -7,20 +7,20 @@ * $Id$ * * @author Phil Mesnier <mesnier_p@ociweb.com> + * */ // ================================================================= -#include "tao/Codeset/Codeset.h" -#include "tao/Codeset/Codeset_Manager_Factory.h" -#include "tao/Codeset/UTF8_Latin1_Factory.h" -#include "tao/Codeset/UTF16_BOM_Factory.h" +#include "Codeset.h" +#include "Codeset_Manager_Factory.h" +#include "UTF8_Latin1_Factory.h" +#include "UTF16_BOM_Factory.h" #include "ace/Dynamic_Service.h" ACE_RCSID (Codeset, Codeset, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL int TAO_Codeset_Initializer::init (void) @@ -40,9 +40,7 @@ TAO_Codeset_Initializer::init (void) return result; } - result += ACE_Service_Config::process_directive + result += ACE_Service_Config::process_directive (ace_svc_desc_TAO_Codeset_Manager_Factory,1); // force replacement return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset.h b/TAO/tao/Codeset/Codeset.h index 73dc459283d..74f3b41881b 100644 --- a/TAO/tao/Codeset/Codeset.h +++ b/TAO/tao/Codeset/Codeset.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -16,15 +17,12 @@ #include /**/ "ace/pre.h" -#include "tao/Codeset/codeset_export.h" +#include "codeset_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Codeset_Export TAO_Codeset_Initializer { @@ -36,8 +34,6 @@ public: static int TAO_Requires_Codeset_Initializer = TAO_Codeset_Initializer::init (); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CODESET_H */ diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index 89e687db0d4..45a67353708 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -17,8 +17,8 @@ // // ============================================================================ -#include "tao/Codeset/Codeset_Descriptor.h" -#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "Codeset_Descriptor.h" +#include "Codeset_Translator_Factory.h" #include "ace/Codeset_Registry.h" #include "ace/Log_Msg.h" @@ -28,8 +28,6 @@ ACE_RCSID (Codeset, Codeset_Manager_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Codeset_Descriptor::TAO_Codeset_Descriptor () :ncs_ (0), max_bytes_ (1), @@ -57,10 +55,10 @@ TAO_Codeset_Descriptor::ncs (const ACE_TCHAR *name) { ACE_CDR::ULong n = 0; if (ACE_Codeset_Registry::locale_to_registry - (ACE_TEXT_ALWAYS_CHAR(name), n) == 0) + (ACE_TEXT_TO_CHAR_IN(name), n) == 0) { char **endPtr =0; - n = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(name), + n = ACE_OS::strtoul(ACE_TEXT_TO_CHAR_IN(name), endPtr, 0); } this->ncs(n); @@ -131,5 +129,3 @@ TAO_Codeset_Descriptor::translators (void) { return this->trans_base_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h index a0a8b89363c..164db546916 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.h +++ b/TAO/tao/Codeset/Codeset_Descriptor.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/Codeset/codeset_export.h" +#include "codeset_export.h" #include "ace/CDR_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -24,8 +24,6 @@ #include "tao/Codeset_Descriptor_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Codeset_Translator_Factory; class TAO_Codeset_Export TAO_Codeset_Descriptor @@ -58,8 +56,6 @@ private: Translator_Node *trans_base_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CODESET_DESCRIPTOR_H */ diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index 6becf8963c0..46a4b8d5b7f 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -11,14 +11,12 @@ */ // ================================================================= -#include "tao/Codeset/Codeset_Manager_Factory.h" +#include "Codeset_Manager_Factory.h" #include "ace/Service_Config.h" -#include "tao/Codeset/Codeset_Manager_i.h" +#include "Codeset_Manager_i.h" ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory () { } @@ -39,8 +37,6 @@ TAO_Codeset_Manager_Factory::create () return csm; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_Codeset, TAO_Codeset_Manager_Factory) ACE_STATIC_SVC_DEFINE (TAO_Codeset_Manager_Factory, ACE_TEXT ("TAO_Codeset"), diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 4651728556b..103ba9b52f8 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/Codeset/codeset_export.h" +#include "codeset_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,8 +29,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Codeset_Manager_Factory * @@ -47,7 +45,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_Codeset_Manager_Factory) diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 25f8d360848..2beb2e13cc2 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -9,10 +9,10 @@ #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "tao/Codeset/Codeset_Descriptor.h" -#include "tao/Codeset/Codeset_Manager_i.h" -#include "tao/Codeset/Codeset_Translator_Factory.h" -#include "tao/Codeset/Codeset.h" +#include "Codeset_Descriptor.h" +#include "Codeset_Manager_i.h" +#include "Codeset_Translator_Factory.h" +#include "Codeset.h" #include "ace/Dynamic_Service.h" #include "ace/Codeset_Registry.h" @@ -52,8 +52,6 @@ ACE_RCSID (Codeset, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1 CONV_FRAME::CodeSetId TAO_Codeset_Manager_i::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID; @@ -100,7 +98,7 @@ void TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile, TAO_Transport &trans) { - /// If tcs is already set on the transport then do not process, + /// If tcs is already set on the transport then donot process, /// use existing transport as CDR have translators set. TAO_Tagged_Components& theTaggedComp = theProfile.tagged_components (); @@ -122,8 +120,8 @@ TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile, ACE_TEXT ("TAO (%P|%t) - Codeset_Manager_i::set_tcs, ") ACE_TEXT ("No codeset component in profile\n"))); - // These are the "fallback" codeset ids for use if no context is - // available + // These are the "fallback" codeset ids for use if no context is + // available remote.ForCharData.native_code_set = TAO_CODESET_ID_XOPEN_UTF_8; remote.ForWcharData.native_code_set = @@ -218,7 +216,7 @@ TAO_Codeset_Manager_i::process_service_context (TAO_ServerRequest &request) void TAO_Codeset_Manager_i::generate_service_context (TAO_Operation_Details &opd, - TAO_Transport &trans) + TAO_Transport &trans) { TAO_Service_Context &service_cntx = opd.request_service_context (); CONV_FRAME::CodeSetContext codeset_cntx; @@ -257,7 +255,7 @@ TAO_Codeset_Manager_i::generate_service_context (TAO_Operation_Details &opd, /// Checks whether the NCS is a part of CCS int TAO_Codeset_Manager_i::isElementOf (CONV_FRAME::CodeSetId id, - CONV_FRAME::CodeSetComponent &cs_comp) + CONV_FRAME::CodeSetComponent &cs_comp) { for (CORBA::ULong i = 0L; i < cs_comp.conversion_code_sets.length (); @@ -273,7 +271,7 @@ TAO_Codeset_Manager_i::isElementOf (CONV_FRAME::CodeSetId id, /// Find the Intersection of Client and Server CCS's CONV_FRAME::CodeSetId TAO_Codeset_Manager_i::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1, - CONV_FRAME::CodeSetComponent &cs_comp2) + CONV_FRAME::CodeSetComponent &cs_comp2) { for(CORBA::ULong index = 0L; index < cs_comp1.conversion_code_sets.length(); @@ -290,7 +288,7 @@ TAO_Codeset_Manager_i::intersectionOf (CONV_FRAME::CodeSetComponent &cs_comp1, int TAO_Codeset_Manager_i::isCompatible(CONV_FRAME::CodeSetId cs1, - CONV_FRAME::CodeSetId cs2 ) + CONV_FRAME::CodeSetId cs2 ) { // Call the is_compatible method of ACE_Codeset_Registry return ACE_Codeset_Registry::is_compatible(cs1,cs2); @@ -299,7 +297,7 @@ TAO_Codeset_Manager_i::isCompatible(CONV_FRAME::CodeSetId cs1, /// returns the TCS for Char / Wchar CONV_FRAME::CodeSetId TAO_Codeset_Manager_i::computeTCS (CONV_FRAME::CodeSetComponent &remote, - CONV_FRAME::CodeSetComponent &local ) + CONV_FRAME::CodeSetComponent &local ) { if (remote.native_code_set == local.native_code_set) { @@ -403,7 +401,8 @@ TAO_Codeset_Manager_i::open(void) } } -// Initialise the specific type codeset factories + +/// Initialise the specific type codeset factories int TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, CONV_FRAME::CodeSetComponent& cs_comp) @@ -418,7 +417,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, { tlist->translator_factory_ = ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>::instance - (ACE_TEXT_ALWAYS_CHAR (tlist->name_)); + (ACE_TEXT_TO_CHAR_IN (tlist->name_)); if (tlist->translator_factory_ == 0) { @@ -467,6 +466,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd, return 0; } + TAO_Codeset_Translator_Base * TAO_Codeset_Manager_i::get_char_trans (CONV_FRAME::CodeSetId tcs) { @@ -486,7 +486,7 @@ TAO_Codeset_Manager_i::get_wchar_trans (CONV_FRAME::CodeSetId tcs) TAO_Codeset_Translator_Base * TAO_Codeset_Manager_i::get_translator_i (TAO_Codeset_Descriptor& cd, - CONV_FRAME::CodeSetId tcs) + CONV_FRAME::CodeSetId tcs) { for (TAO_Codeset_Descriptor::Translator_Node *tlist = cd.translators(); tlist; tlist = tlist->next_) @@ -498,12 +498,3 @@ TAO_Codeset_Manager_i::get_translator_i (TAO_Codeset_Descriptor& cd, return 0; } -void -TAO_Codeset_Manager_i::get_ncs (CONV_FRAME::CodeSetId &ncsc, - CONV_FRAME::CodeSetId &ncsw) -{ - ncsc = this->char_descriptor_.ncs(); - ncsw = this->wchar_descriptor_.ncs(); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index f5ca8491ca3..fe6f6b7b09c 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -25,11 +25,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Unbounded_Set.h" -#include "tao/Codeset/codeset_export.h" -#include "tao/Codeset/Codeset_Descriptor.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "codeset_export.h" +#include "Codeset_Descriptor.h" class TAO_Profile; class TAO_Transport; @@ -132,8 +129,6 @@ private: TAO_Codeset_Translator_Base * get_translator_i (TAO_Codeset_Descriptor&, CONV_FRAME::CodeSetId); - void get_ncs (CONV_FRAME::CodeSetId &ncsc, CONV_FRAME::CodeSetId& ncsw); - // The CodeSetComponentInfo struct contains all of the information // regarding the code sets this application recognizes. This is // where the native code set for both char and wchar are stored. @@ -143,7 +138,6 @@ private: TAO_Codeset_Descriptor wchar_descriptor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp index bd3a915c51d..affd4752199 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp @@ -17,15 +17,13 @@ // // ============================================================================ -#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "Codeset_Translator_Factory.h" #include "tao/CDR.h" ACE_RCSID (Codeset, Codeset_Translator_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory () { @@ -77,5 +75,3 @@ TAO_Codeset_Translator_Factory::assign_i ( { cdr->wchar_translator(trans); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 518a168de63..105afa3dc65 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -8,7 +8,7 @@ * * @author Phil Mesnier <mesnier_p@ociweb.com> */ -// =================================================================== +// ========================= #ifndef TAO_CODESET_TRANSLATOR_FACTORY_H #define TAO_CODESET_TRANSLATOR_FACTORY_H @@ -22,18 +22,14 @@ #include "tao/CONV_FRAMEC.h" #include "tao/Codeset_Translator_Base.h" -#include "tao/Codeset/codeset_export.h" +#include "codeset_export.h" +class TAO_InputCDR; +class TAO_OutputCDR; -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_InputCDR; -class TAO_OutputCDR; // **************************************************************** @@ -83,8 +79,6 @@ protected: void assign_i (TAO_OutputCDR *, ACE_WChar_Codeset_Translator* ) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - // Get the template includes last #include "tao/Codeset/Codeset_Translator_Factory_T.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp index 734417e9934..37d327ea80e 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ // ============================================================================ @@ -18,12 +19,10 @@ #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP #define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP -#include "tao/Codeset/Codeset_Translator_Factory_T.h" +#include "Codeset_Translator_Factory_T.h" #include "tao/debug.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<class NCS_TO_TCS> TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::TAO_Codeset_Translator_Factory_T () : translator_(0) @@ -87,6 +86,4 @@ TAO_Codeset_Translator_Factory_T<NCS_TO_TCS>::assign (TAO_OutputCDR *cdr) const } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_CODESET_TRANSLATOR_FACTORY_T_CPP */ diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index ce5a902c7fe..07408db8717 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -8,22 +8,18 @@ * * @author Phil Mesnier <mesnier_p@ociweb.com> */ -// =================================================================== - +// ========================= #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_H #define TAO_CODESET_TRANSLATOR_FACTORY_T_H #include /**/ "ace/pre.h" -#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "Codeset_Translator_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Codeset_Translator_Factory_T * @@ -67,14 +63,12 @@ private: NCS_TO_TCS *translator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Codeset/Codeset_Translator_Factory_T.cpp" +#include "Codeset_Translator_Factory_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index 1140d84a6bb..337c95e2af2 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -17,8 +17,7 @@ // // ============================================================================ -#include "tao/debug.h" -#include "tao/Codeset/UTF16_BOM_Factory.h" +#include "UTF16_BOM_Factory.h" #include "ace/OS_NS_strings.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -32,9 +31,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory, 0) ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF16_BOM_Factory) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UTF16_BOM_Factory::TAO_UTF16_BOM_Factory () : translator_ (0) , forceBE_ (false) @@ -138,5 +134,3 @@ TAO_UTF16_BOM_Factory::create_translator () const } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h index a72652a7458..64bc891198b 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.h +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h @@ -22,12 +22,10 @@ #include /**/ "ace/pre.h" #include "ace/Service_Config.h" -#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "Codeset_Translator_Factory.h" -#include "tao/Codeset/UTF16_BOM_Translator.h" -#include "tao/Codeset/codeset_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "UTF16_BOM_Translator.h" +#include "codeset_export.h" class TAO_Codeset_Export TAO_UTF16_BOM_Factory : public TAO_Codeset_Translator_Factory @@ -62,8 +60,6 @@ private: bool forceBE_; // force big endian wchar, warray, & wstring }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF16_BOM_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF16_BOM_Factory) diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 6f54540faf2..4103c10c8b7 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -12,7 +12,7 @@ // // ============================================================================ -#include "tao/Codeset/UTF16_BOM_Translator.h" +#include "UTF16_BOM_Translator.h" #include "ace/OS_Memory.h" #include "tao/debug.h" #include "ace/Log_Msg.h" @@ -30,8 +30,6 @@ static const size_t ACE_UTF16_CODEPOINT_SIZE = sizeof (ACE_UTF16_T); static const unsigned short ACE_UNICODE_BOM_CORRECT = 0xFEFFU; static const unsigned short ACE_UNICODE_BOM_SWAPPED = 0xFFFEU; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ///////////////////////////// // TAO_UTF16_BOM_Translator implementation @@ -436,5 +434,3 @@ TAO_UTF16_BOM_Translator::write_swapped_wchar_array_i (ACE_OutputCDR & cdr, } return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h index 6dbe046621d..6f8e5d6bc7c 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.h +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h @@ -22,15 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Codeset/codeset_export.h" -#include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" - +#include "codeset_export.h" // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_UTF16_BOM_Translator * @@ -95,7 +91,5 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* UTF16_BOM_TRANSLATOR_H */ diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 2298e093c7d..6b9d2881330 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -1,8 +1,7 @@ +// -*- C++ -*- // $Id$ -#include "tao/debug.h" #include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" -#include "tao/Codeset/UTF8_Latin1_Factory.h" +#include "UTF8_Latin1_Factory.h" ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, ACE_TEXT ("UTF8_Latin1_Factory"), @@ -13,8 +12,6 @@ ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, 0) ACE_FACTORY_DEFINE (TAO_Codeset, TAO_UTF8_Latin1_Factory) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UTF8_Latin1_Factory::TAO_UTF8_Latin1_Factory() : translator_ (0) { @@ -87,5 +84,3 @@ TAO_UTF8_Latin1_Factory::create_translator () const } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h index 292333ad7e0..81bfdf71f08 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h @@ -5,16 +5,14 @@ #define UTF8_LATIN1_FACTORY_H #include /**/ "ace/pre.h" -#include "tao/Codeset/codeset_export.h" +#include "codeset_export.h" #include "ace/Service_Config.h" -#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "Codeset_Translator_Factory.h" -#include "tao/Codeset/UTF8_Latin1_Translator.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "UTF8_Latin1_Translator.h" class TAO_Codeset_Export TAO_UTF8_Latin1_Factory - : public TAO_Codeset_Translator_Factory + : public TAO_Codeset_Translator_Factory { public: TAO_UTF8_Latin1_Factory (); @@ -44,8 +42,6 @@ private: TAO_UTF8_Latin1_Translator *translator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Codeset, TAO_UTF8_Latin1_Factory) ACE_FACTORY_DECLARE (TAO_Codeset, TAO_UTF8_Latin1_Factory) diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 204a1dc0bd6..e12bd90507a 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -17,13 +17,12 @@ // Phil Mesnier <mesnier_p@ociweb.com> // // ============================================================================ -#include "tao/Codeset/UTF8_Latin1_Translator.h" +#include "UTF8_Latin1_Translator.h" #include "tao/debug.h" #include "ace/OS_Memory.h" // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////// // UTF8_Latin1_Translator implementation @@ -220,5 +219,3 @@ TAO_UTF8_Latin1_Translator::write_char_array (ACE_OutputCDR & cdr, return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h index 791ea994d43..bcf40d115a9 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h @@ -22,14 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Codeset/codeset_export.h" -#include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" +#include "codeset_export.h" // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class UTF8_Latin1_Translator * @@ -81,9 +78,9 @@ private: ACE_CDR::Boolean write_char_i (ACE_OutputCDR &, ACE_CDR::Char); -}; +private: -TAO_END_VERSIONED_NAMESPACE_DECL +}; #include /**/ "ace/post.h" #endif /* UTF8_LATIN1_TRANSLATOR_H */ diff --git a/TAO/tao/Codeset_Descriptor_Base.h b/TAO/tao/Codeset_Descriptor_Base.h index 201de5e9bd3..fa164219e6b 100644 --- a/TAO/tao/Codeset_Descriptor_Base.h +++ b/TAO/tao/Codeset_Descriptor_Base.h @@ -21,10 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* * TAO_Codeset_Descriptor_Base describes the necessary interface for * Objects within libTAO to be able to supply information to the codeset @@ -33,17 +29,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * This class also serves as a default implementation when codeset support * is not linked in. */ + + class TAO_Export TAO_Codeset_Descriptor_Base { public: - virtual ~TAO_Codeset_Descriptor_Base (void); + virtual ~TAO_Codeset_Descriptor_Base (); virtual void ncs (const ACE_TCHAR *name) = 0; virtual void add_translator (const ACE_TCHAR *name) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CODESET_DESCRIPTOR_BASE_H */ diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 0402bfc6aea..9744abc08b7 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -1,23 +1,20 @@ // $Id$ -#include "tao/Codeset_Manager.h" -#include "tao/Codeset_Descriptor_Base.h" +#include "Codeset_Manager.h" +#include "Codeset_Descriptor_Base.h" ACE_RCSID (tao, Codeset_Manager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Codeset_Manager::~TAO_Codeset_Manager (void) +TAO_Codeset_Manager::~TAO_Codeset_Manager () { } -// Add the destructor for the codeset_descriptor_base here, because +// Add the default destructor for the codeset_descriptor_base here, because // it is only ever used in conjunction with the codeset manager. -TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base (void) +TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h index 163014327b1..e0cdc9710cb 100644 --- a/TAO/tao/Codeset_Manager.h +++ b/TAO/tao/Codeset_Manager.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /* @@ -8,7 +8,7 @@ * * Interface for the TAO CodeSet Manager. * - * @author Mahesh Vedantam <mahesh@ociweb.com> + * @author Mahesh Vedantam <mahesh#ociweb.com> */ //============================================================================= @@ -17,19 +17,15 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "tao/CONV_FRAMEC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/CONV_FRAMEC.h" +#include "TAO_Export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_WChar_Codeset_Translator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Profile; class TAO_Transport; @@ -59,18 +55,17 @@ class TAO_Codeset_Descriptor_Base; * context attached to the first request sent on the new connection. * */ + class TAO_Export TAO_Codeset_Manager { public: + virtual ~TAO_Codeset_Manager(); - /// Destructor. - virtual ~TAO_Codeset_Manager (void); - - /// Called by an object of TAO_Acceptor to set NCS and CCS values for - /// Char/Wchar in to the Object Reference. + /// Called by an object of TAO_Acceptor to set NCS and CCS values for + /// Char/Wchar in to the Object Reference. virtual void set_codeset (TAO_Tagged_Components& ) const = 0; - + /// /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the /// Transport virtual void set_tcs (TAO_Profile &theProfile, TAO_Transport &) = 0; @@ -92,12 +87,8 @@ public: virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void) = 0; virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void) = 0; - virtual void get_ncs (CONV_FRAME::CodeSetId &ncsc, - CONV_FRAME::CodeSetId &ncsw) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_CODESET_MANAGER_H */ diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index c7361b99079..a4ed7de44d8 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -1,27 +1,25 @@ // $Id$ -#include "tao/ORB_Core.h" -#include "tao/Codeset_Manager.h" -#include "tao/Codeset_Manager_Factory_Base.h" +#include "ORB_Core.h" +#include "Codeset_Manager.h" +#include "Codeset_Manager_Factory_Base.h" ACE_RCSID (tao, Codeset_Manager_Factory_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void) +TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base () { } int -TAO_Codeset_Manager_Factory_Base::is_default (void) const +TAO_Codeset_Manager_Factory_Base::is_default() const { return 1; } TAO_Codeset_Manager * -TAO_Codeset_Manager_Factory_Base::create (void) +TAO_Codeset_Manager_Factory_Base::create () { return 0; @@ -34,8 +32,6 @@ TAO_Codeset_Manager_Factory_Base::initialize (void) (ace_svc_desc_TAO_Codeset_Manager_Factory_Base); } -TAO_END_VERSIONED_NAMESPACE_DECL - static int TAO_Requires_Codeset_Manager_Factory_Base = TAO_Codeset_Manager_Factory_Base::initialize (); diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h index 0577320bbae..e69278db28c 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.h +++ b/TAO/tao/Codeset_Manager_Factory_Base.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /* @@ -8,7 +8,7 @@ * * Interface for the TAO CodeSet Manager. * - * @author Mahesh Vedantam <mahesh@ociweb.com> + * @author Mahesh Vedantam <mahesh#ociweb.com> */ //============================================================================= @@ -17,19 +17,14 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "ace/Service_Object.h" +#include "ace/Service_Config.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/Service_Object.h" -#include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Codeset_Manager; /** @@ -39,7 +34,7 @@ class TAO_Codeset_Manager; * * @description The base also provides a default implementation which * instantiates nothing. This default impl is replaced by the actual - * implementation if libTAO_Codeset is loaded. + * implementation is libTAO_Codeset is loaded. * */ @@ -63,8 +58,6 @@ public: static int initialize (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Codeset_Manager_Factory_Base) ACE_FACTORY_DECLARE (TAO, TAO_Codeset_Manager_Factory_Base) diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp index e72a02359f3..c5d222373b2 100644 --- a/TAO/tao/Codeset_Translator_Base.cpp +++ b/TAO/tao/Codeset_Translator_Base.cpp @@ -17,17 +17,13 @@ // // ===================================================================== -#include "tao/Codeset_Translator_Base.h" +#include "Codeset_Translator_Base.h" ACE_RCSID (tao, Codeset_Translator_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void) +TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base () { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h index c2af91a7522..cb87201e9ce 100644 --- a/TAO/tao/Codeset_Translator_Base.h +++ b/TAO/tao/Codeset_Translator_Base.h @@ -8,14 +8,13 @@ * * @author Phil Mesnier <mesnier_p@ociweb.com> */ -// =================================================================== +// ========================= #ifndef TAO_CODESET_TRANSLATOR_BASE_H #define TAO_CODESET_TRANSLATOR_BASE_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,17 +22,14 @@ #include "tao/CONV_FRAMEC.h" #include "tao/Codeset_Translator_Base.h" -#include "ace/Service_Object.h" +#include "TAO_Export.h" + +class TAO_InputCDR; +class TAO_OutputCDR; -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Char_Codeset_Translator; class ACE_WChar_Codeset_Translator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_InputCDR; -class TAO_OutputCDR; // **************************************************************** @@ -72,8 +68,5 @@ public: virtual void assign (TAO_OutputCDR *) const = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_Codeset_Translator_Base */ diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp index 6bb999a0a4a..135a1fb1b91 100644 --- a/TAO/tao/Collocated_Invocation.cpp +++ b/TAO/tao/Collocated_Invocation.cpp @@ -1,13 +1,13 @@ -#include "tao/Collocated_Invocation.h" -#include "tao/Collocation_Proxy_Broker.h" -#include "tao/ORB_Core.h" -#include "tao/Request_Dispatcher.h" -#include "tao/TAO_Server_Request.h" -#include "tao/Stub.h" -#include "tao/operation_details.h" +#include "Collocated_Invocation.h" +#include "Collocation_Proxy_Broker.h" +#include "ORB_Core.h" +#include "Request_Dispatcher.h" +#include "TAO_Server_Request.h" +#include "Stub.h" +#include "operation_details.h" #if TAO_HAS_INTERCEPTORS == 1 -# include "tao/PortableInterceptorC.h" +# include "PortableInterceptorC.h" #endif /*TAO_HAS_INTERCEPTORS */ ACE_RCSID (tao, @@ -15,8 +15,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Collocated_Invocation::Collocated_Invocation (CORBA::Object_ptr t, @@ -28,8 +26,7 @@ namespace TAO et, stub, detail, - response_expected, - false /* request_is_remote */ ) + response_expected) { } @@ -167,5 +164,3 @@ namespace TAO } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h index a9d2b0950fc..03068bcb8fb 100644 --- a/TAO/tao/Collocated_Invocation.h +++ b/TAO/tao/Collocated_Invocation.h @@ -10,7 +10,6 @@ * @author Balachandran Natarajan <bala@dre.vanderbilt.edu> */ //============================================================================= - #ifndef TAO_COLLOCATED_INVOCATION_H #define TAO_COLLOCATED_INVOCATION_H @@ -26,8 +25,6 @@ #include "tao/Invocation_Base.h" #include "tao/Exception.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Stub; @@ -88,14 +85,10 @@ namespace TAO ACE_ENV_ARG_DECL); private: - - // Disallow default construction. - Collocated_Invocation (void); + ACE_UNIMPLEMENTED_FUNC (Collocated_Invocation (void)) }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_COLLOCATED_INVOCATION_H*/ diff --git a/TAO/tao/Collocation_Proxy_Broker.cpp b/TAO/tao/Collocation_Proxy_Broker.cpp index e2c0653139f..b1d780feccf 100644 --- a/TAO/tao/Collocation_Proxy_Broker.cpp +++ b/TAO/tao/Collocation_Proxy_Broker.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Collocation_Proxy_Broker.h" +#include "Collocation_Proxy_Broker.h" ACE_RCSID (tao, @@ -8,10 +8,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Collocation_Proxy_Broker::~Collocation_Proxy_Broker (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h index 3da552f68a7..420ddec654f 100644 --- a/TAO/tao/Collocation_Proxy_Broker.h +++ b/TAO/tao/Collocation_Proxy_Broker.h @@ -22,13 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Collocation_Strategy.h" -#include "tao/Versioned_Namespace.h" - #include "ace/CORBA_macros.h" #include "ace/os_include/os_stddef.h" +#include "tao/Collocation_Strategy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> class TAO_Pseudo_Var_T; template <typename T, typename T_var> class TAO_Pseudo_Out_T; @@ -68,8 +65,6 @@ namespace TAO Collocation_Strategy strategy ACE_ENV_ARG_DECL) = 0; }; - -TAO_END_VERSIONED_NAMESPACE_DECL } #include /**/ "ace/post.h" diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp index 23d15bfc269..1f752fccc89 100644 --- a/TAO/tao/Collocation_Resolver.cpp +++ b/TAO/tao/Collocation_Resolver.cpp @@ -1,15 +1,13 @@ // $Id$ #include "tao/Collocation_Resolver.h" +#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Collocation_Resolver, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Collocation_Resolver::~TAO_Collocation_Resolver (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index b837f9acf15..46c6466ff47 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Collocation_Resolver.h @@ -14,19 +12,16 @@ #define TAO_COLLOCATION_RESOLVER_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" - -#include "ace/Service_Object.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" namespace CORBA { @@ -57,8 +52,6 @@ public: ACE_ENV_ARG_DECL) const = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_COLLOCATION_RESOLVER_H */ diff --git a/TAO/tao/Collocation_Strategy.h b/TAO/tao/Collocation_Strategy.h index 236149a387b..9a6e4927b52 100644 --- a/TAO/tao/Collocation_Strategy.h +++ b/TAO/tao/Collocation_Strategy.h @@ -14,10 +14,6 @@ #define TAO_COLLOCATION_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/orbconf.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Define symbolic names for the ORB collocation strategies. namespace TAO @@ -41,8 +37,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_COLLOCATION_STRATEGY_H */ diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index 06e17912045..5fb831711cb 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -1,8 +1,6 @@ -// $Id$ - #ifndef TAO_CONDITION_CPP #define TAO_CONDITION_CPP -#include "tao/Condition.h" +#include "Condition.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) @@ -10,7 +8,9 @@ #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (TAO, + Condition, + "$Id$") template <class MUTEX> TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m) @@ -57,6 +57,4 @@ TAO_Condition<MUTEX>::~TAO_Condition (void) delete this->mutex_; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_CONDITION_CPP */ +#endif /* TAO_CONDITION_CPP*/ diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 5a1d1bada70..c167bf85e0b 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" +#include "orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,11 +24,8 @@ #include "ace/Condition_T.h" #include "ace/Global_Macros.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Condition @@ -109,14 +106,12 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Condition.inl" +#include "Condition.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Condition.cpp" +#include "Condition.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index 0e69d8b1bf1..7e41b1cb2d0 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ //$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class MUTEX> ACE_INLINE int TAO_Condition<MUTEX>::wait (void) { @@ -51,5 +47,3 @@ TAO_Condition<MUTEX>::broadcast (void) { return this->cond_->broadcast (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp index 2299f775d46..98764d36066 100644 --- a/TAO/tao/Connect_Strategy.cpp +++ b/TAO/tao/Connect_Strategy.cpp @@ -1,11 +1,9 @@ -#include "tao/Connect_Strategy.h" +#include "Connect_Strategy.h" ACE_RCSID (tao, Connect_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) { @@ -15,5 +13,3 @@ TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) TAO_Connect_Strategy::~TAO_Connect_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h index 1189a6cd171..be88ba7ff60 100644 --- a/TAO/tao/Connect_Strategy.h +++ b/TAO/tao/Connect_Strategy.h @@ -15,25 +15,18 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Synch_Options; -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Connector; class TAO_Connection_Handler; class TAO_Transport; +class ACE_Synch_Options; +class ACE_Time_Value; /** * @class TAO_Connect_Strategy @@ -79,13 +72,10 @@ public: ACE_Time_Value *val) = 0; protected: - /// Cached copy of the ORB core pointer - TAO_ORB_Core * const orb_core_; - + TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 2da87ae7413..838774ad068 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -1,11 +1,11 @@ //$Id$ -#include "tao/Connection_Handler.h" -#include "tao/ORB_Core.h" -#include "tao/debug.h" -#include "tao/Resume_Handle.h" -#include "tao/Transport.h" -#include "tao/Wait_Strategy.h" +#include "Connection_Handler.h" +#include "ORB_Core.h" +#include "debug.h" +#include "Resume_Handle.h" +#include "Transport.h" +#include "Wait_Strategy.h" #include "ace/SOCK.h" #include "ace/Reactor.h" @@ -21,8 +21,6 @@ ACE_RCSID (tao, Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) , transport_ (0) @@ -203,7 +201,6 @@ TAO_Connection_Handler::handle_output_eh ( return_value = this->transport ()->handle_output (); this->pos_io_hook (return_value); - if (return_value != 0) { resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED); @@ -274,10 +271,6 @@ TAO_Connection_Handler::handle_input_internal ( this->pos_io_hook (return_value); - // Bug 1647; might need to change resume_handle's flag or - // change handle_input return value. - resume_handle.handle_input_return_value_hook(return_value); - if (TAO_debug_level > 6) { ACE_HANDLE handle = eh->get_handle (); @@ -287,8 +280,6 @@ TAO_Connection_Handler::handle_input_internal ( t_id, handle, h, return_value)); } - if (return_value == -1) - resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED); return return_value; } @@ -430,5 +421,3 @@ TAO_Connection_Handler::close_handler (void) } //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index e17ff6af08f..26312ebd79f 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -1,3 +1,4 @@ + // -*- C++ -*- //============================================================================= @@ -15,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/LF_CH_Event.h" +#include "LF_CH_Event.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,16 +24,11 @@ #include "tao/Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_ORB_Core; +class TAO_Transport; class ACE_SOCK; class ACE_Lock; class ACE_Event_Handler; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_ORB_Core; -class TAO_Transport; /* * Hook to specialize the connection handler with the @@ -178,7 +174,7 @@ protected: private: /// Pointer to the TAO_ORB_Core - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core *orb_core_; /// Transport object reference TAO_Transport* transport_; @@ -198,8 +194,6 @@ private: //@@ CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Connection_Handler.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index 5841cf3aebc..001bd2c811c 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -2,8 +2,6 @@ // //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ORB_Core * TAO_Connection_Handler::orb_core (void) { @@ -20,7 +18,7 @@ ACE_INLINE bool TAO_Connection_Handler::is_closed (void) const { return (this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED || - this->state_ == TAO_LF_Event::LFS_TIMEOUT); + this->state_ == TAO_LF_Event::LFS_TIMEOUT); } ACE_INLINE bool @@ -36,5 +34,3 @@ TAO_Connection_Handler::is_connecting (void) const } //@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp index 8bcf332a835..f903b1107e8 100644 --- a/TAO/tao/Connection_Purging_Strategy.cpp +++ b/TAO/tao/Connection_Purging_Strategy.cpp @@ -6,12 +6,10 @@ # include "tao/Connection_Purging_Strategy.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Connection_Purging_Strategy, +ACE_RCSID (tao, + Connection_Purging_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void) { } @@ -22,4 +20,4 @@ TAO_Connection_Purging_Strategy::cache_maximum (void) const return cache_maximum_; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h index c93038f7de3..eace4e9114c 100644 --- a/TAO/tao/Connection_Purging_Strategy.h +++ b/TAO/tao/Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file Connection_Purging_Strategy.h @@ -15,16 +13,12 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport; // **************************************************************** @@ -58,8 +52,6 @@ private: int cache_maximum_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Connection_Purging_Strategy.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Connection_Purging_Strategy.inl b/TAO/tao/Connection_Purging_Strategy.inl index a361f536198..b0bc5b7b8f0 100644 --- a/TAO/tao/Connection_Purging_Strategy.inl +++ b/TAO/tao/Connection_Purging_Strategy.inl @@ -1,14 +1,9 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Connection_Purging_Strategy::TAO_Connection_Purging_Strategy ( - int cache_maximum) - : cache_maximum_ (cache_maximum) + int cache_maximum) + : cache_maximum_ (cache_maximum) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp index 3e7c5742320..ad333727bce 100644 --- a/TAO/tao/Connector_Impl.cpp +++ b/TAO/tao/Connector_Impl.cpp @@ -1,5 +1,3 @@ -// $Id$ - #ifndef TAO_CONNECTOR_IMPL_CPP #define TAO_CONNECTOR_IMPL_CPP @@ -9,7 +7,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(tao, Connector_Impl, "$Id$") template <class SVC_HANDLER> TAO_Connect_Creation_Strategy<SVC_HANDLER>:: @@ -60,6 +58,5 @@ TAO_Connect_Concurrency_Strategy<SVC_HANDLER>:: arg); } -TAO_END_VERSIONED_NAMESPACE_DECL -#endif /* TAO_CONNECTOR_IMPL_CPP */ +#endif /*TAO_CONNECTOR_IMPL_CPP*/ diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index 6affe0860e6..535d357c209 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // =================================================================== /** * @file Connector_Impl.h @@ -22,13 +21,8 @@ #include "tao/Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Thread_Manager; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; +class ACE_Thread_Manager; /** * @class TAO_Connect_Creation_Strategy @@ -60,10 +54,10 @@ public: private: /// Pointer to the ORB_Core on which we are activated - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core* orb_core_; /// Are we using GIOP lite? - CORBA::Boolean const lite_flag_; + CORBA::Boolean lite_flag_; }; @@ -96,13 +90,10 @@ public: private: /// Pointer to the ORB Core. - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Connector_Impl.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index e71a35f173f..603b9b40ae4 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -20,7 +20,6 @@ ACE_RCSID (tao, Connector_Registry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Connector_Registry::TAO_Connector_Registry (void) : connectors_ (0), @@ -81,7 +80,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) unable to open connector for ") ACE_TEXT ("<%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())), + ACE_TEXT_TO_TCHAR_IN((*factory)->protocol_name ().c_str ())), -1); } @@ -267,5 +266,3 @@ TAO_Connector_Registry::object_key_delimiter (const char *ior) // against the provided string. return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index bb2a454f776..28bb89cd2a5 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -26,8 +26,6 @@ #include "tao/Basic_Types.h" #include "ace/Global_Macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_ORB_Core; class TAO_Connector; @@ -91,9 +89,9 @@ public: TAO_ConnectorSetIterator end (void); private: - // Disallow copying and assignment. - TAO_Connector_Registry (const TAO_Connector_Registry&); - void operator= (const TAO_Connector_Registry&); + // Prohibited + ACE_UNIMPLEMENTED_FUNC (TAO_Connector_Registry (const TAO_Connector_Registry&)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Connector_Registry&)) private: /// List of connectors that are currently open. @@ -103,8 +101,6 @@ private: size_t size_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) #include "tao/Connector_Registry.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Connector_Registry.i b/TAO/tao/Connector_Registry.i index e824efb5a6a..c2976325560 100644 --- a/TAO/tao/Connector_Registry.i +++ b/TAO/tao/Connector_Registry.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ConnectorSetIterator TAO_Connector_Registry::begin (void) { @@ -15,5 +13,3 @@ TAO_Connector_Registry::end (void) { return this->connectors_ + this->size_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index f90dcaddebf..b1d3067dad6 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -1,5 +1,3 @@ -// -*- IDL -*- - /** * @file Current.pidl * @@ -14,8 +12,6 @@ * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Current.pidl * * diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 561ad8d1cd1..5b38d3dae99 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:288 -#include "tao/CurrentC.h" +#include "CurrentC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -164,5 +162,3 @@ CORBA::Current::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index e102b492f15..e23843d6261 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -59,8 +59,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -185,8 +183,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 753ae4496d7..b8c4608aefc 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -1,29 +1,31 @@ // $Id$ -#include "tao/DLL_Parser.h" -#include "tao/Object_Loader.h" -#include "tao/Object.h" -#include "tao/Environment.h" -#include "tao/ORB_Constants.h" -#include "tao/SystemException.h" +#include "DLL_Parser.h" +#include "Object_Loader.h" +#include "Object.h" +#include "Environment.h" +#include "ORB_Constants.h" +#include "SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#if !defined(__ACE_INLINE__) +#include "DLL_Parser.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID (tao, DLL_Parser, "$Id$") -static const char dll_prefix[] = "DLL:"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DLL_Parser::~TAO_DLL_Parser (void) { } +static const char dll_prefix[] = "DLL:"; int TAO_DLL_Parser::match_prefix (const char *ior_string) const @@ -61,8 +63,6 @@ TAO_DLL_Parser::parse_string (const char *ior, return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, ACE_TEXT ("DLL_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h index 926b52958c1..50c59241ec6 100644 --- a/TAO/tao/DLL_Parser.h +++ b/TAO/tao/DLL_Parser.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -23,8 +22,6 @@ #include "tao/IOR_Parser.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DLL_Parser * @@ -52,7 +49,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * Such an application could be written as follows: * - * int main (int argc, char* argv) + * int ACE_TMAIN (int argc, char* argv) * { * CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); * @@ -74,9 +71,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * loaded without any modifications to the application code. * */ -class TAO_DLL_Parser : public TAO_IOR_Parser +class TAO_Export TAO_DLL_Parser : public TAO_IOR_Parser { public: + /// Constructor + TAO_DLL_Parser (void); /// The destructor virtual ~TAO_DLL_Parser (void); @@ -90,7 +89,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__ACE_INLINE__) +# include "DLL_Parser.i" +#endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_Parser) ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser) diff --git a/TAO/tao/DLL_Parser.i b/TAO/tao/DLL_Parser.i new file mode 100644 index 00000000000..00a66f43394 --- /dev/null +++ b/TAO/tao/DLL_Parser.i @@ -0,0 +1,6 @@ +// $Id$ + +ACE_INLINE +TAO_DLL_Parser::TAO_DLL_Parser (void) +{ +} diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp index 78ccc5c4b5c..2b5ea0a0673 100644 --- a/TAO/tao/Default_Collocation_Resolver.cpp +++ b/TAO/tao/Default_Collocation_Resolver.cpp @@ -9,8 +9,6 @@ ACE_RCSID (tao, #include "tao/Object.h" #include "ace/Log_Msg.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Boolean TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object ACE_ENV_ARG_DECL_NOT_USED) const @@ -18,8 +16,6 @@ TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object return object->_is_collocated (); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_Default_Collocation_Resolver, ACE_TEXT ("Default_Collocation_Resolver"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index c98aefae6d5..3d42c2a7d64 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Default_Collocation_Resolver.h @@ -22,8 +20,6 @@ #include "tao/Collocation_Resolver.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Environment; @@ -47,8 +43,6 @@ public: ACE_ENV_ARG_DECL) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver) ACE_FACTORY_DECLARE (TAO, TAO_Default_Collocation_Resolver) diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp index 64fb8f94608..8b0814e80e8 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ + #include "tao/Default_Endpoint_Selector_Factory.h" #include "tao/Invocation_Endpoint_Selectors.h" @@ -11,12 +12,11 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory ( - void) - : default_endpoint_selector_ (new TAO_Default_Endpoint_Selector) +TAO_Default_Endpoint_Selector_Factory::TAO_Default_Endpoint_Selector_Factory (void) { + ACE_NEW (this->default_endpoint_selector_, + TAO_Default_Endpoint_Selector); + } TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void) @@ -32,8 +32,6 @@ TAO_Default_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT return this->default_endpoint_selector_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Endpoint_Selector_Factory, diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h index b521cab81dd..00558b91983 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -26,8 +26,6 @@ #include "tao/Endpoint_Selector_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward references class TAO_Default_Endpoint_Selector; @@ -64,22 +62,12 @@ public: virtual TAO_Invocation_Endpoint_Selector *get_selector ( ACE_ENV_SINGLE_ARG_DECL); -private: - - // Prevent copying/assignment. - TAO_Default_Endpoint_Selector_Factory (TAO_Default_Endpoint_Selector_Factory const &); - void operator= (TAO_Default_Endpoint_Selector_Factory const &); - protected: - /// The possible endpoint selector strategies that can be /// returned by this factory - TAO_Default_Endpoint_Selector * const default_endpoint_selector_; - + TAO_Default_Endpoint_Selector *default_endpoint_selector_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Endpoint_Selector_Factory) diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp index a06a1307aba..cc426e44165 100644 --- a/TAO/tao/Default_Protocols_Hooks.cpp +++ b/TAO/tao/Default_Protocols_Hooks.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "tao/Default_Protocols_Hooks.h" +#include "Default_Protocols_Hooks.h" #include "ace/Log_Msg.h" ACE_RCSID (tao, Default_Protocols_Hooks, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void) { @@ -169,7 +168,6 @@ TAO_Default_Protocols_Hooks::get_dscp_codepoint (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h index 540ed7b70fb..ad0d440d7df 100644 --- a/TAO/tao/Default_Protocols_Hooks.h +++ b/TAO/tao/Default_Protocols_Hooks.h @@ -1,3 +1,4 @@ + // -*- C++ -*- // =================================================================== @@ -22,8 +23,6 @@ #include "tao/Protocols_Hooks.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_POA; class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks @@ -114,8 +113,6 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks) ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks) diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index 180a81b60e4..d6603362980 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/Default_Stub_Factory.h" -#include "tao/Stub.h" -#include "tao/ORB_Constants.h" -#include "tao/SystemException.h" +#include "Default_Stub_Factory.h" +#include "Stub.h" +#include "ORB_Constants.h" +#include "SystemException.h" #include "ace/Log_Msg.h" @@ -12,7 +12,6 @@ ACE_RCSID (tao, TAO_Default_Stub_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void) { @@ -35,8 +34,6 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id, return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE ( diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h index e0a4c60c5ec..f5b82a070ee 100644 --- a/TAO/tao/Default_Stub_Factory.h +++ b/TAO/tao/Default_Stub_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Default_Stub_Factory.h @@ -27,8 +25,6 @@ #include "tao/Stub_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Default_Stub_Factory * @@ -43,8 +39,7 @@ class TAO_Export TAO_Default_Stub_Factory : public TAO_Stub_Factory { public: - - /// Destructor. + // -- Ctor/Dtor -- virtual ~TAO_Default_Stub_Factory (void); /// Creates a Stub Object. @@ -52,11 +47,8 @@ public: const TAO_MProfile &profiles, TAO_ORB_Core *orb_core ACE_ENV_ARG_DECL); - }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Stub_Factory) diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index 4aecd1c6583..05268b9920e 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "tao/Default_Thread_Lane_Resources_Manager.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Exception.h" -#include "tao/Environment.h" -#include "tao/ORB_Core.h" +#include "Default_Thread_Lane_Resources_Manager.h" +#include "Thread_Lane_Resources.h" +#include "Exception.h" +#include "Environment.h" +#include "ORB_Core.h" #include "ace/Log_Msg.h" @@ -12,13 +12,13 @@ ACE_RCSID (tao, Default_Thread_Lane_Resources_Manager, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : TAO_Thread_Lane_Resources_Manager (orb_core), - lane_resources_ (new TAO_Thread_Lane_Resources (orb_core)) + lane_resources_ (0) { + // Create the default resources. + ACE_NEW (this->lane_resources_, + TAO_Thread_Lane_Resources (orb_core)); } TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Manager (void) @@ -30,7 +30,7 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma int TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL) { - TAO_ORB_Parameters * const params = + TAO_ORB_Parameters *params = this->orb_core_->orb_params (); TAO_EndpointSet endpoint_set; @@ -86,13 +86,6 @@ TAO_Default_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mp return this->lane_resources_->is_collocated (mprofile); } -// ------------------------------------------------------- - -TAO_Default_Thread_Lane_Resources_Manager_Factory:: -~TAO_Default_Thread_Lane_Resources_Manager_Factory (void) -{ -} - TAO_Thread_Lane_Resources_Manager * TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manager (TAO_ORB_Core &core) { @@ -106,11 +99,6 @@ TAO_Default_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_ return manager; } -// ------------------------------------------------------- - -TAO_END_VERSIONED_NAMESPACE_DECL - - ACE_STATIC_SVC_DEFINE (TAO_Default_Thread_Lane_Resources_Manager_Factory, ACE_TEXT ("Default_Thread_Lane_Resources_Manager_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index 89f94829417..359158ff0cb 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Default_Thread_Lane_Resources_Manager.h @@ -22,19 +20,16 @@ #include "tao/Thread_Lane_Resources_Manager.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Default_Thread_Lane_Resources_Manager * * @brief Simple manager for thread lane resources. * - * \nosubgrouping * **/ -class TAO_Export TAO_Default_Thread_Lane_Resources_Manager - : public TAO_Thread_Lane_Resources_Manager +class TAO_Export TAO_Default_Thread_Lane_Resources_Manager : + public TAO_Thread_Lane_Resources_Manager { public: @@ -68,16 +63,10 @@ public: // @} -private: - - TAO_Default_Thread_Lane_Resources_Manager (TAO_Default_Thread_Lane_Resources_Manager const &); - void operator= (TAO_Default_Thread_Lane_Resources_Manager const &); - protected: /// Default lane resources. - TAO_Thread_Lane_Resources * const lane_resources_; - + TAO_Thread_Lane_Resources *lane_resources_; }; /** @@ -93,16 +82,11 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory { public: - /// Destructor. - virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory (void); - /// Factory method. TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl index b221159edee..cb19c83a9aa 100644 --- a/TAO/tao/Domain.pidl +++ b/TAO/tao/Domain.pidl @@ -1,5 +1,3 @@ -// -*- IDL -*- - /** * @file Domain.pidl * @@ -21,8 +19,6 @@ * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * Domain.pidl * * 2. Then patch the generated code. This patch (a) eliminates @@ -47,8 +43,8 @@ #ifndef TAO_CORBA_DOMAIN_PIDL #define TAO_CORBA_DOMAIN_PIDL -#include "tao/Policy.pidl" -#include "tao/InterfaceDef.pidl" +#include <Policy.pidl> +#include <InterfaceDef.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index b17f2e46588..569c74c70d2 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_DOMAINS_CPP_ -#include "tao/Domain/DomainS.h" +#include "DomainS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -69,14 +69,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/Domain/DomainS.inl" +#include "DomainS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -1686,7 +1684,5 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ifndef */ diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index 0983a05f4fd..b95ab45f54b 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -54,7 +54,7 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -#include "tao/Domain/domain_export.h" +#include "domain_export.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -483,12 +481,10 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:995 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "tao/Domain/DomainS_T.h" +#include "DomainS_T.h" #if defined (__ACE_INLINE__) -#include "tao/Domain/DomainS.inl" +#include "DomainS.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl index 5e1b77f1084..7da816922ac 100644 --- a/TAO/tao/Domain/DomainS.inl +++ b/TAO/tao/Domain/DomainS.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void @@ -155,4 +154,3 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp index 1cf3d0d6643..951f03175c1 100644 --- a/TAO/tao/Domain/DomainS_T.cpp +++ b/TAO/tao/Domain/DomainS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_ #define _TAO_IDL_ORIG_DOMAINS_T_CPP_ -#include "tao/Domain/DomainS_T.h" +#include "DomainS_T.h" #if !defined (__ACE_INLINE__) -#include "tao/Domain/DomainS_T.inl" +#include "DomainS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index 253698af938..9d854d72853 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -38,7 +38,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -203,14 +202,12 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1096 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Domain/DomainS_T.inl" +#include "DomainS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Domain/DomainS_T.cpp" +#include "DomainS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl index 2287aa6ba7e..83b1baa46c4 100644 --- a/TAO/tao/Domain/DomainS_T.inl +++ b/TAO/tao/Domain/DomainS_T.inl @@ -26,8 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -300,5 +298,3 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager ( ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 2b7a87fb286..edc3ef28c7c 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/DomainC.h" +#include "DomainC.h" #include "tao/CDR.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" @@ -48,14 +48,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/DomainC.inl" +#include "DomainC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO specific stuff. namespace CORBA { @@ -737,5 +735,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index a45d7c4d805..5a4683f1b2a 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -66,8 +66,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -480,10 +478,8 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/DomainC.inl" +#include "DomainC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/DomainC.inl b/TAO/tao/DomainC.inl index d46727c0132..59264e65404 100644 --- a/TAO/tao/DomainC.inl +++ b/TAO/tao/DomainC.inl @@ -29,8 +29,6 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if !defined (_CORBA_DOMAINMANAGER___CI_) #define _CORBA_DOMAINMANAGER___CI_ @@ -99,5 +97,3 @@ CORBA::ConstructionPolicy::ConstructionPolicy ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl index f214a297fad..75b7c1dad53 100644 --- a/TAO/tao/DoubleSeq.pidl +++ b/TAO/tao/DoubleSeq.pidl @@ -15,8 +15,6 @@ * -Wb,export_include=tao/TAO_Export.h * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * DoubleSeq.pidl */ diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index 36f7fbb7cc5..e70ae2285d4 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/DoubleSeqC.h" +#include "DoubleSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ void CORBA::DoubleSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h index 06e04f48497..01164cc055d 100644 --- a/TAO/tao/DoubleSeqC.h +++ b/TAO/tao/DoubleSeqC.h @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -141,8 +139,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index 8f6c231ac2a..63e18a2bc87 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -1,3 +1,4 @@ + //============================================================================= /** * @file DynAnyFactory.cpp @@ -9,14 +10,14 @@ //============================================================================= -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynAnyFactory.h" -#include "tao/DynamicAny/DynAny_i.h" -#include "tao/DynamicAny/DynStruct_i.h" -#include "tao/DynamicAny/DynSequence_i.h" -#include "tao/DynamicAny/DynEnum_i.h" -#include "tao/DynamicAny/DynArray_i.h" -#include "tao/DynamicAny/DynUnion_i.h" +#include "DynAny_i.h" +#include "DynStruct_i.h" +#include "DynSequence_i.h" +#include "DynEnum_i.h" +#include "DynArray_i.h" +#include "DynUnion_i.h" #include "ace/Auto_Ptr.h" @@ -24,8 +25,6 @@ ACE_RCSID (DynamicAny, DynAnyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor from typecode TAO_DynAnyFactory::TAO_DynAnyFactory (void) { @@ -378,4 +377,3 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc return DynamicAny::DynAny::_nil (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index f37cda716b8..e4b5e99d949 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,7 +16,7 @@ #define TAO_DYNANYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,8 +29,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynAnyFactory * @@ -90,8 +87,6 @@ private: TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 796cc529bd3..cdd2ba9162f 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -1,7 +1,8 @@ +/* -*- C++ -*- */ // $Id$ -#include "tao/DynamicAny/DynAny_i.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynAny_i.h" +#include "DynAnyFactory.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" #include "ace/OS_NS_wchar.h" @@ -12,7 +13,6 @@ ACE_RCSID (DynamicAny, DynAny_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynAny_i::TAO_DynAny_i (void) { @@ -513,7 +513,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs } } - return ACE_OS::wscmp (rhs_v, lhs_v) == 0; + return ACE_OS::strcmp (rhs_v, lhs_v) == 0; } default: break; // Cannot happen... @@ -556,5 +556,3 @@ TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), DynamicAny::DynAny::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index 89c96f90350..db9b893ec58 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,13 +16,13 @@ #define TAO_DYNANY_I_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/DynCommon.h" +#include "DynCommon.h" #include "tao/LocalObject.h" #if defined (_MSC_VER) @@ -31,8 +30,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynAny_i * @@ -122,8 +119,6 @@ private: TAO_DynAny_i &operator= (const TAO_DynAny_i &src); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index d45269d130e..e7dc61d55c5 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -1,7 +1,8 @@ +/* -*- C++ -*- */ // $Id$ -#include "tao/DynamicAny/DynArray_i.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynArray_i.h" +#include "DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -10,7 +11,6 @@ ACE_RCSID (DynamicAny, DynArray_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynArray_i::TAO_DynArray_i (void) { @@ -659,5 +659,3 @@ TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->da_members_[index].in () ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index 8e28d989cae..d8b6120e9cd 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,13 +16,13 @@ #define TAO_DYNARRAY_I_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/DynCommon.h" +#include "DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" @@ -32,8 +31,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynArray_i * @@ -162,8 +159,6 @@ private: ACE_Array_Base<DynamicAny::DynAny_var> da_members_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index b4f5f05dfb5..15680111545 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -1,13 +1,14 @@ +/* -*- C++ -*- */ // $Id$ -#include "tao/DynamicAny/DynCommon.h" -#include "tao/DynamicAny/DynAnyFactory.h" -#include "tao/DynamicAny/DynAny_i.h" -#include "tao/DynamicAny/DynArray_i.h" -#include "tao/DynamicAny/DynEnum_i.h" -#include "tao/DynamicAny/DynSequence_i.h" -#include "tao/DynamicAny/DynStruct_i.h" -#include "tao/DynamicAny/DynUnion_i.h" +#include "DynCommon.h" +#include "DynAnyFactory.h" +#include "DynAny_i.h" +#include "DynArray_i.h" +#include "DynEnum_i.h" +#include "DynSequence_i.h" +#include "DynStruct_i.h" +#include "DynUnion_i.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" #include "ace/OS_NS_wchar.h" @@ -19,8 +20,6 @@ ACE_RCSID (DynamicAny, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DynCommon::TAO_DynCommon (void) { } @@ -731,7 +730,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (bound > 0 && bound < ACE_OS::wslen (value)) + if (bound > 0 && bound < ACE_OS::strlen (value)) { ACE_THROW (DynamicAny::DynAny::InvalidValue ()); } @@ -1850,5 +1849,3 @@ TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc return TAO_DynAnyFactory::strip_alias (tc ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index dccc16e617a..60a15b01d91 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,7 +15,7 @@ #define TAO_DYNCOMMON_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynCommon * @@ -548,8 +546,6 @@ private: )); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index d575d5e911a..7db76b721af 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/DynamicAny/DynEnum_i.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynEnum_i.h" +#include "DynAnyFactory.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -12,7 +12,6 @@ ACE_RCSID (DynamicAny, DynEnum_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynEnum_i::TAO_DynEnum_i (void) { @@ -345,5 +344,3 @@ TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (), DynamicAny::DynAny::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index 6732653721e..57c68a2f69f 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,13 +16,13 @@ #define TAO_DYNENUM_I_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/DynCommon.h" +#include "DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" @@ -32,8 +31,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynEnum_i * @@ -153,8 +150,6 @@ private: CORBA::ULong value_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 1394204164e..2e9d1b7c352 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -1,7 +1,8 @@ +/* -*- C++ -*- */ // $Id$ -#include "tao/DynamicAny/DynSequence_i.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynSequence_i.h" +#include "DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -10,7 +11,6 @@ ACE_RCSID (DynamicAny, DynSequence_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynSequence_i::TAO_DynSequence_i (void) { @@ -829,5 +829,3 @@ TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->da_members_[index].in () ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index e9763e95e5f..4c0b4f8880a 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,13 +16,13 @@ #define TAO_DYNSEQUENCE_I_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/DynCommon.h" +#include "DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" @@ -32,8 +31,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynSequence_i * @@ -175,8 +172,6 @@ private: ACE_Array_Base<DynamicAny::DynAny_var> da_members_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index 5073f7796e6..9da0b4d001f 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -1,7 +1,8 @@ +/* -*- C++ -*- */ // $Id$ -#include "tao/DynamicAny/DynStruct_i.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynStruct_i.h" +#include "DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -11,8 +12,6 @@ ACE_RCSID (DynamicAny, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DynStruct_i::TAO_DynStruct_i (void) { } @@ -820,5 +819,3 @@ TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL) this->da_members_[index].in () ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index 62e9ecf7e1f..9301e632a5e 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,13 +16,13 @@ #define TAO_DYNSTRUCT_I_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/DynCommon.h" +#include "DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" @@ -32,8 +31,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynStruct_i * @@ -182,8 +179,6 @@ private: ACE_Array_Base<DynamicAny::DynAny_var> da_members_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 60745e23849..26e98dc7d0b 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -1,7 +1,8 @@ +/* -*- C++ -*- */ // $Id$ -#include "tao/DynamicAny/DynUnion_i.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynUnion_i.h" +#include "DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" @@ -10,7 +11,6 @@ ACE_RCSID (DynamicAny, DynUnion_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DynUnion_i::TAO_DynUnion_i (void) { @@ -1121,5 +1121,3 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any, return 0; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index c7aa9c1377e..3052ca6167e 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ //============================================================================= @@ -17,13 +16,13 @@ #define TAO_DYNUNION_I_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/DynCommon.h" +#include "DynCommon.h" #include "tao/LocalObject.h" #if defined (_MSC_VER) @@ -31,8 +30,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_DynUnion_i * @@ -211,8 +208,6 @@ private: CORBA::ULong member_slot_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index 2bf234a3a27..6601550c40d 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -1,3 +1,5 @@ +/* -*- C++ -*- */ + //============================================================================= /** * @file DynamicAny.cpp @@ -9,13 +11,11 @@ //============================================================================= -#include "tao/DynamicAny/DynamicAny.h" -#include "tao/DynamicAny/DynAnyFactory.h" +#include "DynamicAny.h" +#include "DynAnyFactory.h" ACE_RCSID(DynamicAny, DynamicAny, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void) { } @@ -40,8 +40,6 @@ TAO_DynamicAny_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_DynamicAny_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_DynamicAny_Loader, ACE_TEXT ("DynamicAny_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 652f52939f9..198439dc114 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -15,10 +16,10 @@ #define TAO_DYNAMICANY_H #include /**/ "ace/pre.h" -#include "tao/DynamicAny/dynamicany_export.h" +#include "dynamicany_export.h" #define TAO_DYNAMICANY_SAFE_INCLUDE -#include "tao/DynamicAny/DynamicAnyC.h" +#include "DynamicAnyC.h" #undef TAO_DYNAMICANY_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -28,8 +29,6 @@ #include "tao/Object_Loader.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader { public: @@ -47,13 +46,11 @@ public: static int Initializer (void); }; -static int -TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader) ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader) +static int +TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer (); + #include /**/ "ace/post.h" #endif /* TAO_DYNAMICANY_H */ diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl index 1a8fe09cc21..1a6db982993 100644 --- a/TAO/tao/DynamicAny/DynamicAny.pidl +++ b/TAO/tao/DynamicAny/DynamicAny.pidl @@ -1,5 +1,3 @@ -// -*- IDL -*- - /** * @file DynamicAny.pidl * @@ -27,8 +25,6 @@ * -Wb,export_include=dynamicany_export.h \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ * DynamicAny.pidl * * after the file is generated a patch must be applied. The patch @@ -52,7 +48,7 @@ #pragma prefix "omg.org" -#include "tao/Typecode_types.pidl" +#include <Typecode_types.pidl> module DynamicAny { diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index 0ddb61243f5..ba64e06d5b0 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/DynamicAny/DynamicAny.h" +#include "DynamicAny.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -1880,5 +1878,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_DynamicAny_AnySeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index 4aebbe120c5..f78ad947472 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -44,7 +44,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicAny/dynamicany_export.h" +#include "dynamicany_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" @@ -77,8 +77,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace DynamicAny { @@ -2534,8 +2532,6 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 3edab19588b..2e47f392f5f 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -1,4 +1,4 @@ -#include "tao/DynamicInterface/Context.h" +#include "Context.h" ACE_RCSID (DynamicInterface, Context, @@ -12,10 +12,9 @@ ACE_RCSID (DynamicInterface, #include "ace/Guard_T.h" #if !defined (__ACE_INLINE__) -# include "tao/DynamicInterface/Context.inl" +# include "Context.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Context::Context (void) : refcount_ (1) @@ -200,4 +199,4 @@ CORBA::ContextList::_decr_refcnt (void) } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 9f58f19cb4b..de3f12de654 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ //============================================================================= @@ -19,13 +18,13 @@ #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicInterface/DII_CORBA_methods.h" +#include "DII_CORBA_methods.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Pseudo_VarOut_T.h" @@ -44,8 +43,6 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef ULong Flags; @@ -196,10 +193,8 @@ namespace CORBA }; } // End CORBA namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/DynamicInterface/Context.inl" +# include "Context.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl index 87c338e31e0..1542333d043 100644 --- a/TAO/tao/DynamicInterface/Context.inl +++ b/TAO/tao/DynamicInterface/Context.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void CORBA::release (CORBA::Context_ptr x) @@ -93,5 +91,3 @@ CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x) return x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index d72c4f43420..31205aa8b6a 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/DynamicInterface/DII_Arguments.h" +#include "DII_Arguments.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/Any_Impl.h" @@ -14,11 +14,9 @@ ACE_RCSID (DynamicInterface, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/DynamicInterface/DII_Arguments.inl" +# include "DII_Arguments.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { CORBA::Boolean @@ -142,5 +140,3 @@ namespace TAO } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h index 6f362d7a099..cf681244b44 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.h +++ b/TAO/tao/DynamicInterface/DII_Arguments.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class NamedValue; @@ -88,10 +86,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/DynamicInterface/DII_Arguments.inl" +# include "DII_Arguments.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl index 265bffbf7de..f2c11256c20 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.inl +++ b/TAO/tao/DynamicInterface/DII_Arguments.inl @@ -2,16 +2,13 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE NamedValue_Argument::NamedValue_Argument (CORBA::NamedValue_ptr x) : x_ (x) - , byte_order_ (0) - { - } + , byte_order_ (0) + {} ACE_INLINE int NamedValue_Argument::byte_order (void) const @@ -26,8 +23,5 @@ namespace TAO bool lazy_eval) : x_ (x) , lazy_evaluation_ (lazy_eval) - { - } + {} } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_CORBA_methods.h b/TAO/tao/DynamicInterface/DII_CORBA_methods.h index aea9e098cbb..b45e4362296 100644 --- a/TAO/tao/DynamicInterface/DII_CORBA_methods.h +++ b/TAO/tao/DynamicInterface/DII_CORBA_methods.h @@ -31,7 +31,6 @@ #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -61,8 +60,6 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DII_CORBA_METHODS_H */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 6a75d25ad6a..abb404acba0 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -3,12 +3,12 @@ #include "tao/AnyTypeCode/DynamicC.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "tao/DynamicInterface/DII_Invocation.h" -#include "tao/DynamicInterface/Unknown_User_Exception.h" -#include "tao/DynamicInterface/DII_Arguments.h" -#include "tao/DynamicInterface/ExceptionList.h" -#include "tao/DynamicInterface/Request.h" -#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" +#include "DII_Invocation.h" +#include "Unknown_User_Exception.h" +#include "DII_Arguments.h" +#include "ExceptionList.h" +#include "Request.h" +#include "DII_Reply_Dispatcher.h" #include "tao/operation_details.h" #include "tao/Invocation_Utils.h" @@ -27,8 +27,6 @@ ACE_RCSID (DynamicInterface, DII_Invocation, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { DII_Invocation::DII_Invocation (CORBA::Object_ptr otarget, @@ -230,5 +228,3 @@ namespace TAO ACE_ENV_ARG_PARAMETER); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index ba3a5a6be66..f632beb75c0 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -16,10 +16,9 @@ #ifndef TAO_DII_INVOCATION_H #define TAO_DII_INVOCATION_H - #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,8 +27,6 @@ #include "tao/Synch_Invocation.h" #include "tao/Messaging/Asynch_Invocation.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_DII_Deferred_Reply_Dispatcher; namespace Dynamic @@ -83,8 +80,8 @@ namespace TAO /* * */ - class TAO_DynamicInterface_Export DII_Deferred_Invocation - : public Asynch_Remote_Invocation + class TAO_DynamicInterface_Export DII_Deferred_Invocation : + public Asynch_Remote_Invocation { public: friend class DII_Deferred_Invocation_Adapter; @@ -115,8 +112,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - -#endif /* TAO_DII_INVOCATION_H */ +#endif /* TAO_ASYNCH_INVOCATION_H */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 1cf3a172f6a..cadf68653ce 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/DynamicInterface/DII_Invocation_Adapter.h" -#include "tao/DynamicInterface/DII_Invocation.h" -#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" +#include "DII_Invocation_Adapter.h" +#include "DII_Invocation.h" +#include "DII_Reply_Dispatcher.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" @@ -9,7 +9,7 @@ #include "tao/Transport.h" #include "tao/Transport.h" #include "tao/Pluggable_Messaging.h" -#include "tao/DynamicInterface/Request.h" +#include "Request.h" #include "ace/os_include/os_errno.h" @@ -18,8 +18,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { DII_Invocation_Adapter::DII_Invocation_Adapter (CORBA::Object *target, @@ -85,15 +83,8 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); -#if TAO_HAS_INTERCEPTORS == 1 - const CORBA::Boolean permanent_forward = - (synch.reply_status() == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM); -#else - const CORBA::Boolean permanent_forward = false; -#endif this->object_forwarded (effective_target, - r.stub (), - permanent_forward + r.stub () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); } @@ -190,5 +181,3 @@ namespace TAO return status; } } // End namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index d80f9900855..749029a23e0 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -22,14 +22,9 @@ #include "tao/Invocation_Adapter.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Operation_Details; class TAO_Stub; +class ACE_Time_Value; class TAO_ORB_Core; class TAO_DII_Deferred_Reply_Dispatcher; namespace CORBA @@ -114,10 +109,10 @@ namespace TAO private: /// Dont allow default initializations - DII_Invocation_Adapter (void); + ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void)) - DII_Invocation_Adapter (const DII_Invocation_Adapter &); - DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &); + ACE_UNIMPLEMENTED_FUNC ( + DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &)) }; /** @@ -163,7 +158,6 @@ namespace TAO }; } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_INVOCATION_ADAPTER_H*/ diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 877570d611a..f835b4eca4c 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" -#include "tao/DynamicInterface/Request.h" +#include "DII_Reply_Dispatcher.h" +#include "Request.h" #include "tao/Environment.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -13,7 +13,8 @@ ACE_RCSID(DynamicInterface, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + + // Constructor. TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher ( @@ -143,5 +144,3 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) (void) this->decr_refcount (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index cb450106c5d..8c1719fbec3 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "tao/orbconf.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Request; @@ -73,8 +71,6 @@ private: const CORBA::Request_ptr req_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REPLY_DISPATCHER_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index a23c6c4e06e..ce379c1a689 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" +#include "Dynamic_Adapter_Impl.h" ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$") -#include "tao/DynamicInterface/Request.h" -#include "tao/DynamicInterface/Server_Request.h" +#include "Request.h" +#include "Server_Request.h" #include "tao/ORB_Core.h" #include "tao/Exception.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Dynamic_Adapter_Impl::TAO_Dynamic_Adapter_Impl (void) { } @@ -143,8 +141,6 @@ TAO_Dynamic_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Dynamic_Adapter_Impl); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( TAO_Dynamic_Adapter_Impl, ACE_TEXT ("Concrete_Dynamic_Adapter"), diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h index 9537488f66c..d1b8ec6fc8e 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +// This may look like C, but it's really -*- C++ -*- // $Id$ // ============================================================================ @@ -28,19 +27,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_Dynamic_Adapter_Impl - * - * Concrete subclass of TAO_Dynamic_Adapter - * in the TAO library. This class helps implement various - * functions in the CORBA namespace relating to DII/DSI - * invocations. - */ + /** + * @class TAO_Dynamic_Adapter_Impl + * + * Concrete subclass of TAO_Dynamic_Adapter + * in the TAO library. This class helps implement various + * functions in the CORBA namespace relating to DII/DSI + * invocations. + */ class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl : public TAO_Dynamic_Adapter { @@ -88,14 +85,12 @@ public: static int Initializer (void); }; +ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl) +ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl) + static int TAO_Requires_Request_Factory_Initializer = TAO_Dynamic_Adapter_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl) -ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl) - #include /**/ "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index 6f9aa2d6bf7..e8fa30d8e3f 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -1,11 +1,11 @@ -#include "tao/DynamicInterface/Dynamic_Implementation.h" +#include "Dynamic_Implementation.h" ACE_RCSID (DynamicInterface, Dynamic_Implementation, "$Id$") -#include "tao/DynamicInterface/Server_Request.h" +#include "Server_Request.h" #include "tao/ORB_Core.h" #include "tao/TSS_Resources.h" #include "tao/IFR_Client_Adapter.h" @@ -16,8 +16,6 @@ ACE_RCSID (DynamicInterface, #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Boolean TAO_DynamicImplementation::_is_a (const char *logical_type_id ACE_ENV_ARG_DECL) @@ -217,5 +215,3 @@ TAO_DynamicImplementation::get_id_from_primary_interface ( poa.in () ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index b9c17c21ea2..7e7ed6c0c67 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +// This may look like C, but it's really -*- C++ -*- // $Id$ // ============================================================================ @@ -23,7 +22,7 @@ #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +30,6 @@ #include "tao/PortableServer/Servant_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef char *RepositoryId; @@ -106,8 +103,6 @@ private: ); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DYNAMIC_IMPLEMENTATION_H */ diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 41c1d44d322..ca87c8eceaa 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -1,4 +1,4 @@ -#include "tao/DynamicInterface/ExceptionList.h" +#include "ExceptionList.h" ACE_RCSID (DynamicInterface, ExceptionList, @@ -9,10 +9,9 @@ ACE_RCSID (DynamicInterface, #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "tao/DynamicInterface/ExceptionList.inl" +# include "ExceptionList.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ExceptionList::ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list) @@ -105,4 +104,4 @@ CORBA::ExceptionList::_decr_refcnt (void) } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 3fdca028ca5..05a17aba67e 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -24,13 +24,13 @@ #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/DynamicInterface/DII_CORBA_methods.h" +#include "DII_CORBA_methods.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orbconf.h" #include "tao/Basic_Types.h" @@ -47,8 +47,6 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var; @@ -125,10 +123,8 @@ namespace CORBA }; } // End CORBA namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/DynamicInterface/ExceptionList.inl" +# include "ExceptionList.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl index d5fe85f4b65..fda8385bd58 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.inl +++ b/TAO/tao/DynamicInterface/ExceptionList.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void CORBA::release (CORBA::ExceptionList_ptr x) @@ -54,5 +52,3 @@ CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x) return x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 5a1ef1942f5..bc6317b1e53 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "tao/DynamicInterface/Request.h" +#include "Request.h" ACE_RCSID (DynamicInterface, Request, "$Id$") -#include "tao/DynamicInterface/DII_Invocation_Adapter.h" -#include "tao/DynamicInterface/DII_Arguments.h" -#include "tao/DynamicInterface/Context.h" +#include "DII_Invocation_Adapter.h" +#include "DII_Arguments.h" +#include "Context.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/Object.h" @@ -19,12 +19,10 @@ ACE_RCSID (DynamicInterface, #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -# include "tao/DynamicInterface/Request.inl" +# include "Request.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Reference counting for DII Request object. CORBA::ULong @@ -348,7 +346,6 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION: case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION: case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD: - case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM: default: // @@ (JP) Don't know what to do about any of these yet. ACE_ERROR ((LM_ERROR, @@ -356,4 +353,3 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 2c119dca9b3..32cf720983b 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -27,9 +27,9 @@ // To force execution of the static constructor // that registers the dynamic service object. -#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" +#include "Dynamic_Adapter_Impl.h" -#include "tao/DynamicInterface/ExceptionList.h" +#include "ExceptionList.h" #include "tao/ORB.h" #include "tao/Environment.h" @@ -45,8 +45,6 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class NVList; @@ -268,10 +266,8 @@ namespace CORBA }; } // End CORBA namespace. -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/DynamicInterface/Request.inl" +# include "Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index f540c8652d6..4b625ef61da 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void CORBA::release (CORBA::Request_ptr x) @@ -198,5 +196,3 @@ CORBA::Request::response_received (void) return this->response_received_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 57c440c55db..6628d52e01d 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -2,7 +2,7 @@ // Implementation of the Dynamic Server Skeleton Interface. -#include "tao/DynamicInterface/Server_Request.h" +#include "Server_Request.h" ACE_RCSID (DynamicInterface, Server_Request, @@ -16,11 +16,9 @@ ACE_RCSID (DynamicInterface, #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "tao/DynamicInterface/Server_Request.inl" +# include "Server_Request.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Reference counting for DSI ServerRequest object. CORBA::ULong @@ -240,4 +238,3 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception) this->orb_server_request_.tao_send_reply (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 288c43761a3..2db2bed43c8 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -24,7 +24,7 @@ #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/Context.h" +#include "Context.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ // To force execution of the static constructor // that registers the dynamic service object. -#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" +#include "Dynamic_Adapter_Impl.h" #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" @@ -42,8 +42,6 @@ #endif #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class ServerRequest; @@ -174,10 +172,8 @@ namespace CORBA }; } // End CORBA namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/DynamicInterface/Server_Request.inl" +# include "Server_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index b8e4bf6099f..4eca4ba2639 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void CORBA::release (CORBA::ServerRequest_ptr x) @@ -82,5 +80,3 @@ CORBA::ServerRequest::_tao_server_request (void) { return this->orb_server_request_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 81d9935832f..bcc01200d6a 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/DynamicInterface/Unknown_User_Exception.h" +#include "Unknown_User_Exception.h" #include "tao/AnyTypeCode/Any.h" #include "tao/Environment.h" @@ -18,7 +18,6 @@ ACE_RCSID (DynamicInterface, Unknown_User_Exception, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::UnknownUserException::UnknownUserException (void) : CORBA::UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0", @@ -135,5 +134,3 @@ namespace CORBA CORBA::TypeCode_ptr const _tc_UnknownUserException = &TAO::TypeCode::tc_UnknownUserException; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index ab618060852..1976000db16 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "tao/DynamicInterface/dynamicinterface_export.h" +#include "dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,8 +40,6 @@ # define TAO_EXPORT_NESTED_MACRO TAO_DynamicInterface_Export #endif /* TAO_EXPORT_NESTED_CLASSES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { /** @@ -105,7 +103,6 @@ namespace CORBA } // End CORBA namespace. -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index 7e4a4ab96aa..b51e0008ca8 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/Dynamic_Adapter.h" @@ -6,10 +6,7 @@ ACE_RCSID (tao, Dynamic_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index af68465a486..970e28d5a54 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -26,8 +26,6 @@ #include "tao/Basic_Types.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; @@ -110,7 +108,6 @@ public: ACE_ENV_ARG_DECL) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_H */ diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp index 75f61995341..319fc7d5d1a 100644 --- a/TAO/tao/Endpoint.cpp +++ b/TAO/tao/Endpoint.cpp @@ -6,16 +6,13 @@ #include "tao/Endpoint.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Endpoint, +ACE_RCSID (tao, + Endpoint, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Endpoint::~TAO_Endpoint (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL - //@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index b762595ef58..b9ac5ef5a45 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -27,8 +27,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* * Includes and forward decls for specializing TAO's * endpoint implementation. @@ -125,7 +123,7 @@ protected: /// IOP tag, identifying the protocol for which this endpoint /// contains addressing info. - CORBA::ULong const tag_; + CORBA::ULong tag_; /** * CORBA priority of the acceptor this Endpoint is representing. @@ -137,8 +135,8 @@ protected: private: /// Endpoints should not be copied. - TAO_Endpoint (const TAO_Endpoint&); - void operator= (const TAO_Endpoint&); + ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&)) /* * Addition of private members from derived class. @@ -149,8 +147,6 @@ private: //@@ TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Endpoint.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Endpoint.i b/TAO/tao/Endpoint.i index ab570490899..10d7d86325b 100644 --- a/TAO/tao/Endpoint.i +++ b/TAO/tao/Endpoint.i @@ -1,17 +1,14 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Endpoint::TAO_Endpoint (CORBA::ULong tag, CORBA::Short priority) : addr_lookup_lock_ () - // @@ Would be a tragedy if the hash value of this endpoint is 0, in - // which case this optimizaton wouldn't work. We can get around - // that using a bool. But we don't want to increase the runtime - // memory. + // @@Would be a tragedy if the hash value of this endpoint is 0, in + // which case this optimizaton wouldn't work. We can get around + // that using a bool. But we don't want to increase the runtime + // memory , hash_val_ (0) , tag_ (tag) , priority_ (priority) @@ -36,5 +33,3 @@ TAO_Endpoint::priority (CORBA::Short p) { this->priority_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp index 6fc44b4efcc..9e97eb8b282 100644 --- a/TAO/tao/Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Endpoint_Selector_Factory.cpp @@ -6,10 +6,7 @@ ACE_RCSID (tao, Endpoint_Selector_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h index c3364874813..39540be51c4 100644 --- a/TAO/tao/Endpoint_Selector_Factory.h +++ b/TAO/tao/Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -18,18 +18,15 @@ #define TAO_ENDPOINT_SELECTOR_FACTORY_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/TAO_Export.h" namespace CORBA { @@ -74,7 +71,5 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ENDPOINT_SELECTOR_FACTORY_H */ diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 62b2ef0b142..6938ac7259e 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -1,7 +1,7 @@ -#include "tao/Environment.h" -#include "tao/ORB_Core.h" -#include "tao/SystemException.h" -#include "tao/default_environment.h" +#include "Environment.h" +#include "ORB_Core.h" +#include "SystemException.h" +#include "default_environment.h" #include "ace/OS_NS_string.h" @@ -15,8 +15,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Environment::Environment (void) : exception_ (0) , previous_ (0) @@ -189,7 +187,7 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (info))); + ACE_TEXT_TO_TCHAR_IN (info))); CORBA::SystemException *x2 = CORBA::SystemException::_downcast (this->exception_); @@ -202,11 +200,10 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); } else ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info))); + ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_TO_TCHAR_IN (info))); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index cfcde246122..5446f342097 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -32,8 +32,6 @@ #include "tao/Pseudo_VarOut_T.h" #include "tao/default_environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; namespace CORBA @@ -150,8 +148,6 @@ namespace CORBA }; } // End CORBA namespace -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Environment.i" diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i index 9a710cebffd..3875aa4ac65 100644 --- a/TAO/tao/Environment.i +++ b/TAO/tao/Environment.i @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::Environment_ptr env) @@ -45,4 +42,3 @@ CORBA::Environment::_nil (void) return static_cast <CORBA::Environment_ptr> (0); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 16f65716ead..7e96e205456 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Exception.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/ORB_Constants.h" -#include "tao/CORBA_String.h" -#include "tao/CDR.h" -#include "tao/debug.h" +#include "Exception.h" +#include "SystemException.h" +#include "Environment.h" +#include "ORB_Constants.h" +#include "CORBA_String.h" +#include "CDR.h" +#include "debug.h" #include "ace/Malloc.h" #include "ace/SString.h" @@ -25,6 +25,7 @@ #include "ace/OS_NS_stdio.h" + ACE_RCSID (tao, Exception, "$Id$") @@ -32,8 +33,6 @@ ACE_RCSID (tao, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Exception::Exception (const char * repository_id, const char * local_name) : id_ (CORBA::string_dup (repository_id)), @@ -94,21 +93,19 @@ CORBA::Exception::_tao_print_exception (const char *user_provided_info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) EXCEPTION, %s\n") ACE_TEXT ("%s\n"), - ACE_TEXT_CHAR_TO_TCHAR (user_provided_info), - ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (user_provided_info), + ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ()))); } -#if defined (ACE_USES_WCHAR) void -CORBA::Exception::_tao_print_exception (const ACE_WCHAR_T *info, +CORBA::Exception::_tao_print_exception (const wchar_t *info, FILE *f) const { // Even though this call causes additional type conversions, this is // better for the maintenance. Plus, this will occur only on // exception anyway. - this->_tao_print_exception (ACE_TEXT_ALWAYS_CHAR (info), f); + this->_tao_print_exception (ACE_TEXT_TO_CHAR_IN (info), f); } -#endif // ACE_USES_WCHAR void CORBA::Exception::_tao_any_destructor (void *x) @@ -140,4 +137,3 @@ namespace CORBA #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index fbf2a092fd8..a33da901c7b 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -39,18 +39,14 @@ #include "ace/iosfwd.h" #include "ace/CORBA_macros.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_OutputCDR; class TAO_InputCDR; -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ // This is already done in orbconf.h. But this file is totally // decoupled from its contents that we have to do this here. Including @@ -146,15 +142,11 @@ namespace CORBA */ void _tao_print_exception (const char *info, FILE *f = stdout) const; - -#if defined (ACE_USES_WCHAR) - /// ACE_WCHAR_T version of _tao_print_exception. /** * @note This method is TAO-specific. */ - void _tao_print_exception (const ACE_WCHAR_T *info, + void _tao_print_exception (const wchar_t *info, FILE *f = stdout) const; -#endif // ACE_USES_WCHAR /// Returns a string containing information about the exception. This /// function is not CORBA compliant. @@ -235,8 +227,6 @@ public: static CORBA::SystemException *create_system_exception (const char *id); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Exception.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index 2a77bfab959..4eadae1c5a2 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Exception * CORBA::Exception::_downcast (CORBA::Exception * x) { @@ -15,5 +13,3 @@ CORBA::Exception::_downcast (CORBA::Exception const * x) { return x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h index ff1794b49db..49887b973ce 100644 --- a/TAO/tao/Exception_Data.h +++ b/TAO/tao/Exception_Data.h @@ -22,8 +22,6 @@ #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class TypeCode; @@ -62,7 +60,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_EXCEPTION_DATA_H*/ diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 47145cfff9b..46453d885d4 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -3,14 +3,12 @@ #include "tao/Exclusive_TMS.h" #include "tao/Reply_Dispatcher.h" #include "tao/debug.h" -#include "tao/Transport.h" +#include "Transport.h" ACE_RCSID (tao, Exclusive_TMS, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport), request_id_generator_ (0), @@ -30,7 +28,7 @@ TAO_Exclusive_TMS::~TAO_Exclusive_TMS (void) CORBA::ULong TAO_Exclusive_TMS::request_id (void) { - ++this->request_id_generator_; + this->request_id_generator_++; // if TAO_Transport::bidirectional_flag_ // == 1 --> originating side @@ -47,7 +45,7 @@ TAO_Exclusive_TMS::request_id (void) if (TAO_debug_level > 4) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::request_id - <%d>\n"), + ACE_TEXT ("(%P|%t) TAO_Exclusive_TMS::request_id - <%d>\n"), this->request_id_generator_)); return this->request_id_generator_; @@ -128,4 +126,3 @@ TAO_Exclusive_TMS::connection_closed (void) this->rd_->connection_closed (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h index 84f659bcc68..6937340cb4c 100644 --- a/TAO/tao/Exclusive_TMS.h +++ b/TAO/tao/Exclusive_TMS.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,7 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Pluggable_Reply_Params; @@ -91,7 +90,5 @@ protected: // able to iterate on a use case - Bala. }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* EXCLUSIVE_TMS_H */ diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index b092eea96be..8640cd7c09c 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -1,12 +1,16 @@ // $Id$ -#include "tao/FILE_Parser.h" +#include "FILE_Parser.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" #include "ace/Read_Buffer.h" +#if !defined(__ACE_INLINE__) +#include "FILE_Parser.i" +#endif /* __ACE_INLINE__ */ + #include "ace/Malloc_Base.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" @@ -18,14 +22,11 @@ ACE_RCSID (tao, "$Id$") -static const char file_prefix[] = "file:"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FILE_Parser::~TAO_FILE_Parser (void) { } +static const char file_prefix[] = "file:"; int TAO_FILE_Parser::match_prefix (const char *ior_string) const @@ -46,7 +47,7 @@ TAO_FILE_Parser::parse_string (const char *ior, const char *filename = ior + sizeof (::file_prefix)+1; - FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename), + FILE* file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN (filename), ACE_TEXT("r")); if (file == 0) @@ -78,8 +79,6 @@ TAO_FILE_Parser::parse_string (const char *ior, return object; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser, ACE_TEXT ("FILE_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h index 70ef8805d96..480fb653d18 100644 --- a/TAO/tao/FILE_Parser.h +++ b/TAO/tao/FILE_Parser.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -23,8 +22,6 @@ #include "tao/IOR_Parser.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_FILE_Parser * @@ -35,9 +32,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * read its contents and then interepret the file as an IOR (that * can be in any valid format). */ -class TAO_FILE_Parser : public TAO_IOR_Parser +class TAO_Export TAO_FILE_Parser : public TAO_IOR_Parser { public: + /// Constructor + TAO_FILE_Parser (void); /// The destructor virtual ~TAO_FILE_Parser (void); @@ -51,7 +50,9 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__ACE_INLINE__) +# include "FILE_Parser.i" +#endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_FILE_Parser) ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser) diff --git a/TAO/tao/FILE_Parser.i b/TAO/tao/FILE_Parser.i new file mode 100644 index 00000000000..c3ca97a6149 --- /dev/null +++ b/TAO/tao/FILE_Parser.i @@ -0,0 +1,6 @@ +// $Id$ + +ACE_INLINE +TAO_FILE_Parser::TAO_FILE_Parser (void) +{ +} diff --git a/TAO/tao/Fault_Tolerance_Service.cpp b/TAO/tao/Fault_Tolerance_Service.cpp index fedcae19465..847d5f00469 100644 --- a/TAO/tao/Fault_Tolerance_Service.cpp +++ b/TAO/tao/Fault_Tolerance_Service.cpp @@ -13,8 +13,6 @@ ACE_RCSID (tao, Fault_Tolerance_Service, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Fault_Tolerance_Service::~TAO_Fault_Tolerance_Service (void) { delete this->ft_service_callback_; @@ -62,5 +60,3 @@ TAO_Fault_Tolerance_Service::retention_id (void) return ++this->ft_object_retention_id_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index 39e2799754f..ff8fd90b6a1 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -1,5 +1,4 @@ //-*- C++ -*- - //============================================================================= /** * @file Fault_Tolerance_Service.h @@ -18,24 +17,19 @@ #define TAO_FAULT_TOLERANCE_SERVICE_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/TAO_Export.h" #include "tao/Basic_Types.h" -#include "ace/SString.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Service_Callbacks; class TAO_ORB_Core; +class ACE_Lock; /** * @class TAO_Fault_Tolerance_Service @@ -99,7 +93,6 @@ private: // this. }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Fault_Tolerance_Service.i" diff --git a/TAO/tao/Fault_Tolerance_Service.i b/TAO/tao/Fault_Tolerance_Service.i index 6fb2c4ca1a1..f7f4fefd7d3 100644 --- a/TAO/tao/Fault_Tolerance_Service.i +++ b/TAO/tao/Fault_Tolerance_Service.i @@ -1,9 +1,4 @@ -// -*- C++ -*- -// //$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void) : ft_service_callback_ (0), @@ -13,6 +8,8 @@ TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void) { } + + ACE_INLINE TAO_Service_Callbacks * TAO_Fault_Tolerance_Service::service_callback (void) { @@ -31,4 +28,3 @@ TAO_Fault_Tolerance_Service::client_id (const char *id) this->ft_object_id_ = id; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 762219e3b6f..386cd9da395 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_CPP -#define TAO_FIXED_ARRAY_ARGUMENT_T_CPP +#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_C +#define TAO_FIXED_ARRAY_ARGUMENT_T_C #include "tao/Fixed_Array_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/Fixed_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Fixed_Array_Argument_T, + "$Id$") template<typename S, typename S_slice, @@ -146,6 +148,4 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_CPP */ +#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index 81c351a3db1..2ff2f43976b 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -181,8 +179,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Fixed_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index 7465933cca4..de891a44bcd 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename S_slice, typename S_forany, @@ -134,5 +132,3 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::r { return this->x_._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp index 871c13f7341..60a2fe74a63 100644 --- a/TAO/tao/Fixed_Size_Argument_T.cpp +++ b/TAO/tao/Fixed_Size_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_FIXED_SIZE_ARGUMENT_T_CPP -#define TAO_FIXED_SIZE_ARGUMENT_T_CPP +#ifndef TAO_FIXED_SIZE_ARGUMENT_T_C +#define TAO_FIXED_SIZE_ARGUMENT_T_C #include "tao/Fixed_Size_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/Fixed_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Fixed_Size_Argument_T, + "$Id$") template<typename S, typename Insert_Policy> @@ -106,6 +108,4 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_FIXED_SIZE_ARGUMENT_T_CPP */ +#endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */ diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 88bf0938df7..e4bc7c3aa3b 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -154,8 +152,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Fixed_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index bc747f119dc..bce99464476 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> ACE_INLINE @@ -97,4 +93,3 @@ TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void) return this->x_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource_Factory.cpp index ebdd37f545e..b0529d29a0e 100644 --- a/TAO/tao/FlResource_Factory.cpp +++ b/TAO/tao/FlResource_Factory.cpp @@ -1,19 +1,18 @@ //$Id$ -#include "tao/FlResource_Factory.h" -#include "tao/debug.h" +#include "FlResource_Factory.h" +#include "debug.h" #include "ace/FlReactor.h" ACE_RCSID( TAO_FlResource, FlResource_Factory, "$Id$"); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { - FlResource_Factory::FlResource_Factory (void) - : reactor_impl_( 0 ) + + FlResource_Factory::FlResource_Factory (): + reactor_impl_( 0 ) { } @@ -35,5 +34,3 @@ namespace TAO return this->reactor_impl_; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Factory.h b/TAO/tao/FlResource_Factory.h index c56d652005a..ab34c6ef503 100644 --- a/TAO/tao/FlResource_Factory.h +++ b/TAO/tao/FlResource_Factory.h @@ -13,18 +13,14 @@ #ifndef TAO_FLRESOURCE_FACTORY_H #define TAO_FLRESOURCE_FACTORY_H #include /**/ "ace/pre.h" - +#include "ace/FlReactor.h" #include "tao/TAO_FlResource_Export.h" +#include "tao/GUIResource_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/FlReactor.h" -#include "tao/GUIResource_Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -55,8 +51,5 @@ namespace TAO ACE_FlReactor *reactor_impl_; }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_FLRESOURCE_FACTORY_H */ diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource_Loader.cpp index c5dbe7131eb..13f01c7bef4 100644 --- a/TAO/tao/FlResource_Loader.cpp +++ b/TAO/tao/FlResource_Loader.cpp @@ -1,29 +1,26 @@ //$Id$ -#include "tao/FlResource_Loader.h" -#include "tao/ORB_Core.h" -#include "tao/FlResource_Factory.h" +#include "FlResource_Loader.h" +#include "ORB_Core.h" +#include "FlResource_Factory.h" ACE_RCSID( TAO_FlResource, FlResource_Loader, "$Id$"); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { - FlResource_Loader::FlResource_Loader (void) + + FlResource_Loader::FlResource_Loader () { FlResource_Factory *tmp = 0; ACE_NEW (tmp, FlResource_Factory ()); - TAO_ORB_Core::set_gui_resource_factory (tmp); + TAO_ORB_Core::set_gui_resource_factory( tmp ); } - FlResource_Loader::~FlResource_Loader (void) + FlResource_Loader::~FlResource_Loader () { } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h index feec4495f68..c56c2c5a39f 100644 --- a/TAO/tao/FlResource_Loader.h +++ b/TAO/tao/FlResource_Loader.h @@ -14,17 +14,12 @@ #ifndef TAO_FLRESOURCE_LOADER_H #define TAO_FLRESOURCE_LOADER_H #include /**/ "ace/pre.h" - #include "tao/TAO_FlResource_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -46,14 +41,10 @@ namespace TAO { public: - FlResource_Loader (void); + FlResource_Loader ( ); - virtual ~FlResource_Loader (void); + virtual ~FlResource_Loader (); }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_FLRESOURCE_LOADER_H */ diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl index 07ef18b5e7f..1a0ee031940 100644 --- a/TAO/tao/FloatSeq.pidl +++ b/TAO/tao/FloatSeq.pidl @@ -15,8 +15,6 @@ * -Wb,export_include=tao/TAO_Export.h * -Wb,anyop_export_macro=TAO_AnyTypeCode_Export * -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * FloatSeq.pidl */ diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index d5c32aa2f78..311d83e4867 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/FloatSeqC.h" +#include "FloatSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ void CORBA::FloatSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h index dbab855a3b4..09fa2f459a7 100644 --- a/TAO/tao/FloatSeqC.h +++ b/TAO/tao/FloatSeqC.h @@ -52,8 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -141,8 +139,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp index 6d66ee99975..5d3e59a7e66 100644 --- a/TAO/tao/Flushing_Strategy.cpp +++ b/TAO/tao/Flushing_Strategy.cpp @@ -1,16 +1,12 @@ +// -*- C++ -*- // $Id$ -#include "tao/Flushing_Strategy.h" +#include "Flushing_Strategy.h" ACE_RCSID (tao, Flushing_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h index ead55aec8f2..4c2cf07d43f 100644 --- a/TAO/tao/Flushing_Strategy.h +++ b/TAO/tao/Flushing_Strategy.h @@ -21,12 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport; class TAO_Queued_Message; @@ -72,8 +67,6 @@ public: virtual int flush_transport (TAO_Transport *transport) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl index eb6e86ca8c4..6dc8616bdb6 100644 --- a/TAO/tao/GIOP.pidl +++ b/TAO/tao/GIOP.pidl @@ -19,8 +19,6 @@ // -Wb,export_include="tao/TAO_Export.h" // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" -// -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL // GIOP.pidl // // ================================================================ @@ -28,7 +26,7 @@ #ifndef TAO_GIOP_PIDL #define TAO_GIOP_PIDL -#include "tao/IOP_IOR.pidl" +#include "IOP_IOR.pidl" #pragma prefix "omg.org" diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 505bb143157..c969f09d9c0 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -29,20 +29,18 @@ // be\be_codegen.cpp:288 -#include "tao/GIOPC.h" +#include "GIOPC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "tao/GIOPC.inl" +#include "GIOPC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -387,5 +385,3 @@ CORBA::Boolean operator>> ( return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index cdc438390d5..e85e137e6c0 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -57,8 +57,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -267,10 +265,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/GIOPC.inl" +#include "GIOPC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/GIOPC.inl b/TAO/tao/GIOPC.inl index d83b70b3c5b..a4780ad16c0 100644 --- a/TAO/tao/GIOPC.inl +++ b/TAO/tao/GIOPC.inl @@ -36,8 +36,6 @@ // TAO_IDL - Generated from // be\be_visitor_union/discriminant_ci.cpp:164 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void GIOP::TargetAddress::_default () @@ -159,5 +157,3 @@ GIOP::TargetAddress::ior (void) { return *this->u_.ior_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 77a379e1a10..aa0efbb8b97 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "tao/GIOP_Message_Base.h" -#include "tao/operation_details.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" -#include "tao/TAO_Server_Request.h" -#include "tao/GIOP_Message_Locate_Header.h" -#include "tao/Transport.h" -#include "tao/Transport_Mux_Strategy.h" -#include "tao/LF_Strategy.h" -#include "tao/Request_Dispatcher.h" -#include "tao/Codeset_Manager.h" -#include "tao/SystemException.h" +#include "GIOP_Message_Base.h" +#include "operation_details.h" +#include "debug.h" +#include "ORB_Core.h" +#include "TAO_Server_Request.h" +#include "GIOP_Message_Locate_Header.h" +#include "Transport.h" +#include "Transport_Mux_Strategy.h" +#include "LF_Strategy.h" +#include "Request_Dispatcher.h" +#include "Codeset_Manager.h" +#include "SystemException.h" /* * Hook to add additional include files during specializations. @@ -22,24 +22,22 @@ ACE_RCSID (tao, GIOP_Message_Base, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core * orb_core, - size_t /* input_cdr_size */) +TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, + size_t /*input_cdr_size*/) : orb_core_ (orb_core) - , message_state_ () - , out_stream_ (this->buffer_, - sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */ - TAO_ENCAP_BYTE_ORDER, - orb_core->output_cdr_buffer_allocator (), - orb_core->output_cdr_dblock_allocator (), - orb_core->output_cdr_msgblock_allocator (), - orb_core->orb_params ()->cdr_memcpy_tradeoff (), - TAO_DEF_GIOP_MAJOR, - TAO_DEF_GIOP_MINOR) + , message_state_ () + , out_stream_ (this->buffer_, + sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */ + TAO_ENCAP_BYTE_ORDER, + orb_core->output_cdr_buffer_allocator (), + orb_core->output_cdr_dblock_allocator (), + orb_core->output_cdr_msgblock_allocator (), + orb_core->orb_params ()->cdr_memcpy_tradeoff (), + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR) { #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) - ACE_OS::memset (this->buffer_, 0, sizeof (buffer_)); + ACE_OS::memset(buffer_, 0, sizeof (buffer_)); #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ } @@ -198,7 +196,7 @@ TAO_GIOP_Message_Base::generate_reply_header ( ACE_TRY { // Now call the implementation for the rest of the header - int const result = + int result = generator_parser->write_reply_header (cdr, params ACE_ENV_ARG_PARAMETER); @@ -218,7 +216,7 @@ TAO_GIOP_Message_Base::generate_reply_header ( { if (TAO_debug_level > 4) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header")); + "TAO_GIOP_Message_Base::generate_reply_header"); return -1; } @@ -227,6 +225,15 @@ TAO_GIOP_Message_Base::generate_reply_header ( return 0; } + +int +TAO_GIOP_Message_Base::read_message (TAO_Transport * /*transport*/, + int /*block */, + ACE_Time_Value * /*max_wait_time*/) +{ + return 0; +} + int TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream) { @@ -234,7 +241,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream) char *buf = (char *) stream.buffer (); // Length of all buffers. - size_t const total_len = + size_t total_len = stream.total_length (); // NOTE: Here would also be a fine place to calculate a digital @@ -244,7 +251,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream) // this particular environment and that isn't handled by the // networking infrastructure (e.g., IPSEC). - CORBA::ULong const bodylen = static_cast <CORBA::ULong> + CORBA::ULong bodylen = static_cast <CORBA::ULong> (total_len - TAO_GIOP_MESSAGE_HEADER_LEN); #if !defined (ACE_ENABLE_SWAP_ON_WRITE) @@ -300,7 +307,6 @@ TAO_GIOP_Message_Base::message_type ( case TAO_GIOP_LOCATEREPLY: return TAO_PLUGGABLE_MESSAGE_LOCATEREPLY; - case TAO_GIOP_REPLY: return TAO_PLUGGABLE_MESSAGE_REPLY; @@ -311,19 +317,13 @@ TAO_GIOP_Message_Base::message_type ( return TAO_PLUGGABLE_MESSAGE_FRAGMENT; case TAO_GIOP_MESSAGERROR: - return TAO_PLUGGABLE_MESSAGE_MESSAGERROR; - case TAO_GIOP_CANCELREQUEST: - return TAO_PLUGGABLE_MESSAGE_CANCELREQUEST; - + // Does it happen? why?? default: - if (TAO_debug_level > 0) - { ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) %N:%l message_type : ") ACE_TEXT ("wrong message.\n"))); } - } return TAO_PLUGGABLE_MESSAGE_MESSAGERROR; } @@ -331,51 +331,32 @@ TAO_GIOP_Message_Base::message_type ( int TAO_GIOP_Message_Base::parse_incoming_messages (ACE_Message_Block &incoming) { - this->message_state_.reset (); - return this->message_state_.parse_message_header (incoming); } -int -TAO_GIOP_Message_Base::parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, - size_t &mesg_length) +ssize_t +TAO_GIOP_Message_Base::missing_data (ACE_Message_Block &incoming) { - if (incoming.length () < TAO_GIOP_MESSAGE_HEADER_LEN) - { - qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED; - - return 0; /* incomplete header */ - } - else - { - TAO_GIOP_Message_State state; + // Actual message size including the header.. + CORBA::ULong msg_size = + this->message_state_.message_size (); - if (state.parse_message_header (incoming) == -1) - { - return -1; - } - - const size_t message_size = state.message_size (); /* Header + Payload */ - - if (message_size > incoming.length ()) - { - qd.missing_data_ = message_size - incoming.length (); - } - else - { - qd.missing_data_ = 0; - } - - /* init out-parameters */ - this->init_queued_data (&qd, state); - mesg_length = TAO_GIOP_MESSAGE_HEADER_LEN - + state.payload_size (); + size_t len = incoming.length (); - return 1; /* complete header */ + // If we have too many messages or if we have less than even a size + // of the GIOP header then .. + if (len > msg_size || + len < TAO_GIOP_MESSAGE_HEADER_LEN) + { + return -1; } + else if (len == msg_size) + return 0; + + return msg_size - len; } + int TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, TAO_Queued_Data *&qd) @@ -384,45 +365,15 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, { if (incoming.length () > 0) { - // Optimize memory usage, we dont know actual message size - // so far, but allocate enough space to hold small GIOP - // messages. This way we avoid expensive "grow" operation - // for small messages. - const size_t default_buf_size = ACE_CDR::DEFAULT_BUFSIZE; - - // Make a node which has at least message block of the size - // of MESSAGE_HEADER_LEN. - const size_t buf_size = ace_max (TAO_GIOP_MESSAGE_HEADER_LEN, - default_buf_size); - - // POST: buf_size >= TAO_GIOP_MESSAGE_HEADER_LEN - - qd = this->make_queued_data (buf_size); - - if (qd == 0) - { - if (TAO_debug_level > 0) - { - ACE_ERROR((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::extract_next_message, ") - ACE_TEXT ("out of memory\n"))); - } - return -1; - } + // Make a node which has a message block of the size of + // MESSAGE_HEADER_LEN. + qd = + this->make_queued_data (TAO_GIOP_MESSAGE_HEADER_LEN); qd->msg_block_->copy (incoming.rd_ptr (), incoming.length ()); - - incoming.rd_ptr (incoming.length ()); // consume all available data - - qd->missing_data_ = TAO_MISSING_DATA_UNDEFINED; + qd->missing_data_ = -1; } - else - { - // handle not initialized variables - qd = 0; // reset - } - return 0; } @@ -436,26 +387,12 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming, qd = this->make_queued_data (copying_len); - if (qd == 0) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::extract_next_message, ") - ACE_TEXT ("out of memory\n"))); - } - return -1; - } - if (copying_len > incoming.length ()) { qd->missing_data_ = copying_len - incoming.length (); + copying_len = incoming.length (); } - else - { - qd->missing_data_ = 0; - } qd->msg_block_->copy (incoming.rd_ptr (), copying_len); @@ -471,71 +408,35 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd, ACE_Message_Block &incoming) { // Look to see whether we had atleast parsed the GIOP header ... - if (qd->missing_data_ == TAO_MISSING_DATA_UNDEFINED) + if (qd->missing_data_ == -1) { // The data length that has been stuck in there during the last // read .... - size_t const len = + size_t len = qd->msg_block_->length (); - // paranoid check - if (len >= TAO_GIOP_MESSAGE_HEADER_LEN) - { - // inconsistency - this code should have parsed the header - // so far - return -1; - } - // We know that we would have space for // TAO_GIOP_MESSAGE_HEADER_LEN here. So copy that much of data // from the <incoming> into the message block in <qd> - const size_t available = incoming.length (); - const size_t desired = TAO_GIOP_MESSAGE_HEADER_LEN - len; - const size_t n_copy = ace_min (available, desired); - - // paranoid check, but would cause endless looping - if (n_copy == 0) - { - return -1; - } - - if (qd->msg_block_->copy (incoming.rd_ptr (), - n_copy) == -1) - { - return -1; - } + qd->msg_block_->copy (incoming.rd_ptr (), + TAO_GIOP_MESSAGE_HEADER_LEN - len); // Move the rd_ptr () in the incoming message block.. - incoming.rd_ptr (n_copy); - - // verify sufficient data to parse GIOP header - if (qd->msg_block_->length () < TAO_GIOP_MESSAGE_HEADER_LEN) - { - return 0; /* continue */ - } + incoming.rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN - len); TAO_GIOP_Message_State state; // Parse the message header now... if (state.parse_message_header (*qd->msg_block_) == -1) + return -1; + + // Now grow the message block so that we can copy the rest of + // the data... + if (qd->msg_block_->space () < state.message_size ()) { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::consolidate_node, ") - ACE_TEXT ("error parsing header\n") )); - } - return -1; + ACE_CDR::grow (qd->msg_block_, + state.message_size ()); } - // Now grow the message block so that we can copy the rest of - // the data, the message_block must be able to hold complete message - if (ACE_CDR::grow (qd->msg_block_, - state.message_size ()) == -1) /* GIOP_Header + Payload */ - { - // on mem-error get rid of context silently, try to avoid - // system calls that might allocate additional memory - return -1; - } // Copy the pay load.. // Calculate the bytes that needs to be copied in the queue... @@ -558,11 +459,8 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd, // ..now we are set to copy the right amount of data to the // node.. - if (qd->msg_block_->copy (incoming.rd_ptr (), - copy_len) == -1) - { - return -1; - } + qd->msg_block_->copy (incoming.rd_ptr (), + copy_len); // Set the <rd_ptr> of the <incoming>.. incoming.rd_ptr (copy_len); @@ -584,19 +482,10 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd, copy_len = incoming.length (); } - // paranoid check for endless-event-looping - if (copy_len == 0) - { - return -1; - } - // Copy the right amount of data in to the node... // node.. - if (qd->msg_block_->copy (incoming.rd_ptr (), - copy_len) == -1) - { - return -1; - } + qd->msg_block_->copy (incoming.rd_ptr (), + copy_len); // Set the <rd_ptr> of the <incoming>.. qd->msg_block_->rd_ptr (copy_len); @@ -606,6 +495,16 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd, return 0; } +void +TAO_GIOP_Message_Base::get_message_data (TAO_Queued_Data *qd) +{ + // Get the message information + this->init_queued_data (qd, this->message_state_); + + // Reset the message_state + this->message_state_.reset (); +} + int TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, TAO_Queued_Data *qd) @@ -650,7 +549,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport, // Get the read and write positions before we steal data. size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base (); - size_t const wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); + size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN; if (TAO_debug_level > 0) @@ -743,7 +642,7 @@ TAO_GIOP_Message_Base::process_reply_message ( // Get the read and write positions before we steal data. size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base (); - size_t const wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); + size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN; if (TAO_debug_level > 0) @@ -805,8 +704,8 @@ TAO_GIOP_Message_Base::process_reply_message ( // every reply on this connection. if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, ") - ACE_TEXT ("dispatch reply failed\n"), + "TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, " + "dispatch reply failed\n", params.transport_->id ())); } @@ -839,8 +738,7 @@ TAO_GIOP_Message_Base::generate_exception_reply ( // happened -> no hope, close connection. // Close the handle. - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ") ACE_TEXT ("generate_exception_reply ()\n"))); return -1; @@ -856,6 +754,7 @@ TAO_GIOP_Message_Base::write_protocol_header (TAO_GIOP_Message_Type type, TAO_OutputCDR &msg) { // Reset the message type + // Reset the message type msg.reset (); CORBA::Octet header[12] = @@ -931,11 +830,11 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, CORBA::Object_var forward_to; /* - * Hook to specialize request processing within TAO + * Hook to specialize request processing within TAO * This hook will be replaced by specialized request * processing implementation. */ -//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START +//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START // Do this before the reply is sent. this->orb_core_->request_dispatcher ()->dispatch ( @@ -949,18 +848,10 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, if (!CORBA::is_nil (forward_to.in ())) { - const CORBA::Boolean permanent_forward_condition = - this->orb_core_->is_permanent_forward_condition - (forward_to.in (), - request.request_service_context ()); - // We should forward to another object... TAO_Pluggable_Reply_Params_Base reply_params; reply_params.request_id_ = request_id; - reply_params.reply_status_ = - permanent_forward_condition - ? TAO_GIOP_LOCATION_FORWARD_PERM - : TAO_GIOP_LOCATION_FORWARD; + reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD; reply_params.svc_ctx_.length (0); // Send back the reply service context. @@ -1432,8 +1323,8 @@ TAO_GIOP_Message_Base:: { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -") - ACE_TEXT (" connection already closed\n"))); + "TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -" + " connection already closed\n")); return; } #endif @@ -1454,14 +1345,14 @@ TAO_GIOP_Message_Base:: { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) error closing connection %u, errno = %d\n"), - transport->id (), errno)); + "(%P|%t) error closing connection %u, errno = %d\n", + transport->id (), errno)); } transport->close_connection (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) shut down transport, handle %d\n"), - transport-> id ())); + "(%P|%t) shut down transport, handle %d\n", + transport-> id ())); } @@ -1574,12 +1465,12 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, "TAO (%P|%t) - GIOP_Message_Base::dump_msg, " "%s GIOP v%c.%c msg, %d data bytes, %s endian, " "Type %s[%u]\n", - ACE_TEXT_CHAR_TO_TCHAR (label), + ACE_TEXT_TO_TCHAR_IN (label), digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]], digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]], len - TAO_GIOP_MESSAGE_HEADER_LEN , (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"), - ACE_TEXT_CHAR_TO_TCHAR(message_name), + ACE_TEXT_TO_TCHAR_IN(message_name), *id)); if (TAO_debug_level >= 10) @@ -1629,17 +1520,6 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz) TAO_Queued_Data::make_queued_data ( this->orb_core_->transport_message_buffer_allocator ()); - if (qd == 0) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ") - ACE_TEXT ("our of memory, failed to allocate queued data object\n"))); - } - return 0; // NULL pointer - } - // @@todo: We have a similar method in Transport.cpp. Need to see how // we can factor them out.. // Make a datablock for the size requested + something. The @@ -1651,58 +1531,20 @@ TAO_GIOP_Message_Base::make_queued_data (size_t sz) this->orb_core_->create_input_cdr_data_block (sz + ACE_CDR::MAX_ALIGNMENT); - if (db == 0) - { - TAO_Queued_Data::release (qd); - - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ") - ACE_TEXT ("out of memory, failed to allocate input data block of size %u\n"), - sz)); - } - return 0; // NULL pointer - } - ACE_Allocator *alloc = this->orb_core_->input_cdr_msgblock_allocator (); - if (alloc == 0) - { - if (TAO_debug_level >= 8) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) - TAO_GIOP_Message_Base::make_queued_data,") - ACE_TEXT (" no ACE_Allocator defined\n"))); - } - } - - ACE_Message_Block mb (db, 0, alloc); ACE_Message_Block *new_mb = mb.duplicate (); - if (new_mb == 0) - { - TAO_Queued_Data::release (qd); - db->release(); - - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::make_queued_data, ") - ACE_TEXT ("out of memory, failed to allocate message block\n"))); - } - return 0; - } - ACE_CDR::mb_align (new_mb); qd->msg_block_ = new_mb; + return qd; } @@ -1728,343 +1570,13 @@ TAO_GIOP_Message_Base::fragment_header_length (CORBA::Octet major, void TAO_GIOP_Message_Base::init_queued_data ( - TAO_Queued_Data* qd, - const TAO_GIOP_Message_State& state) const + TAO_Queued_Data* qd, + const TAO_GIOP_Message_State& state) const { qd->byte_order_ = state.byte_order_; qd->major_version_ = state.giop_version_.major; qd->minor_version_ = state.giop_version_.minor; qd->more_fragments_ = state.more_fragments_; + qd->request_id_ = state.request_id_; qd->msg_type_ = this->message_type (state); } - -int -TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd, CORBA::ULong &request_id) const -{ - // Get a parser for us - TAO_GIOP_Message_Generator_Parser *generator_parser = 0; - - // Get the state information that we need to use - this->set_state (qd->major_version_, - qd->minor_version_, - generator_parser); - - // Get the read and write positions before we steal data. - size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base (); - size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); - rd_pos += TAO_GIOP_MESSAGE_HEADER_LEN; - - // Create a input CDR stream. We do the following - // 1 - If the incoming message block has a data block with a flag - // DONT_DELETE (for the data block) we create an input CDR - // stream the same way. - // 2 - If the incoming message block had a datablock from heap just - // use it by duplicating it and make the flag 0. - // NOTE: We use the same data block in which we read the message and - // we pass it on to the higher layers of the ORB. So we dont to any - // copies at all here. The same is also done in the higher layers. - - ACE_Message_Block::Message_Flags flg = 0; - ACE_Data_Block *db = 0; - - // Get the flag in the message block - flg = qd->msg_block_->self_flags (); - - if (ACE_BIT_ENABLED (flg, - ACE_Message_Block::DONT_DELETE)) - { - // Use the same datablock - db = qd->msg_block_->data_block (); - } - else - { - // Use a duplicated datablock as the datablock has come off the - // heap. - db = qd->msg_block_->data_block ()->duplicate (); - } - - - TAO_InputCDR input_cdr (db, - flg, - rd_pos, - wr_pos, - qd->byte_order_, - qd->major_version_, - qd->minor_version_, - this->orb_core_); - - if (qd->major_version_ >= 1 && - (qd->minor_version_ == 0 || qd->minor_version_ == 1)) - { - if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REQUEST || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REPLY) - { - IOP::ServiceContextList service_context; - - if ( ! (input_cdr >> service_context && - input_cdr >> request_id) ) - { - return -1; - } - - return 0; - } - else if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY) - { - if ( ! (input_cdr >> request_id) ) - { - return -1; - } - - return 0; - } - else - { - return -1; - } - } - else - { - if (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REQUEST || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_REPLY || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST || - qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_LOCATEREPLY) - { - // Dealing with GIOP-1.2, the request-id is located directly behind the GIOP-Header. - // This is true for all message types that might be sent in form of fragments or cancel-requests. - if ( ! (input_cdr >> request_id) ) - { - return -1; - } - - return 0; - } - else - { - return -1; - } - } - - return -1; -} - -/* @return -1 error, 0 ok, +1 outstanding fragments */ -int -TAO_GIOP_Message_Base::consolidate_fragmented_message (TAO_Queued_Data *qd, TAO_Queued_Data *&msg) -{ - TAO::Incoming_Message_Stack reverse_stack; - - TAO_Queued_Data *tail = 0; - TAO_Queued_Data *head = 0; - - // - // CONSOLIDATE FRAGMENTED MESSAGE - // - - // check for error-condition - if (qd == 0) - { - return -1; - } - - if (qd->major_version_ == 1 && qd->minor_version_ == 0) - { - TAO_Queued_Data::release (qd); - return -1; // error: GIOP-1.0 does not support fragments - } - - // If this is not the last fragment, push it onto stack for later processing - if (qd->more_fragments_) - { - this->fragment_stack_.push (qd); - - msg = 0; // no consolidated message available yet - return 1; // status: more messages expected. - } - - tail = qd; // init - - // Add the current message block to the end of the chain - // after adjusting the read pointer to skip the header(s) - const size_t header_adjustment = - this->header_length () + - this->fragment_header_length (tail->major_version_, - tail->minor_version_); - - if (tail->msg_block_->length () < header_adjustment) - { - // buffer length not sufficient - TAO_Queued_Data::release (qd); - return -1; - } - - // duplicate code to speed up both processes, for GIOP-1.1 and GIOP-1.2 - if (tail->major_version_ == 1 && tail->minor_version_ == 1) - { - // GIOP-1.1 - - while (this->fragment_stack_.pop (head) != -1) - { - if (head->more_fragments_ && - head->major_version_ == 1 && - head->minor_version_ == 1 && - head->msg_block_->length () >= header_adjustment) - { - // adjust the read-pointer, skip the fragment header - tail->msg_block_->rd_ptr(header_adjustment); - - head->msg_block_->cont (tail->msg_block_); - - tail->msg_block_ = 0; - - TAO_Queued_Data::release (tail); - - tail = head; - } - else - { - reverse_stack.push (head); - } - } - } - else - { - // > GIOP-1.2 - - CORBA::ULong tmp_request_id = 0; - if (this->parse_request_id (tail, tmp_request_id) == -1) - { - return -1; - } - - const CORBA::ULong request_id = tmp_request_id; - - while (this->fragment_stack_.pop (head) != -1) - { - CORBA::ULong head_request_id = 0; - int parse_status = 0; - - if (head->more_fragments_ && - head->major_version_ >= 1 && - head->minor_version_ >= 2 && - head->msg_block_->length () >= header_adjustment && - (parse_status = this->parse_request_id (head, head_request_id)) != -1 && - request_id == head_request_id) - { - // adjust the read-pointer, skip the fragment header - tail->msg_block_->rd_ptr(header_adjustment); - - head->msg_block_->cont (tail->msg_block_); - - tail->msg_block_ = 0; - - TAO_Queued_Data::release (tail); - - tail = head; - } - else - { - if (parse_status == -1) - { - TAO_Queued_Data::release (head); - return -1; - } - - reverse_stack.push (head); - } - } - } - - // restore stack - while (reverse_stack.pop (head) != -1) - { - this->fragment_stack_.push (head); - } - - if (tail->consolidate () == -1) - { - // memory allocation failed - TAO_Queued_Data::release (tail); - return -1; - } - - // set out value - msg = tail; - - return 0; -} - - -int -TAO_GIOP_Message_Base::discard_fragmented_message (const TAO_Queued_Data *cancel_request) -{ - // We must extract the specific request-id from message-buffer - // and remove all fragments from stack that match this request-id. - - TAO::Incoming_Message_Stack reverse_stack; - - CORBA::ULong cancel_request_id; - - if (this->parse_request_id (cancel_request, cancel_request_id) == -1) - { - return -1; - } - - TAO_Queued_Data *head = 0; - - // Revert stack - while (this->fragment_stack_.pop (head) != -1) - { - reverse_stack.push (head); - } - - bool discard_all_GIOP11_messages = false; - - // Now we are able to process message in order they have arrived. - // If the cancel_request_id matches to GIOP-1.1 message, all succeeding - // fragments belong to this message and must be discarded. - // Note: GIOP-1.1 fragment header dont have any request-id encoded. If the - // cancel_request_id matches GIOP-1.2 messages, all GIOP-1.2 fragments - // having encoded the request id will be discarded. - while (reverse_stack.pop (head) != -1) - { - CORBA::ULong head_request_id; - - if (head->major_version_ == 1 && - head->minor_version_ <= 1 && - head->msg_type_ != TAO_PLUGGABLE_MESSAGE_FRAGMENT && // GIOP11 fragment does not provide request id - this->parse_request_id (head, head_request_id) >= 0 && - cancel_request_id == head_request_id) - { - TAO_Queued_Data::release (head); - - discard_all_GIOP11_messages = true; - } - else if (head->major_version_ == 1 && - head->minor_version_ <= 1 && - discard_all_GIOP11_messages) - { - TAO_Queued_Data::release (head); - } - else if (head->major_version_ >= 1 && - head->minor_version_ >= 2 && - this->parse_request_id (head, head_request_id) >= 0 && - cancel_request_id == head_request_id) - { - TAO_Queued_Data::release (head); - } - else - { - this->fragment_stack_.push (head); - } - } - - return 0; -} - - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 596ea383366..853f4db9125 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -1,5 +1,5 @@ // -*- C++ -*- - +// // =================================================================== /** * @file GIOP_Message_Base.h @@ -27,9 +27,6 @@ #include "tao/GIOP_Utils.h" #include "tao/GIOP_Message_State.h" #include "tao/CDR.h" -#include "tao/Incoming_Message_Stack.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Pluggable_Reply_Params; class TAO_Queued_Data; @@ -41,7 +38,8 @@ class TAO_Queued_Data; * * This class will hold the specific details common to all the GIOP * versions. Some of them which are here may be shifted if things - * start changing between versions. + * start changing between versions. This class uses the + * TAO_GIOP_Message_Reactive_Handler to read and parse messages. */ class TAO_Export TAO_GIOP_Message_Base : public TAO_Pluggable_Messaging @@ -81,23 +79,36 @@ public: TAO_Pluggable_Reply_Params_Base ¶ms ); + /// This method reads the message on the connection. Returns 0 when + /// there is short read on the connection. Returns 1 when the full + /// message is read and handled. Returns -1 on errors. If @a block is + /// 1, then reply is read in a blocking manner. + virtual int read_message (TAO_Transport *transport, + int block = 0, + ACE_Time_Value *max_wait_time = 0); + + /// Format the message. As we have not written the message length in /// the header, we make use of this oppurtunity to insert and format /// the message. virtual int format_message (TAO_OutputCDR &cdr); - /// Parse the details of the next message from the @a incoming - /// and initializes attributes of @a qd. Returns 0 if the message - /// header could not be parsed completely, returns a 1 if the message - /// header could be parsed completely and returns -1 on error. - virtual int parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, /* out */ - size_t &mesg_length); /* out */ - - /// Extract the details of the next message from the @a incoming - /// through @a qd. Returns 0 if the message header could not be - /// parsed completely, returns a 1 if the message header could be - /// parsed completely and returns -1 on error. + /// Parse the incoming messages.. + /// + /// \return -1 There was some error parsing the GIOP header + /// \return 0 The GIOP header was parsed correctly + /// \return 1 There was not enough data in the message block to + /// parse the header + virtual int parse_incoming_messages (ACE_Message_Block &message_block); + + /// Calculate the amount of data that is missing in the <incoming> + /// message block. + virtual ssize_t missing_data (ACE_Message_Block &message_block); + + /* Extract the details of the next message from the @a incoming + * through @a qd. Returns 1 if there are more messages and returns a + * 0 if there are no more messages in @a incoming. + */ virtual int extract_next_message (ACE_Message_Block &incoming, TAO_Queued_Data *&qd); @@ -105,6 +116,9 @@ public: virtual int consolidate_node (TAO_Queued_Data *qd, ACE_Message_Block &incoming); + /// Get the details of the message parsed through the @a qd. + virtual void get_message_data (TAO_Queued_Data *qd); + /// Process the request message that we have received on the /// connection virtual int process_request_message (TAO_Transport *transport, @@ -133,25 +147,6 @@ public: virtual TAO_OutputCDR &out_stream (void); - /// Consolidate fragmented message with associated fragments, being - /// stored withi this class. If reliable transport is used (like - /// TCP) fragments are partialy ordered on stack, last fragment on - /// top. Otherwise If un-reliable transport is used (like UDP) - /// fragments may be dis-ordered, and must be ordered before - /// consolidation. @return 0 on success and @a msg points to - /// consolidated message, 1 if there are still fragmens outstanding, - /// in case of error -1 is being returned. In any case @a qd must be - /// released by method implementation. - virtual int consolidate_fragmented_message (TAO_Queued_Data *qd, - TAO_Queued_Data *&msg); - - /// Discard all fragments associated to request-id encoded in - /// cancel_request. This operation will never be called - /// concurrently by multiplpe threads nor concurrently to - /// consolidate_fragmented_message @return -1 on failure, 0 on - /// success, 1 no fragment on stack relating to CancelRequest. - virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request); - protected: /// Processes the GIOP_REQUEST messages @@ -237,17 +232,6 @@ protected: const TAO_GIOP_Message_State& state) const; private: - int parse_incoming_messages (ACE_Message_Block &incoming); - - /// Parse GIOP request-id of TAO_Queued_Data @a qd - /// @return 0 on success, otherwise -1 - int parse_request_id (const TAO_Queued_Data *qd, CORBA::ULong &request_id) const; - - /// Parse GIOP request-id of TAO_InputCDR @a cdr. - /// @return 0 on success, otherwise -1 - int parse_request_id (const TAO_InputCDR &cdr, CORBA::ULong &request_id) const; - -private: /// Cached ORB_Core pointer... TAO_ORB_Core *orb_core_; @@ -258,10 +242,6 @@ private: /// All the implementations of GIOP message generator and parsers TAO_GIOP_Message_Generator_Parser_Impl tao_giop_impl_; - /// All Fragments being received are stored on stack in reverse - /// order, last top - TAO::Incoming_Message_Stack fragment_stack_; - protected: /// Buffer used for both the output and input CDR streams, this is /// "safe" because we only one of the streams at a time. @@ -284,8 +264,5 @@ protected: */ //@@ MESSAGING_SPL_EXTERN_ADD_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - -#endif /* TAO_GIOP_MESSAGE_BASE_H */ +#endif /*TAO_GIOP_MESSAGE_BASE_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index abd302b491e..c38aadd4626 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -13,8 +13,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void) { } @@ -37,8 +35,9 @@ TAO_GIOP_Message_Generator_Parser::parse_reply ( } // and the reply status type. status can be NO_EXCEPTION, - // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD, - // LOCATION_FORWARD_PERM + // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD + + // Cannot handle LOCATION_FORWARD_PERM here CORBA::ULong rep_stat = 0; if (!stream.read_ulong (rep_stat)) { @@ -75,12 +74,13 @@ TAO_GIOP_Message_Generator_Parser::parse_reply ( TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD; break; // Reply is a location forward perm type - // LOCATION_FORWARD_PERM is only allowed in context of - // FaultTolerant featured requests and requires PortableGroup - // features in forwarded object and service context + // @@For the time being the behaviour of the + // LOCATION_FORWARD_PERM would be similar to the + // LOCATION_FORWARD as there is a controversy surrounding the + // usage of this in the OMG. case TAO_GIOP_LOCATION_FORWARD_PERM: params.reply_status_ = - TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM; + TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD; break; // Reply is a location forward type case TAO_GIOP_NEEDS_ADDRESSING_MODE: @@ -115,7 +115,8 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( // and the reply status type. status can be NO_EXCEPTION, // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD - // LOCATION_FORWARD_PERM + + // Cannot handle LOCATION_FORWARD_PERM here // Please note here that we are NOT converting to the Pluggable // messaging layer exception as this is GIOP specific. Not many @@ -167,5 +168,3 @@ TAO_GIOP_Message_Generator_Parser::marshal_reply_status ( break; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 0291c4264c3..a427384ea93 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -1,5 +1,5 @@ -// -*- C++ -*- +// -*- C++ -*- // =================================================================== /** * @file GIOP_Message_Generator_Parser.h @@ -22,8 +22,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Target_Specification; class TAO_OutputCDR; @@ -111,8 +109,5 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 351ed8e21be..a78149c847a 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -14,11 +14,9 @@ #include "ace/Log_Msg.h" ACE_RCSID (tao, - GIOP_Message_Generator_Parser_10, + GIOP_Message_Gen_Parser_10, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_GIOP_Message_Generator_Parser_10::write_request_header ( const TAO_Operation_Details &opdetails, @@ -341,7 +339,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( request.request_id (req_id); - CORBA::Octet response_flags = CORBA::Octet(); + CORBA::Octet response_flags; hdr_status = hdr_status && input.read_octet (response_flags); request.response_expected ((response_flags != 0)); @@ -469,7 +467,7 @@ CORBA::Octet TAO_GIOP_Message_Generator_Parser_10::major_version (void) { // Any harm in hardcoding?? - return static_cast<CORBA::Octet> (1); + return (CORBA::Octet) 1; } CORBA::Octet @@ -484,5 +482,3 @@ TAO_GIOP_Message_Generator_Parser_10::fragment_header_length (void) const { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 6604c1ec09c..848f83fffd2 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -1,5 +1,5 @@ -// -*- C++ -*- +// -*- C++ -*- // =================================================================== /** * @file GIOP_Message_Generator_Parser_10.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_GIOP_Message_State; /** @@ -92,8 +90,5 @@ public: virtual size_t fragment_header_length (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_10_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp index 88bdbe641af..0d9bd94c60a 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp @@ -1,15 +1,11 @@ #include "tao/GIOP_Message_Generator_Parser_11.h" -ACE_RCSID (tao, - GIOP_Message_Generator_Parser_11, +ACE_RCSID (tao, + GIOP_Message_Gen_Parser_11, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Octet TAO_GIOP_Message_Generator_Parser_11::minor_version (void) { - return static_cast<CORBA::Octet> (1); + return (CORBA::Octet) 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index cc88a7082ec..fd4232fe1b8 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_GIOP_Message_Generator_Parser_11 * @@ -32,8 +30,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * the 1.0 class. * */ -class TAO_Export TAO_GIOP_Message_Generator_Parser_11 - : public TAO_GIOP_Message_Generator_Parser_10 + +class TAO_Export TAO_GIOP_Message_Generator_Parser_11: + public TAO_GIOP_Message_Generator_Parser_10 { public: @@ -42,8 +41,5 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - -#endif /* TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H */ +#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_11_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 5fa498544dc..5296e870b67 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -21,8 +21,6 @@ ACE_RCSID (tao, // scope. static const size_t TAO_GIOP_MESSAGE_ALIGN_PTR = 8; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_GIOP_Message_Generator_Parser_12::write_request_header ( const TAO_Operation_Details &opdetails, @@ -266,7 +264,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( request.request_id (req_id); - CORBA::Octet response_flags = CORBA::Octet(); + CORBA::Octet response_flags; hdr_status = hdr_status && input.read_octet (response_flags); request.response_expected ((response_flags > 0)); @@ -568,5 +566,3 @@ TAO_GIOP_Message_Generator_Parser_12::fragment_header_length (void) const { return TAO_GIOP_MESSAGE_FRAGMENT_HEADER; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 1a91095fa6b..5fa4d531ba9 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -1,5 +1,5 @@ -// -*- C++ -*- +// -*- C++ -*- // =================================================================== /** * @file GIOP_Message_Generator_Parser_12.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_GIOP_Message_State; class TAO_Service_Context; class TAO_Transport; @@ -118,8 +116,5 @@ private: TAO_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - -#endif /* TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H */ +#endif /*TAO_GIOP_MESSAGE_GENERATOR_PARSER_12_H*/ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h index 9dad728f19b..9dd3e2cbf7c 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h @@ -1,5 +1,5 @@ -// -*- C++ -*- +// -*- C++ -*- // =================================================================== /** * @file GIOP_Message_Generator_Parser_Impl.h @@ -24,8 +24,6 @@ #include "tao/GIOP_Message_Generator_Parser_12.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_GIOP_Message_Generator_Parser_Impl * @@ -56,9 +54,6 @@ public: TAO_GIOP_Message_Generator_Parser_12 tao_giop_12; }; -TAO_END_VERSIONED_NAMESPACE_DECL - - #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Generator_Parser_Impl.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl index 5415e22f081..49f47beff45 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl @@ -2,8 +2,6 @@ // //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_GIOP_Message_Generator_Parser_Impl::check_revision ( CORBA::Octet incoming_major, @@ -12,7 +10,7 @@ TAO_GIOP_Message_Generator_Parser_Impl::check_revision ( CORBA::UShort const version_as_whole_num = incoming_major << 8 | incoming_minor; - CORBA::UShort const max_allowable_version = + static CORBA::UShort const max_allowable_version = TAO_DEF_GIOP_MAJOR << 8 | TAO_DEF_GIOP_MINOR; // If it's greater than the max, we know it's not allowed. @@ -31,5 +29,3 @@ TAO_GIOP_Message_Generator_Parser_Impl::check_revision ( return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 273b3a347b8..a0e7a4d8558 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1,17 +1,19 @@ +// -*- C++ -*- +// //$Id$ -#include "tao/GIOP_Message_Lite.h" -#include "tao/debug.h" -#include "tao/TAOC.h" -#include "tao/ORB_Core.h" -#include "tao/operation_details.h" -#include "tao/TAO_Server_Request.h" -#include "tao/GIOP_Message_Locate_Header.h" -#include "tao/LF_Strategy.h" -#include "tao/Transport.h" -#include "tao/Transport_Mux_Strategy.h" -#include "tao/Codeset_Manager.h" -#include "tao/SystemException.h" +#include "GIOP_Message_Lite.h" +#include "debug.h" +#include "TAOC.h" +#include "ORB_Core.h" +#include "operation_details.h" +#include "TAO_Server_Request.h" +#include "GIOP_Message_Locate_Header.h" +#include "LF_Strategy.h" +#include "Transport.h" +#include "Transport_Mux_Strategy.h" +#include "Codeset_Manager.h" +#include "SystemException.h" ACE_RCSID (tao, GIOP_Message_Lite, @@ -22,8 +24,6 @@ static const size_t TAO_GIOP_LITE_HEADER_LEN = 5; static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0; static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core, size_t /*input_cdr_size*/) : orb_core_ (orb_core), @@ -165,6 +165,16 @@ TAO_GIOP_Message_Lite::generate_reply_header ( return 0; } + +int +TAO_GIOP_Message_Lite::read_message (TAO_Transport * /*transport*/, + int /*block */, + ACE_Time_Value * /*max_wait_time*/) +{ + return 1; +} + + int TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream) { @@ -235,8 +245,6 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream) int TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block) { - this->reset (); - // Make sure we have enough bytes in the header to read all // of the information. if (block.length () < TAO_GIOP_LITE_HEADER_LEN) @@ -298,8 +306,6 @@ TAO_GIOP_Message_Lite::message_type (void) const return TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION; case TAO_GIOP_CANCELREQUEST: - return TAO_PLUGGABLE_MESSAGE_CANCELREQUEST; - case TAO_GIOP_MESSAGERROR: case TAO_GIOP_FRAGMENT: // Never happens: why?? @@ -313,44 +319,27 @@ TAO_GIOP_Message_Lite::message_type (void) const return TAO_PLUGGABLE_MESSAGE_MESSAGERROR; } -int -TAO_GIOP_Message_Lite::parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, - size_t &mesg_length) + +ssize_t +TAO_GIOP_Message_Lite::missing_data (ACE_Message_Block &block) { - if (incoming.length () < TAO_GIOP_LITE_HEADER_LEN) - { - qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED; + // Actual message size including the header.. + CORBA::ULong msg_size = + this->message_size_ + TAO_GIOP_LITE_HEADER_LEN; - return 0; /* incomplete header */ - } - else - { - if (this->parse_incoming_messages (incoming) == -1) + size_t len = block.length (); + + if (len > msg_size) { return -1; } + else if (len == msg_size) + return 0; - const size_t total_len = - this->message_size_ + TAO_GIOP_LITE_HEADER_LEN; - - if (total_len > incoming.length ()) - { - qd.missing_data_ = total_len - incoming.length (); - } - else - { - qd.missing_data_ = 0; - } - - this->init_queued_data (&qd); - - mesg_length = TAO_GIOP_LITE_HEADER_LEN + this->message_size_; - - return 1; /* parsed header successfully */ - } + return msg_size - len; } + int TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming, TAO_Queued_Data *&qd) @@ -364,14 +353,9 @@ TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming, qd = this->make_queued_data (TAO_GIOP_LITE_HEADER_LEN); - if (qd == 0) - { - return -1; /* out of memory */ - } - qd->msg_block_->copy (incoming.rd_ptr (), incoming.length ()); - qd->missing_data_ = TAO_MISSING_DATA_UNDEFINED; + qd->missing_data_ = -1; } return 0; } @@ -386,21 +370,12 @@ TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming, qd = this->make_queued_data (copying_len); - if (qd == 0) - { - return -1; /* out of memory */ - } - if (copying_len > incoming.length ()) { qd->missing_data_ = copying_len - incoming.length (); copying_len = incoming.length (); } - else - { - qd->missing_data_ = 0; - } qd->msg_block_->copy (incoming.rd_ptr (), copying_len); @@ -416,7 +391,7 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd, ACE_Message_Block &incoming) { // Look to see whether we had atleast parsed the GIOP header ... - if (qd->missing_data_ == TAO_MISSING_DATA_UNDEFINED) + if (qd->missing_data_ == -1) { // The data length that has been stuck in there during the last // read .... @@ -426,26 +401,11 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd, // We know that we would have space for // TAO_GIOP_MESSAGE_HEADER_LEN here. So copy that much of data // from the <incoming> into the message block in <qd> - const size_t available = incoming.length (); - const size_t desired = TAO_GIOP_LITE_HEADER_LEN - len; - const size_t n_copy = ace_min (available, desired); - - // paranoid check, but would cause endless loop - if (n_copy == 0) - { - return -1; - } - - qd->msg_block_->copy (incoming.rd_ptr (), n_copy); + qd->msg_block_->copy (incoming.rd_ptr (), + TAO_GIOP_LITE_HEADER_LEN - len); // Move the rd_ptr () in the incoming message block.. - incoming.rd_ptr (n_copy); - - // verify there is now enough data to parse the header - if (qd->msg_block_->length () < TAO_GIOP_LITE_HEADER_LEN) - { - return 0; - } + incoming.rd_ptr (TAO_GIOP_LITE_HEADER_LEN - len); // Parse the message header now... if (this->parse_incoming_messages (*qd->msg_block_) == -1) @@ -453,12 +413,8 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd, // Now grow the message block so that we can copy the rest of // the data... - if (ACE_CDR::grow (qd->msg_block_, - this->message_size_ + TAO_GIOP_LITE_HEADER_LEN) == -1) - { - /* memory allocation failed */ - return -1; - } + ACE_CDR::grow (qd->msg_block_, + this->message_size_ + TAO_GIOP_LITE_HEADER_LEN); // Copy the pay load.. @@ -480,12 +436,6 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd, qd->missing_data_ = 0; } - // paranoid check - if (copy_len == 0) - { - return -1; - } - // ..now we are set to copy the right amount of data to the // node.. qd->msg_block_->copy (incoming.rd_ptr (), @@ -524,6 +474,17 @@ TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd, return 0; } + +void +TAO_GIOP_Message_Lite::get_message_data (TAO_Queued_Data *qd) +{ + // Get the message information + this->init_queued_data (qd); + + // Reset the message_state + this->reset (); +} + int TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport, TAO_Queued_Data *qd) @@ -1347,7 +1308,7 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request) request.request_id (req_id); - CORBA::Octet response_flags = CORBA::Octet(); + CORBA::Octet response_flags; hdr_status = hdr_status && input.read_octet (response_flags); request.response_expected ((response_flags != 0)); @@ -1645,10 +1606,10 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P | %t):%s GIOP lite msg, ") ACE_TEXT ("%d data bytes, %s endian, <%s = %d> \n"), - ACE_TEXT_CHAR_TO_TCHAR(label), + ACE_TEXT_TO_TCHAR_IN(label), len - TAO_GIOP_LITE_HEADER_LEN, (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"), - ACE_TEXT_CHAR_TO_TCHAR (message_name), + ACE_TEXT_TO_TCHAR_IN (message_name), *id)); if (TAO_debug_level >= 10) @@ -1666,11 +1627,6 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz) TAO_Queued_Data *qd = TAO_Queued_Data::make_queued_data (); - if (qd == 0) - { - return 0; - } - // Make a datablock for the size requested + something. The // "something" is required because we are going to align the data // block in the message block. During alignment we could loose some @@ -1680,12 +1636,6 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz) this->orb_core_->create_input_cdr_data_block (sz + ACE_CDR::MAX_ALIGNMENT); - if (db == 0) - { - TAO_Queued_Data::release (qd); - return 0; - } - ACE_Allocator *alloc = this->orb_core_->input_cdr_msgblock_allocator (); @@ -1695,14 +1645,6 @@ TAO_GIOP_Message_Lite::make_queued_data (size_t sz) ACE_Message_Block *new_mb = mb.duplicate (); - if (new_mb == 0) - { - TAO_Queued_Data::release (qd); - db->release(); - - return 0; - } - ACE_CDR::mb_align (new_mb); qd->msg_block_ = new_mb; @@ -1747,30 +1689,3 @@ TAO_GIOP_Message_Lite::init_queued_data (TAO_Queued_Data* qd) const qd->minor_version_ = TAO_DEF_GIOP_MINOR; qd->msg_type_ = this->message_type (); } - -/* @return -1 error, 0 ok */ -int -TAO_GIOP_Message_Lite::consolidate_fragmented_message (TAO_Queued_Data* /* qd */, - TAO_Queued_Data *& /* msg */) -{ - if (TAO_debug_level > 3) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P | %t):%s GIOP lite msg, ") - ACE_TEXT ("Error, fragmented messages not supported\n"))); - } - return -1; // not implemented, not supported -} - - - -/// Remove all fragments from stack corelating to CancelRequest @a qd. -/// @return -1 on failure, 0 on success, 1 no fragment on stack -/// relating to CancelRequest. -int -TAO_GIOP_Message_Lite::discard_fragmented_message (const TAO_Queued_Data *) -{ - return 1; // no fragment on stack relating to cancel-request -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index b01f16121eb..8ddaa6ef89b 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -27,8 +27,6 @@ #include "tao/SystemException.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Pluggable_Reply_Params; class TAO_GIOP_Locate_Request_Header; @@ -80,19 +78,24 @@ public: TAO_Pluggable_Reply_Params_Base ¶ms ); + /// Dummy method to .. + virtual int read_message (TAO_Transport *transport, + int block = 0, + ACE_Time_Value *max_wait_time = 0); + + /// Format the message. As we have not written the message length in /// the header, we make use of this oppurtunity to insert and format /// the message. virtual int format_message (TAO_OutputCDR &cdr); -private: /// Parse the incoming messages.. /// /// \return -1 There was some error parsing the GIOP header /// \return 0 The GIOP header was parsed correctly /// \return 1 There was not enough data in the message block to /// parse the header - int parse_incoming_messages (ACE_Message_Block &message_block); + virtual int parse_incoming_messages (ACE_Message_Block &message_block); /// Get the message type. The return value would be one of the /// following: @@ -100,23 +103,17 @@ private: /// TAO_PLUGGABLE_MESSAGE_REPLY, /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION, /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR. - /// TAO_PLUGGABLE_MESSAGE_MESSAGE_CANCELREQUEST. TAO_Pluggable_Message_Type message_type (void) const; -public: - /// Parse the details of the next message from the @a incoming - /// and initializes attributes of @a qd. Returns 0 if the message - /// header could not be parsed completely, returns a 1 if the message - /// header could be parsed completely and returns -1 on error. - virtual int parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, /* out */ - size_t &mesg_length); /* out */ - - - /// Extract the details of the next message from the @a incoming - /// through @a qd. Returns 0 if the message header could not be - /// parsed completely, returns a 1 if the message header could be - /// parsed completely and returns -1 on error. + + /// Calculate the amount of data that is missing in the <incoming> + /// message block. + virtual ssize_t missing_data (ACE_Message_Block &message_block); + + /* Extract the details of the next message from the @a incoming + * through @a qd. Returns 1 if there are more messages and returns a + * 0 if there are no more messages in @a incoming. + */ virtual int extract_next_message (ACE_Message_Block &incoming, TAO_Queued_Data *&qd); @@ -124,6 +121,9 @@ public: virtual int consolidate_node (TAO_Queued_Data *qd, ACE_Message_Block &incoming); + /// Get the details of the message parsed through the <qd>. + virtual void get_message_data (TAO_Queued_Data *qd); + /// Process the request message that we have received on the /// connection virtual int process_request_message (TAO_Transport *transport, @@ -142,25 +142,6 @@ public: CORBA::Exception &x ); - /// Consolidate fragmented message with associated fragments, being - /// stored withi this class. If reliable transport is used (like - /// TCP) fragments are partialy ordered on stack, last fragment on - /// top. Otherwise If un-reliable transport is used (like UDP) - /// fragments may be dis-ordered, and must be ordered before - /// consolidation. @return 0 on success and @a msg points to - /// consolidated message, 1 if there are still fragmens outstanding, - /// in case of error -1 is being returned. In any case @a qd must be - /// released by method implementation. - virtual int consolidate_fragmented_message (TAO_Queued_Data *qd, - TAO_Queued_Data *&msg); - - /// Discard all fragments associated to request-id encoded in - /// cancel_request. This operation will never be called - /// concurrently by multiplpe threads nor concurrently to - /// consolidate_fragmented_message @r 0 on success, 1 if no matching - /// fragment chain exists, -1 on error - virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request); - private: /// Writes the GIOP header in to @a msg @@ -294,7 +275,5 @@ private: TAO_OutputCDR cdr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_GIOP_MESSAGE_LITE_H*/ diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp index b4889f39b7c..089da5d7a71 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.cpp +++ b/TAO/tao/GIOP_Message_Locate_Header.cpp @@ -1,11 +1,10 @@ //$Id$ - #include "tao/GIOP_Message_Locate_Header.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Locate_Header.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - GIOP_Message_Locate_Header, +ACE_RCSID (tao, + GIOP_Message_Headers, "$Id$") diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h index 8604a1239a8..89600c8ec1b 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.h +++ b/TAO/tao/GIOP_Message_Locate_Header.h @@ -25,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_GIOP_Locate_Request_Header * @@ -72,8 +70,6 @@ private: TAO_InputCDR *incoming_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Locate_Header.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Locate_Header.i b/TAO/tao/GIOP_Message_Locate_Header.i index d59598e5919..8b8025c4603 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.i +++ b/TAO/tao/GIOP_Message_Locate_Header.i @@ -1,13 +1,9 @@ // -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE -TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header ( - TAO_InputCDR &msg, - TAO_ORB_Core *orb) +TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg, + TAO_ORB_Core *orb) : request_id_ (0), profile_ (orb), incoming_ (&msg) @@ -50,4 +46,3 @@ TAO_GIOP_Locate_Request_Header::incoming_stream (void) return *this->incoming_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index 6f30b76136b..6100e1fb4fe 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -14,14 +14,13 @@ ACE_RCSID (tao, GIOP_Message_State, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_GIOP_Message_State::TAO_GIOP_Message_State (void) : giop_version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), byte_order_ (0), message_type_ (0), message_size_ (0), + request_id_ (0), more_fragments_ (0), missing_data_ (0) { @@ -97,7 +96,8 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming) } } - return 0; // success + // Get the request id + return this->parse_fragment_header (buf, incoming.length ()); } @@ -169,7 +169,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) if (TAO_debug_level > 8) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n") )); + "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n")); } // Let us be specific that this is for 1.0 @@ -185,8 +185,8 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf) if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, ") - ACE_TEXT ("invalid byte order <%d> for version <1.0>\n"), + "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, " + "invalid byte order <%d> for version <1.0>\n", this->byte_order_)); } return -1; @@ -229,8 +229,36 @@ TAO_GIOP_Message_State::get_payload_size (char *rd_ptr) this->message_size_ = this->read_ulong (rd_ptr); } + + +int +TAO_GIOP_Message_State::parse_fragment_header (const char *buf, + size_t length) +{ + // By this point we are doubly sure that we have a more or less + // valid GIOP message with a valid major revision number. + if ((this->giop_version_.major > 1 || this->giop_version_.minor >= 2) && + (this->more_fragments_ || this->message_type_ == TAO_GIOP_FRAGMENT)) + { + static const size_t len = + TAO_GIOP_MESSAGE_HEADER_LEN + TAO_GIOP_MESSAGE_FRAGMENT_HEADER; + + // If there is not enough data in the header to get the request + // id, then we need to indicate that by returning 1. + if (length < len) + return 1; + + // Fragmented message in GIOP 1.2 should have a fragment header + // following the GIOP header. + buf += TAO_GIOP_MESSAGE_HEADER_LEN; + this->request_id_ = this->read_ulong (buf); + } + + return 0; +} + CORBA::ULong -TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const +TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) { CORBA::ULong x = 0; @@ -238,13 +266,11 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const // as SunCC) have a problem in deferencing from the // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be // on stack. So let us go ahead with this copying... - char buf[] = - { - *rd_ptr, - *(rd_ptr + 1), - *(rd_ptr + 2), - *(rd_ptr + 3) - }; + char buf [4]; + buf[0] = *rd_ptr; + buf[1] = *(rd_ptr + 1); + buf[2] = *(rd_ptr + 2); + buf[3] = *(rd_ptr + 3); #if !defined (ACE_DISABLE_SWAP_ON_READ) if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER)) @@ -261,5 +287,3 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const return x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 9de7eee5b7e..16d9c11d14c 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -11,7 +11,7 @@ * * @author Chris Cleeland <cleeland@cs.wustl.edu> * @author Carlos O' Ryan <coryan@uci.edu> - * @author Balachandran Natarajan <bala@cs.wustl.edu> + * @author modified by Balachandran Natarajan <bala@cs.wustl.edu> */ //============================================================================= #ifndef TAO_GIOP_MESSAGE_STATE_H @@ -25,13 +25,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_GIOP_Message_Base; - /** * @class TAO_GIOP_Message_State * @@ -91,9 +87,14 @@ private: /// Gets the size of the payload and set the size in the <state> void get_payload_size (char *buf); + /// Parses the GIOP FRAGMENT_HEADER information from the incoming + /// stream. + int parse_fragment_header (const char *buf, + size_t length); + /// Read the unsigned long from the buffer. The <buf> should just /// point to the next 4 bytes data that represent the ULong - CORBA::ULong read_ulong (const char *buf) const; + CORBA::ULong read_ulong (const char *buf); private: // GIOP version information.. @@ -108,6 +109,9 @@ private: /// in byte_order! CORBA::ULong message_size_; + /// Request Id from the Fragment header + CORBA::ULong request_id_; + /// (Requests and Replys) /// A value of zero indicates that this message does not have any /// fragments. A value of non-zero indicates that it does have @@ -118,15 +122,14 @@ private: CORBA::ULong missing_data_; }; -TAO_END_VERSIONED_NAMESPACE_DECL -static const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12; -static const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8; -static const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6; -static const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET = 7; -static const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5; -static const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4; -static const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4; +const size_t TAO_GIOP_MESSAGE_HEADER_LEN = 12; +const size_t TAO_GIOP_MESSAGE_SIZE_OFFSET = 8; +const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6; +const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET = 7; +const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5; +const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4; +const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4; #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_State.inl" diff --git a/TAO/tao/GIOP_Message_State.inl b/TAO/tao/GIOP_Message_State.inl index 2de1bbb2b03..fe076bee689 100644 --- a/TAO/tao/GIOP_Message_State.inl +++ b/TAO/tao/GIOP_Message_State.inl @@ -2,15 +2,13 @@ //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_GIOP_Message_State::message_size (void) const { CORBA::ULong len = this->message_size_ + TAO_GIOP_MESSAGE_HEADER_LEN; - return len; + return len; } ACE_INLINE CORBA::ULong @@ -31,6 +29,7 @@ TAO_GIOP_Message_State::reset (void) this->message_type_ = 0; this->message_size_ = 0; this->more_fragments_ = 0; + this->request_id_ = 0; this->missing_data_ = 0; } @@ -53,5 +52,3 @@ TAO_GIOP_Message_State::header_received (void) const } #endif - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp index b7935f7ac71..78a90520dcf 100644 --- a/TAO/tao/GIOP_Message_Version.cpp +++ b/TAO/tao/GIOP_Message_Version.cpp @@ -1,5 +1,5 @@ //$Id$ -# include "tao/GIOP_Message_Version.h" +# include "GIOP_Message_Version.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Version.inl" diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index f563af8004d..0c3f4dc9c55 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -28,8 +28,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; /** @@ -54,6 +52,9 @@ public: TAO_GIOP_Message_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR, CORBA::Octet min = TAO_DEF_GIOP_MINOR); + /// Destructor. + ~TAO_GIOP_Message_Version (void); + /// Explicitly set the major and minor version. void set_version (CORBA::Octet maj, CORBA::Octet min); @@ -65,8 +66,6 @@ public: bool operator!= (const TAO_GIOP_Message_Version &src); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/GIOP_Message_Version.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl index 6328534b3fc..216e29f5424 100644 --- a/TAO/tao/GIOP_Message_Version.inl +++ b/TAO/tao/GIOP_Message_Version.inl @@ -2,8 +2,6 @@ // //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_GIOP_Message_Version::TAO_GIOP_Message_Version ( const TAO_GIOP_Message_Version &src) @@ -20,16 +18,20 @@ TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj, { } +ACE_INLINE +TAO_GIOP_Message_Version::~TAO_GIOP_Message_Version (void) +{ +} + ACE_INLINE TAO_GIOP_Message_Version & TAO_GIOP_Message_Version::operator= ( const TAO_GIOP_Message_Version &src) { - if (this != &src) - { - this->major = src.major; - this->minor = src.minor; - } + if (this == &src) + return *this; + this->major = src.major; + this->minor = src.minor; return *this; } @@ -55,5 +57,3 @@ TAO_GIOP_Message_Version::operator!= ( { return !(*this == src); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp index 595a6f85936..464eaa8430e 100644 --- a/TAO/tao/GIOP_Utils.cpp +++ b/TAO/tao/GIOP_Utils.cpp @@ -9,13 +9,12 @@ ACE_RCSID (tao, GIOP_Utils, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int -TAO_GIOP_Utils::read_bytes_input (TAO_Transport *transport, - TAO_InputCDR &input, - CORBA::ULong read_size, - ACE_Time_Value *value) +TAO_GIOP_Utils:: + read_bytes_input (TAO_Transport *transport, + TAO_InputCDR &input, + CORBA::ULong read_size, + ACE_Time_Value *value) { // Grow the size of CDR stream if (input.grow (read_size) == -1) @@ -29,7 +28,7 @@ TAO_GIOP_Utils::read_bytes_input (TAO_Transport *transport, char *buf = input.rd_ptr (); ssize_t n = 0; - for (CORBA::ULong t = read_size; + for (int t = read_size; t != 0; t -= n) { @@ -77,5 +76,3 @@ TAO_GIOP_Utils::read_buffer (TAO_Transport *transport, return bytes_read; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h index 392e73aafe8..b3d3ff167b3 100644 --- a/TAO/tao/GIOP_Utils.h +++ b/TAO/tao/GIOP_Utils.h @@ -27,13 +27,8 @@ #include "tao/IOP_IORC.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport; +class ACE_Time_Value; /** * All GIOP messages include a header and message type. Not @@ -51,7 +46,7 @@ typedef enum GIOP_Messages TAO_GIOP_CLOSECONNECTION = 5, TAO_GIOP_MESSAGERROR = 6, // by both. TAO_GIOP_FRAGMENT = 7 // by both. -} TAO_GIOP_Message_Type; +}TAO_GIOP_Message_Type; typedef enum GIOP_LocateStatusType @@ -149,7 +144,5 @@ public: ACE_Time_Value *max_wait_time = 0); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_GIOP_UTILS_H */ diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp index a94f2e97302..ae586a57a99 100644 --- a/TAO/tao/GUIResource_Factory.cpp +++ b/TAO/tao/GUIResource_Factory.cpp @@ -3,16 +3,14 @@ #include "ace/Reactor.h" #include "tao/debug.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { - GUIResource_Factory::GUIResource_Factory (void) - : dynamically_allocated_reactor_ (0) + GUIResource_Factory::GUIResource_Factory (): + dynamically_allocated_reactor_ (0) { } - GUIResource_Factory::~GUIResource_Factory (void) + GUIResource_Factory::~GUIResource_Factory () { } @@ -55,5 +53,3 @@ namespace TAO delete reactor; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index 134f8bfa88a..0d85ab6b2d1 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -13,25 +13,18 @@ #ifndef TAO_GUI_RESOURCE_FACTORY_H #define TAO_GUI_RESOURCE_FACTORY_H - #include /**/ "ace/pre.h" - +#include "ace/Thread_Mutex.h" #include "tao/TAO_Export.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" - -#include "ace/Thread_Mutex.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +//forwards class ACE_Reactor_Impl; class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -93,8 +86,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - -#endif /* TAO_GUI_RESOURCE_FACTORY_H */ +#endif /*TAO_GUI_RESOURCE_FACTORY_H*/ diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl index 02ee7037d5f..18cba35abea 100644 --- a/TAO/tao/IFR_Client/IFR_Base.pidl +++ b/TAO/tao/IFR_Client/IFR_Base.pidl @@ -19,8 +19,6 @@ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL * IFR_Base.pidl * * Only the stub files are used in the TAO_IFR_Client library. The @@ -52,8 +50,8 @@ #ifndef _IFR_BASE_IDL_ #define _IFR_BASE_IDL_ -#include "tao/orb_types.pidl" -#include "tao/Typecode_types.pidl" +#include <orb_types.pidl> +#include <Typecode_types.pidl> module CORBA { diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index a684ebb3841..339d9aea34e 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:293 -#include "tao/IFR_Client/IFR_BaseC.h" +#include "IFR_BaseC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/orb_typesA.h" #include "tao/AnyTypeCode/Typecode_typesA.h" @@ -60,14 +60,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_BaseC.inl" +#include "IFR_BaseC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -8612,5 +8610,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.version.out ()) && (strm >> _tao_aggregate.type.out ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 774ff7f019f..7d7e3171b2b 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IFR_Client/ifr_client_export.h" +#include "ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" @@ -72,8 +72,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -4107,10 +4105,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc // TAO_IDL - Generated from // be\be_codegen.cpp:1136 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_BaseC.inl" +#include "IFR_BaseC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_BaseC.inl b/TAO/tao/IFR_Client/IFR_BaseC.inl index c7be5ed5427..8b69d04033d 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.inl +++ b/TAO/tao/IFR_Client/IFR_BaseC.inl @@ -29,8 +29,6 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if !defined (_CORBA_IROBJECT___CI_) #define _CORBA_IROBJECT___CI_ @@ -207,5 +205,3 @@ CORBA::TypedefDef::TypedefDef ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h index 0dd9ad297a6..1fea87667c7 100644 --- a/TAO/tao/IFR_Client/IFR_BaseS.h +++ b/TAO/tao/IFR_Client/IFR_BaseS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/IFR_Client/IFR_BaseC.h" +#include "IFR_BaseC.h" #include "tao/orb_typesS.h" #include "tao/Typecode_typesS.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -1250,8 +1248,6 @@ namespace POA_CORBA } // module CORBA -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl index c86b4e3a291..fa156e72b2d 100644 --- a/TAO/tao/IFR_Client/IFR_Basic.pidl +++ b/TAO/tao/IFR_Client/IFR_Basic.pidl @@ -18,8 +18,6 @@ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ * IFR_Basic.pidl * * Only the stub files are used in the TAO_IFR_Client library. The @@ -51,7 +49,7 @@ #define _IFR_BASIC_IDL_ #include "tao/IFR_Client/IFR_Base.pidl" -#include "tao/ParameterMode.pidl" +#include "ParameterMode.pidl" module CORBA { diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index 73a0a993997..e9b3916a962 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:293 -#include "tao/IFR_Client/IFR_BasicC.h" +#include "IFR_BasicC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_BaseC.h" #include "tao/AnyTypeCode/orb_typesA.h" @@ -62,14 +62,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_BasicC.inl" +#include "IFR_BasicC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -13640,5 +13638,3 @@ CORBA::Boolean operator>> ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 268be82f290..06488fb9e77 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IFR_Client/ifr_client_export.h" +#include "ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" @@ -72,8 +72,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -5689,10 +5687,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal // TAO_IDL - Generated from // be\be_codegen.cpp:1136 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_BasicC.inl" +#include "IFR_BasicC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_BasicC.inl b/TAO/tao/IFR_Client/IFR_BasicC.inl index 8f36b619375..6edd2c8a1a9 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.inl +++ b/TAO/tao/IFR_Client/IFR_BasicC.inl @@ -26,8 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -891,5 +889,3 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 2afc5ef4960..add9f0af0c5 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" -#include "tao/IFR_Client/IFR_BasicC.h" +#include "IFR_Client_Adapter_Impl.h" +#include "IFR_ExtendedC.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -15,8 +15,6 @@ ACE_RCSID (IFR_Client, IFR_Client_Adapter_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { template<> @@ -216,8 +214,6 @@ TAO_IFR_Client_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IFR_Client_Adapter_Impl); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( TAO_IFR_Client_Adapter_Impl, ACE_TEXT ("Concrete_IFR_Client_Adapter"), diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index e3cfcd6b22d..bab2b9d2cb8 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/IFR_Client/ifr_client_export.h" +#include "ifr_client_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_IFR_Client_Adapter_Impl * @@ -81,15 +79,12 @@ public: static int Initializer (void); }; -static int -TAO_Requires_IFR_Client_Initializer = - TAO_IFR_Client_Adapter_Impl::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl) +static int +TAO_Requires_IFR_Client_Initializer = + TAO_IFR_Client_Adapter_Impl::Initializer (); #include /**/ "ace/post.h" diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl index 7aa0102cd97..6bae6d0ebb0 100644 --- a/TAO/tao/IFR_Client/IFR_Components.pidl +++ b/TAO/tao/IFR_Client/IFR_Components.pidl @@ -18,8 +18,6 @@ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ * IFR_Components.pidl * * Only the stub files are used in the TAO_IFR_Client library. The diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index a6c2ff11eed..eab777756f6 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/orb_typesA.h" -#include "tao/IFR_Client/IFR_ComponentsC.h" +#include "IFR_ComponentsC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_ExtendedC.h" #include "tao/Invocation_Adapter.h" @@ -58,15 +58,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_ComponentsC.inl" +#include "IFR_ComponentsC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -7402,5 +7399,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.attributes) && (strm >> _tao_aggregate.type.out ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index f952df4b02e..f2efcd1c0c8 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IFR_Client/ifr_client_export.h" +#include "ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" @@ -69,8 +69,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -3104,10 +3102,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen // TAO_IDL - Generated from // be\be_codegen.cpp:1136 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_ComponentsC.inl" +#include "IFR_ComponentsC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.inl b/TAO/tao/IFR_Client/IFR_ComponentsC.inl index 58217d7f6d4..63e656401e4 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -530,5 +529,3 @@ CORBA::ComponentIR::HomeDef::HomeDef ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl index 54675c6ef72..e0c06ce2c57 100644 --- a/TAO/tao/IFR_Client/IFR_Extended.pidl +++ b/TAO/tao/IFR_Client/IFR_Extended.pidl @@ -18,8 +18,6 @@ * -Wb,export_include=ifr_client_export.h \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ * IFR_Extended.pidl * * Only the stub files are used in the TAO_IFR_Client library. The diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 934ef4659d8..6e6d014a7bd 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -32,7 +32,7 @@ #include "tao/AnyTypeCode/VisibilityA.h" #include "tao/AnyTypeCode/ValueModifierA.h" #include "tao/AnyTypeCode/orb_typesA.h" -#include "tao/IFR_Client/IFR_ExtendedC.h" +#include "IFR_ExtendedC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/Invocation_Adapter.h" @@ -60,14 +60,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_ExtendedC.inl" +#include "IFR_ExtendedC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -4249,5 +4247,3 @@ CORBA::Boolean operator>> ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index 45d3c8e1a9b..e432cce0663 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IFR_Client/ifr_client_export.h" +#include "ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" @@ -71,8 +71,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -1553,10 +1551,8 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox // TAO_IDL - Generated from // be\be_codegen.cpp:1136 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/IFR_Client/IFR_ExtendedC.inl" +#include "IFR_ExtendedC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.inl b/TAO/tao/IFR_Client/IFR_ExtendedC.inl index ee480033bf6..21c51c95edd 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -206,5 +205,3 @@ CORBA::ValueBoxDef::ValueBoxDef ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp index 77fcadefc4c..5155f7b0b56 100644 --- a/TAO/tao/IFR_Client_Adapter.cpp +++ b/TAO/tao/IFR_Client_Adapter.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/IFR_Client_Adapter.h" diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index 6bd15379c82..1d3240b853e 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,8 +27,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_OutputCDR; namespace CORBA @@ -98,7 +96,5 @@ public: #endif /*TAO_HAS_MINIMUM_CORBA*/ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IFR_CLIENT_ADAPTER_H */ diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index 3508d00b6cf..cd52af48f60 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -14,8 +14,6 @@ * -Wb,export_include="tao/TAO_Export.h" \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ - * -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ - * -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL \ * IIOP.pidl * * Remember to patch the generated files using diff/IIOP.diff diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 045812848c1..6bb33006503 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -29,11 +29,9 @@ // be\be_codegen.cpp:288 -#include "tao/IIOPC.h" +#include "IIOPC.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 @@ -237,5 +235,3 @@ CORBA::Boolean operator>> ( return (strm >> _tao_aggregate.listen_points); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index 69fd036e067..18133b7e39a 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -58,8 +58,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -218,8 +216,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 71ebea0882b..92cf3ae52d5 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -25,8 +25,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (IOP::TAG_INTERNET_IOP), addrs_ (0), @@ -466,7 +464,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("Overriding address in IOR with %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_))); + ACE_TEXT_TO_TCHAR_IN (this->hostname_in_ior_))); } specified_hostname = this->hostname_in_ior_; } @@ -556,8 +554,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->creation_strategy_, this->accept_strategy_, this->concurrency_strategy_, - 0, 0, 0, 1, - this->reuse_addr_) == -1) + 0, 0, 0, 1, + this->reuse_addr_) == -1) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -592,8 +590,8 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, this->creation_strategy_, this->accept_strategy_, this->concurrency_strategy_, - 0, 0, 0, 1, - this->reuse_addr_) != -1) + 0, 0, 0, 1, + this->reuse_addr_) != -1) { found_a_port = true; break; @@ -675,7 +673,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -989,7 +987,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile, #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ CORBA::Octet major; - CORBA::Octet minor = CORBA::Octet(); + CORBA::Octet minor; // Read the version. We just read it here. We don't*do any* // processing. @@ -1067,8 +1065,8 @@ TAO_IIOP_Acceptor::parse_options (const char *str) ACE_CString **argv = 0; ACE_NEW_RETURN (argv, ACE_CString*[argc],-1); - ssize_t begin = 0; - ssize_t end = -1; + int begin = 0; + int end = -1; int result = 0; for (int j = 0; j < argc; ++j) { @@ -1077,7 +1075,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (j < argc - 1) end = options.find (option_delimiter, begin); else - end = static_cast<ssize_t> (len); + end = static_cast<CORBA::ULong> (len); if (end == begin) { @@ -1121,14 +1119,14 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, while (i < argc) { size_t len = argv[i]->length(); - ssize_t slot = argv[i]->find ("="); + int slot = argv[i]->find ("="); - if (slot == static_cast <ssize_t> (len - 1) + if (slot == static_cast <int> (len - 1) || slot == ACE_CString::npos) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR(argv[i]->c_str ())), + ACE_TEXT_TO_TCHAR_IN(argv[i]->c_str ())), -1); ACE_CString name = argv[i]->substring (0, slot); @@ -1166,9 +1164,9 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, this->hostname_in_ior_ = value.rep (); } else if (name == "reuse_addr") - { - this->reuse_addr_ = ACE_OS::atoi (value.c_str ()); - } + { + this->reuse_addr_ = ACE_OS::atoi (value.c_str ()); + } else { // the name is not known, skip to the next option @@ -1179,7 +1177,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, // put this one on the end. This technique has the effect of // putting them in reverse order, but that doesn't matter, since // these arguments are only whole strings. - --argc; + argc--; ACE_CString *temp = argv[i]; for (int j = i; j <= argc-1; j++) argv[j] = argv[j+1]; @@ -1188,6 +1186,4 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 96103c44a22..8a43ea3cc82 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -32,8 +32,6 @@ #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_IIOP_Acceptor * @@ -242,7 +240,7 @@ protected: private: - /// The concrete acceptor, as a pointer to it's base class. + /// the concrete acceptor, as a pointer to it's base class. BASE_ACCEPTOR base_acceptor_; /// Acceptor strategies. @@ -253,8 +251,6 @@ private: //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) #include "tao/IIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i index baeaba0a476..9aed23e08d2 100644 --- a/TAO/tao/IIOP_Acceptor.i +++ b/TAO/tao/IIOP_Acceptor.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr& TAO_IIOP_Acceptor::address (void) const { @@ -36,5 +33,3 @@ TAO_IIOP_Acceptor::set_default_address (const ACE_INET_Addr& addr) { this->default_address_.set (addr); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index d74ee12594d..4ed86463f96 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -1,13 +1,13 @@ -#include "tao/IIOP_Connection_Handler.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" -#include "tao/IIOP_Transport.h" -#include "tao/IIOP_Endpoint.h" -#include "tao/IIOPC.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Base_Transport_Property.h" -#include "tao/Protocols_Hooks.h" -#include "tao/Wait_Strategy.h" +#include "IIOP_Connection_Handler.h" +#include "debug.h" +#include "ORB_Core.h" +#include "IIOP_Transport.h" +#include "IIOP_Endpoint.h" +#include "IIOPC.h" +#include "Thread_Lane_Resources.h" +#include "Base_Transport_Property.h" +#include "Protocols_Hooks.h" +#include "Wait_Strategy.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" @@ -16,8 +16,6 @@ ACE_RCSID (tao, IIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -84,8 +82,6 @@ TAO_IIOP_Connection_Handler::open (void*) this->orb_core ()->orb_params ()->sock_rcvbuf_size (); protocol_properties.no_delay_ = this->orb_core ()->orb_params ()->nodelay (); - protocol_properties.keep_alive_ = - this->orb_core ()->orb_params ()->sock_keepalive (); TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (); @@ -132,19 +128,6 @@ TAO_IIOP_Connection_Handler::open (void*) return -1; #endif /* ! ACE_LACKS_TCP_NODELAY */ - if (protocol_properties.keep_alive_) - { - if (this->peer (). - set_option (SOL_SOCKET, - SO_KEEPALIVE, - (void *) &protocol_properties.keep_alive_, - sizeof (protocol_properties.keep_alive_)) == -1 - && errno != ENOTSUP) - { - return -1; - } - } - if (this->transport ()->wait_strategy ()->non_blocking () || this->transport ()->opened_as () == TAO::TAO_SERVER_ROLE) { @@ -253,7 +236,7 @@ TAO_IIOP_Connection_Handler::close_connection (void) { struct linger lval; lval.l_onoff = 1; - lval.l_linger = (u_short)linger; + lval.l_linger = linger; if (this->peer ().set_option(SOL_SOCKET, SO_LINGER, @@ -377,7 +360,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( ACE_TEXT("process_listen_point_list, ") ACE_TEXT("Listening port [%d] on [%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()))); } // Construct an IIOP_Endpoint object using the host as provided @@ -421,7 +404,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio CORBA::Long codepoint = tph->get_dscp_codepoint (); - tos = static_cast<int> (codepoint) << 2; + tos = (int)(codepoint) << 2; } if (tos != this->dscp_codepoint_) @@ -479,5 +462,3 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio /* * End copy hook */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index bbcceb032dc..5654472ea3e 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -7,7 +7,7 @@ * $Id$ * * @author Originally by Chris Cleeland as IIOP_Connect.h - * @author Balachandran Natarajan <bala@cs.wustl.edu> + * @author modified by Balachandran Natarajan <bala@cs.wustl.edu> */ // =================================================================== @@ -27,8 +27,6 @@ #include "tao/Connection_Handler.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> TAO_IIOP_SVC_HANDLER; @@ -131,7 +129,5 @@ private: int dscp_codepoint_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IIOP_CONNECTION_HANDLER_H */ diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 802cdc97241..05e60c4f400 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -1,15 +1,15 @@ -#include "tao/IIOP_Connector.h" -#include "tao/IIOP_Profile.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" -#include "tao/Environment.h" -#include "tao/Protocols_Hooks.h" -#include "tao/Connect_Strategy.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/Transport.h" -#include "tao/Wait_Strategy.h" -#include "tao/SystemException.h" +#include "IIOP_Connector.h" +#include "IIOP_Profile.h" +#include "debug.h" +#include "ORB_Core.h" +#include "Environment.h" +#include "Protocols_Hooks.h" +#include "Connect_Strategy.h" +#include "Thread_Lane_Resources.h" +#include "Profile_Transport_Resolver.h" +#include "Transport.h" +#include "Wait_Strategy.h" +#include "SystemException.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -18,8 +18,6 @@ ACE_RCSID (tao, IIOP_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Connector::~TAO_IIOP_Connector (void) { } @@ -146,7 +144,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - IIOP_Connector::make_connection, " "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()), + ACE_TEXT_TO_TCHAR_IN(iiop_endpoint->host()), iiop_endpoint->port(), r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); @@ -398,5 +396,3 @@ TAO_IIOP_Connector::cancel_svc_handler ( return -1; } //@@ TAO_CONNECTOR_SPL_COPY_HOOK_END - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index ce75430c44f..cb57818fa1b 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -25,16 +25,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Connector.h" + #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" #include "tao/IIOP_Connection_Handler.h" -#include "ace/Connector.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IIOP_Endpoint; + // **************************************************************** /** @@ -130,7 +129,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_IIOP_CONNECTOR_H */ diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index 5f5600ba676..bec2bb60242 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -4,10 +4,10 @@ */ //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START -#include "tao/IIOP_Endpoint.h" -#include "tao/IOP_IORC.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" +#include "IIOP_Endpoint.h" +#include "IOP_IORC.h" +#include "debug.h" +#include "ORB_Core.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" @@ -32,8 +32,6 @@ ACE_RCSID (tao, //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) @@ -514,5 +512,3 @@ TAO_IIOP_Endpoint::preferred_network (void) const } //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 4c8c1bfd218..0ce97db063b 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -16,20 +16,16 @@ #define TAO_IIOP_ENDPOINT_H #include /**/ "ace/pre.h" - -#include "tao/Endpoint.h" +#include "ace/INET_Addr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Endpoint.h" #include "tao/CORBA_String.h" #include "tao/IIOP_EndpointsC.h" -#include "ace/INET_Addr.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IIOP_Connection_Handler; /** @@ -192,7 +188,6 @@ private: //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/IIOP_Endpoint.i" diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i index e576613fdcd..fa83957822d 100644 --- a/TAO/tao/IIOP_Endpoint.i +++ b/TAO/tao/IIOP_Endpoint.i @@ -2,7 +2,7 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + ACE_INLINE const char * TAO_IIOP_Endpoint::host (void) const @@ -29,5 +29,3 @@ TAO_IIOP_Endpoint::is_ipv6_decimal (void) const return this->is_ipv6_decimal_; } #endif /* ACE_HAS_IPV6 */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index 8d233088ee4..819ea3f62b6 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/IIOP_EndpointsC.h" +#include "IIOP_EndpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -209,5 +207,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h index 6abf0ddb7e4..2b780ea4150 100644 --- a/TAO/tao/IIOP_EndpointsC.h +++ b/TAO/tao/IIOP_EndpointsC.h @@ -65,8 +65,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -188,8 +186,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 041377b6051..852fde2c935 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -1,7 +1,7 @@ -#include "tao/IIOP_Factory.h" -#include "tao/IIOP_Acceptor.h" -#include "tao/IIOP_Connector.h" -#include "tao/IOP_IORC.h" +#include "IIOP_Factory.h" +#include "IIOP_Acceptor.h" +#include "IIOP_Connector.h" +#include "IOP_IORC.h" #include "ace/OS_NS_strings.h" @@ -11,9 +11,7 @@ ACE_RCSID (tao, "$Id$") -static const char the_prefix[] = "iiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "iiop"; TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void) : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), @@ -30,13 +28,13 @@ int TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO_IIOP_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -81,8 +79,6 @@ TAO_IIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_IIOP_Protocol_Factory, ACE_TEXT ("IIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index d7302fd08c3..66bd50adfab 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -23,8 +23,6 @@ #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; @@ -56,12 +54,10 @@ public: private: /// Changing the version number can be used to provide backwards /// compatibility with old clients. - int const major_; - int const minor_; + int major_; + int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory) diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp index 6e64599620f..0790993aeeb 100644 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ b/TAO/tao/IIOP_Lite_Factory.cpp @@ -1,7 +1,7 @@ -#include "tao/IIOP_Lite_Factory.h" -#include "tao/IIOP_Acceptor.h" -#include "tao/IIOP_Connector.h" -#include "tao/IOP_IORC.h" +#include "IIOP_Lite_Factory.h" +#include "IIOP_Acceptor.h" +#include "IIOP_Connector.h" +#include "IOP_IORC.h" #include "ace/OS_NS_strings.h" @@ -11,9 +11,7 @@ ACE_RCSID (tao, "$Id$") -static const char the_prefix[] = "iiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "iiop"; TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), @@ -31,13 +29,13 @@ int TAO_IIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO_IIOP_Lite_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -87,8 +85,6 @@ TAO_IIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory, ACE_TEXT ("IIOP_Lite_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h index c1f7cc876dd..fe4e1026abe 100644 --- a/TAO/tao/IIOP_Lite_Factory.h +++ b/TAO/tao/IIOP_Lite_Factory.h @@ -23,8 +23,6 @@ #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; @@ -58,12 +56,10 @@ public: private: /// Changing the version number can be used to provide backwards /// compatibility with old clients. - int const major_; - int const minor_; + int major_; + int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory) diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 2fe913d2108..d1474d2499b 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -15,16 +15,12 @@ ACE_RCSID (tao, #include "ace/os_include/os_netdb.h" -static const char the_prefix[] = "iiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Profile::~TAO_IIOP_Profile (void) { // Clean up the list of endpoints since we own it. // Skip the head, since it is not dynamically allocated. TAO_Endpoint *tmp = 0; - + for (TAO_Endpoint *next = this->endpoint ()->next (); next != 0; next = tmp) @@ -36,6 +32,8 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void) //@@ TAO_PROFILE_SPL_COPY_HOOK_START +static const char prefix_[] = "iiop"; + const char TAO_IIOP_Profile::object_key_delimiter_ = '/'; char @@ -372,85 +370,64 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp) char * TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { - // corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key - CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), this->ref_object_key_->object_key ()); - size_t buflen = ( - 8 /* "corbaloc" */ + - 1 /* colon separator */ + - 1 /* object key separator */ + - ACE_OS::strlen (key.in ())); - size_t pfx_len = ( - ACE_OS::strlen (::the_prefix) /* "iiop" */ + - 1 /* colon separator */); - - const TAO_IIOP_Endpoint *endp = 0; - for (endp = &this->endpoint_; endp != 0; endp = endp->next_) - { - buflen += ( - pfx_len + - 1 /* major version */ + - 1 /* decimal point */ + - 1 /* minor version */ + - 1 /* `@' character */ + - ACE_OS::strlen (endp->host ()) + - 1 /* colon separator */ + - 5 /* port number */ + - 1 /* comma */); + size_t buflen = (8 /* "corbaloc" */ + + 1 /* colon separator */ + + ACE_OS::strlen (::prefix_) + + 1 /* colon separator */ + + 1 /* major version */ + + 1 /* decimal point */ + + 1 /* minor version */ + + 1 /* `@' character */ + + ACE_OS::strlen (this->endpoint_.host ()) + + 1 /* colon separator */ + + 5 /* port number */ + + 1 /* object key separator */ + + ACE_OS::strlen (key.in ())); #if defined (ACE_HAS_IPV6) - if (endp->is_ipv6_decimal_) - buflen += 2; // room for '[' and ']' + if (this->endpoint_.is_ipv6_decimal_) + buflen += 2; // room for '[' and ']' #endif /* ACE_HAS_IPV6 */ - } - - static const char digits [] = "0123456789"; char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen)); - ACE_OS::strcpy(buf, "corbaloc:"); - - for (endp = &this->endpoint_; endp != 0; endp = endp->next_) - { - if(&this->endpoint_ != endp) - ACE_OS::strcat(buf, ","); + static const char digits [] = "0123456789"; #if defined (ACE_HAS_IPV6) - if (endp->is_ipv6_decimal_) + if (this->endpoint_.is_ipv6_decimal_) + { + // Don't publish scopeid if included. + ACE_CString tmp(this->endpoint_.host ()); + ssize_t pos = tmp.find('%'); + if (pos != ACE_CString::npos) { - // Don't publish scopeid if included. - ACE_CString tmp(endp->host ()); - ssize_t pos = tmp.find('%'); - if (pos != ACE_CString::npos) - { - tmp = tmp.substr(0, pos + 1); - tmp[pos] = '\0'; - } - ACE_OS::sprintf (buf + ACE_OS::strlen(buf), - "%s:%c.%c@[%s]:%d", - ::the_prefix, - digits [this->version_.major], - digits [this->version_.minor], - tmp.c_str (), - endp->port () ); + tmp = tmp.substr(0, pos + 1); + tmp[pos] = '\0'; } - else -#endif - ACE_OS::sprintf (buf + ACE_OS::strlen(buf), - "%s:%c.%c@%s:%d", - ::the_prefix, - digits [this->version_.major], - digits [this->version_.minor], - endp->host (), - endp->port () ); - - } - ACE_OS::sprintf (buf + ACE_OS::strlen(buf), - "%c%s", - this->object_key_delimiter_, - key.in ()); + ACE_OS::sprintf (buf, + "corbaloc:%s:%c.%c@[%s]:%d%c%s", + ::prefix_, + digits [this->version_.major], + digits [this->version_.minor], + tmp.c_str (), + this->endpoint_.port (), + this->object_key_delimiter_, + key.in ()); + } + else +#endif /* ACE_HAS_IPV6 */ + ACE_OS::sprintf (buf, + "corbaloc:%s:%c.%c@%s:%d%c%s", + ::prefix_, + digits [this->version_.major], + digits [this->version_.minor], + this->endpoint_.host (), + this->endpoint_.port (), + this->object_key_delimiter_, + key.in ()); return buf; } @@ -458,7 +435,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_IIOP_Profile::prefix (void) { - return ::the_prefix; + return ::prefix_; } void @@ -550,7 +527,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void) else #endif /* ACE_HAS_IPV6 */ if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0) - || (out_cdr << endpoint->host () == 0) + || (out_cdr << endpoint->host () == 0) || (out_cdr << endpoint->port () == 0)) return -1; @@ -564,7 +541,7 @@ TAO_IIOP_Profile::encode_alternate_endpoints (void) tagged_component.component_data.get_buffer (); for (const ACE_Message_Block *iterator = out_cdr.begin (); - iterator != 0; + iterator != 0; iterator = iterator->cont ()) { size_t i_length = iterator->length (); @@ -746,5 +723,3 @@ TAO_IIOP_Profile::decode_endpoints (void) return 0; } //@@ TAO_PROFILE_SPL_COPY_HOOK_END - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index a7d52bbc467..b48f9e96063 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- + //============================================================================= /** @@ -6,7 +7,8 @@ * * $Id$ * - * IIOP profile specific processing. + * IIOP profile specific processing + * * * @author Fred Kuhns <fredk@cs.wustl.edu> */ @@ -26,8 +28,6 @@ #include "tao/IIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO IIOP_Profile concrete Profile definitions /** * @class TAO_IIOP_Profile @@ -169,8 +169,5 @@ protected: //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_IIOP_PROFILE_H */ diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 6719491a92d..7eb3da409a5 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -1,22 +1,20 @@ -#include "tao/IIOP_Transport.h" -#include "tao/IIOP_Acceptor.h" -#include "tao/IIOPC.h" -#include "tao/Acceptor_Registry.h" -#include "tao/operation_details.h" -#include "tao/Wait_Strategy.h" -#include "tao/debug.h" -#include "tao/GIOP_Message_Base.h" -#include "tao/Protocols_Hooks.h" -#include "tao/ORB_Core.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Transport_Mux_Strategy.h" +#include "IIOP_Transport.h" +#include "IIOP_Acceptor.h" +#include "IIOPC.h" +#include "Acceptor_Registry.h" +#include "operation_details.h" +#include "Wait_Strategy.h" +#include "debug.h" +#include "GIOP_Message_Base.h" +#include "Protocols_Hooks.h" +#include "ORB_Core.h" +#include "Thread_Lane_Resources.h" +#include "Transport_Mux_Strategy.h" ACE_RCSID (tao, IIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean ) @@ -103,7 +101,7 @@ TAO_IIOP_Transport::recv (char *buf, { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv, ") + ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv_i, ") ACE_TEXT ("read failure - %m\n"), this->id ())); } @@ -364,8 +362,8 @@ TAO_IIOP_Transport::get_listen_point ( // Get the hostname for the local address if (iiop_acceptor->hostname (this->orb_core_, - local_addr, - local_interface.out ()) == -1) + local_addr, + local_interface.out ()) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - IIOP_Transport::get_listen_point, ") @@ -375,7 +373,7 @@ TAO_IIOP_Transport::get_listen_point ( #if defined (ACE_HAS_IPV6) // If this is an IPv6 decimal linklocal address containing a scopeid than // remove the scopeid from the information being sent. - const char *cp_scope = 0; + const char *cp_scope; if (local_addr.get_type () == PF_INET6 && (cp_scope = ACE_OS::strchr (local_interface.in (), '%')) != 0) { @@ -408,8 +406,7 @@ TAO_IIOP_Transport::get_listen_point ( if (TAO_debug_level >= 5) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) - Listen_Point_List[%d] = <%s:%d>\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P:%t) Listen_Point_List[%d] = <%s:%d>"), len, point.host.in (), point.port)); @@ -424,5 +421,3 @@ TAO_IIOP_Transport::get_listen_point ( /* * End of copy hook. */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 2e094054834..5bbebdd5ae9 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace IIOP { class ListenPointList; @@ -147,8 +145,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IIOP_TRANSPORT_H */ diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl index 90ed9c8b7f4..b91c64d66af 100644 --- a/TAO/tao/IOP.pidl +++ b/TAO/tao/IOP.pidl @@ -28,6 +28,6 @@ #ifndef TAO_IOP_PIDL #define TAO_IOP_PIDL -#include "tao/IOP_IOR.pidl" +#include "IOP_IOR.pidl" #endif /* TAO_IOP_PIDL */ diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 24da4f71609..b5108933284 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -29,18 +29,14 @@ // be\be_codegen.cpp:288 -#include "tao/IOPC.h" +#include "IOPC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index aa18c7b441b..e0bbb0a432a 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -56,8 +56,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 @@ -69,8 +67,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl index ab73e10ff0c..0901cc8e2fe 100644 --- a/TAO/tao/IOP_IOR.pidl +++ b/TAO/tao/IOP_IOR.pidl @@ -26,7 +26,7 @@ #ifndef TAO_IOP_IOR_PIDL #define TAO_IOP_IOR_PIDL -#include "tao/OctetSeq.pidl" +#include <OctetSeq.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 45323b2f40c..0dcb0c1062d 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:288 -#include "tao/IOP_IORC.h" +#include "IOP_IORC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -812,5 +810,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index c0f8910c5e8..4bf5d87e8d1 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -60,8 +60,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -726,8 +724,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp index 8c9f231166f..ca0a10a1038 100644 --- a/TAO/tao/IORInterceptor/IORInfo.cpp +++ b/TAO/tao/IORInterceptor/IORInfo.cpp @@ -1,4 +1,4 @@ -#include "tao/IORInterceptor/IORInfo.h" +#include "IORInfo.h" #include "tao/PortableServer/Root_POA.h" #include "tao/PolicyC.h" @@ -11,14 +11,13 @@ ACE_RCSID (IORInterceptor, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/IORInterceptor/IORInfo.inl" +# include "IORInfo.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa) : poa_ (poa), - components_established_ (false) + components_established_ (0) { } @@ -191,5 +190,3 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) CORBA::COMPLETED_NO)); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index d0314b30f7e..c377ff1c994 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/IORInterceptor/IORInfoC.h" +#include "IORInfoC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,11 +31,10 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_Root_POA; + /** * @class TAO_IORInfo * @@ -113,7 +112,7 @@ public: /// IORInterceptor::components_established() interception point has /// been called. /** - * This method is used to inform the IORInfo object when the + * This method is used so to inform the IORInfo when the * add_ior_component() and add_ior_component_to_profile() methods * are invalid. They are only valid in the * IORInterceptor::establish_components() interception point. @@ -138,13 +137,14 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. - TAO_IORInfo (const TAO_IORInfo &); - void operator= (const TAO_IORInfo &); + ACE_UNIMPLEMENTED_FUNC ( + TAO_IORInfo (const TAO_IORInfo &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_IORInfo &)) private: /// Pointer to POA - TAO_Root_POA * poa_; + TAO_Root_POA *poa_; /// True if the IORInterceptor::components_established() /// interception point was called. False otherwise. @@ -158,10 +158,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/IORInterceptor/IORInfo.inl" +# include "IORInfo.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl index dfb66194baf..3a94b482656 100644 --- a/TAO/tao/IORInterceptor/IORInfo.inl +++ b/TAO/tao/IORInterceptor/IORInfo.inl @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_IORInfo::invalidate (void) { @@ -14,7 +11,5 @@ TAO_IORInfo::invalidate (void) ACE_INLINE void TAO_IORInfo::components_established (void) { - this->components_established_ = true; + this->components_established_ = 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl index 4d192e058a7..33bd2b8f705 100644 --- a/TAO/tao/IORInterceptor/IORInfo.pidl +++ b/TAO/tao/IORInterceptor/IORInfo.pidl @@ -20,7 +20,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -SS -Gd -Ge 1 -Sa -St -Sc -Sci + * -o orig -Gp -Gd -Ge 1 -Sa -St -Sc -Sci * -I$(TAO_ROOT) * -Wb,export_macro=TAO_IORInterceptor_Export * -Wb,export_include="iorinterceptor_export.h" @@ -34,8 +34,6 @@ #define _IORINFO_IDL_ #include "tao/PortableInterceptor.pidl" -#include "tao/Policy_Forward.pidl" -#include "tao/IOP_IOR.pidl" #include "tao/ObjRefTemplate/ObjectReferenceTemplate_include.pidl" module PortableInterceptor diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp index 877d38025ea..e20c34af88b 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.cpp +++ b/TAO/tao/IORInterceptor/IORInfoC.cpp @@ -26,26 +26,28 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/IORInterceptor/IORInfoC.h" +#include "IORInfoC.h" #include "tao/CDR.h" #include "tao/Object_Argument_T.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_ + template<> class Arg_Traits<PortableInterceptor::ObjectReferenceFactory> : public @@ -54,7 +56,7 @@ namespace TAO PortableInterceptor::ObjectReferenceFactory_var, PortableInterceptor::ObjectReferenceFactory_out, TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>, - TAO::Any_Insert_Policy_Noop <PortableInterceptor::ObjectReferenceFactory*> + TAO::Any_Insert_Policy_Stream <PortableInterceptor::ObjectReferenceFactory *> > { }; @@ -90,13 +92,13 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::nil (void) return PortableInterceptor::IORInfo::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::IORInfo>::marshal ( PortableInterceptor::IORInfo_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::IORInfo::IORInfo (void) @@ -107,7 +109,7 @@ PortableInterceptor::IORInfo::~IORInfo (void) PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -118,7 +120,7 @@ PortableInterceptor::IORInfo::_narrow ( PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -134,7 +136,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -144,7 +146,7 @@ PortableInterceptor::IORInfo::_tao_release (IORInfo_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::IORInfo::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -178,10 +180,8 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const return "IDL:omg.org/PortableInterceptor/IORInfo:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h index 80b0ab75f1d..64b2ba035cc 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.h +++ b/TAO/tao/IORInterceptor/IORInfoC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_IORINFOC_H_ -#define _TAO_IDL_IORINFOC_H_ +#ifndef _TAO_IDL_ORIG_IORINFOC_H_ +#define _TAO_IDL_ORIG_IORINFOC_H_ #include /**/ "ace/pre.h" @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IORInterceptor/iorinterceptor_export.h" +#include "iorinterceptor_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -48,8 +48,6 @@ #include "tao/Objref_VarOut_T.h" #include "tao/PortableInterceptorC.h" -#include "tao/Policy_ForwardC.h" -#include "tao/IOP_IORC.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h" #if defined (TAO_EXPORT_MACRO) @@ -57,16 +55,23 @@ #endif #define TAO_EXPORT_MACRO TAO_IORInterceptor_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_ @@ -95,7 +100,7 @@ namespace PortableInterceptor #define _PORTABLEINTERCEPTOR_IORINFO_CH_ class TAO_IORInterceptor_Export IORInfo - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef IORInfo_ptr _ptr_type; @@ -107,12 +112,12 @@ namespace PortableInterceptor static void _tao_release (IORInfo_ptr obj); static IORInfo_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IORInfo_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -131,7 +136,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -142,7 +147,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -154,27 +159,27 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - virtual ::PortableInterceptor::AdapterManagerId manager_id ( + virtual PortableInterceptor::AdapterManagerId manager_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - virtual ::PortableInterceptor::AdapterState state ( + virtual PortableInterceptor::AdapterState state ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -184,7 +189,7 @@ namespace PortableInterceptor ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -194,7 +199,7 @@ namespace PortableInterceptor ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -205,19 +210,19 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. @@ -235,7 +240,7 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -246,8 +251,8 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_ template<> struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo> @@ -259,7 +264,7 @@ namespace TAO ::PortableInterceptor::IORInfo_ptr ); static ::PortableInterceptor::IORInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::IORInfo_ptr p, TAO_OutputCDR & cdr ); @@ -269,9 +274,15 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl index 968fd662506..6247886f787 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.pidl +++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl @@ -20,7 +20,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci -SS + * -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci * -I$(TAO_ROOT) * -Wb,export_macro=TAO_IORInterceptor_Export * -Wb,export_include="iorinterceptor_export.h" @@ -47,10 +47,7 @@ module PortableInterceptor local interface IORInterceptor : Interceptor { void establish_components (in IORInfo info); - }; - local interface IORInterceptor_3_0 : IORInterceptor - { void components_established (in IORInfo info); void adapter_manager_state_changed ( diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index 684f5361ebc..0a657bf65a8 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -26,18 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/IORInterceptor/IORInterceptor.h" +#include "IORInterceptor.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void) return PortableInterceptor::IORInterceptor::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal ( PortableInterceptor::IORInterceptor_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::IORInterceptor::IORInterceptor (void) @@ -88,7 +90,7 @@ PortableInterceptor::IORInterceptor::~IORInterceptor (void) PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -99,7 +101,7 @@ PortableInterceptor::IORInterceptor::_narrow ( PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -125,7 +127,7 @@ PortableInterceptor::IORInterceptor::_tao_release (IORInterceptor_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::IORInterceptor::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -163,139 +165,8 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) { return false; } - -// TAO_IDL - Generated from -// be\be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for PortableInterceptor::IORInterceptor_3_0. - -PortableInterceptor::IORInterceptor_3_0_ptr -TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::duplicate ( - PortableInterceptor::IORInterceptor_3_0_ptr p - ) -{ - return PortableInterceptor::IORInterceptor_3_0::_duplicate (p); -} - -void -TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::release ( - PortableInterceptor::IORInterceptor_3_0_ptr p - ) -{ - CORBA::release (p); -} - -PortableInterceptor::IORInterceptor_3_0_ptr -TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::nil (void) -{ - return PortableInterceptor::IORInterceptor_3_0::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::IORInterceptor_3_0>::marshal ( - PortableInterceptor::IORInterceptor_3_0_ptr p, - TAO_OutputCDR & cdr - ) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -PortableInterceptor::IORInterceptor_3_0::IORInterceptor_3_0 (void) -{} - -PortableInterceptor::IORInterceptor_3_0::~IORInterceptor_3_0 (void) -{} - -PortableInterceptor::IORInterceptor_3_0_ptr -PortableInterceptor::IORInterceptor_3_0::_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return IORInterceptor_3_0::_duplicate ( - dynamic_cast<IORInterceptor_3_0_ptr> (_tao_objref) - ); -} - -PortableInterceptor::IORInterceptor_3_0_ptr -PortableInterceptor::IORInterceptor_3_0::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return IORInterceptor_3_0::_duplicate ( - dynamic_cast<IORInterceptor_3_0_ptr> (_tao_objref) - ); -} - -PortableInterceptor::IORInterceptor_3_0_ptr -PortableInterceptor::IORInterceptor_3_0::_duplicate (IORInterceptor_3_0_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -PortableInterceptor::IORInterceptor_3_0::_tao_release (IORInterceptor_3_0_ptr obj) -{ - CORBA::release (obj); -} - -::CORBA::Boolean -PortableInterceptor::IORInterceptor_3_0::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableInterceptor/Interceptor:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableInterceptor/IORInterceptor_3_0:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return false; - } -} - -const char* PortableInterceptor::IORInterceptor_3_0::_interface_repository_id (void) const -{ - return "IDL:omg.org/PortableInterceptor/IORInterceptor_3_0:1.0"; -} - -::CORBA::Boolean -PortableInterceptor::IORInterceptor_3_0::marshal (TAO_OutputCDR &) -{ - return false; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index 7f78cfe946f..62091a216d1 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_IORINTERCEPTORC_H_ -#define _TAO_IDL_IORINTERCEPTORC_H_ +#ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_ +#define _TAO_IDL_ORIG_IORINTERCEPTORC_H_ #include /**/ "ace/pre.h" @@ -43,7 +43,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IORInterceptor/iorinterceptor_export.h" +#include "iorinterceptor_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -59,16 +59,23 @@ #endif #define TAO_EXPORT_MACRO TAO_IORInterceptor_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_ @@ -109,12 +116,12 @@ namespace PortableInterceptor static void _tao_release (IORInterceptor_ptr obj); static IORInterceptor_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static IORInterceptor_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -133,94 +140,10 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:210 - - 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. - IORInterceptor (void); - - virtual ~IORInterceptor (void); - - private: - // Private and unimplemented for concrete interfaces. - IORInterceptor (const IORInterceptor &); - - void operator= (const IORInterceptor &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_interface.cpp:646 - -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__VAR_OUT_CH_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__VAR_OUT_CH_ - - class IORInterceptor_3_0; - typedef IORInterceptor_3_0 *IORInterceptor_3_0_ptr; - - typedef - TAO_Objref_Var_T< - IORInterceptor_3_0 - > - IORInterceptor_3_0_var; - - typedef - TAO_Objref_Out_T< - IORInterceptor_3_0 - > - IORInterceptor_3_0_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0_CH_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0_CH_ - - class TAO_IORInterceptor_Export IORInterceptor_3_0 - : public virtual ::PortableInterceptor::IORInterceptor - { - public: - typedef IORInterceptor_3_0_ptr _ptr_type; - typedef IORInterceptor_3_0_var _var_type; - - // The static operations. - static IORInterceptor_3_0_ptr _duplicate (IORInterceptor_3_0_ptr obj); - - static void _tao_release (IORInterceptor_3_0_ptr obj); - - static IORInterceptor_3_0_ptr _narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static IORInterceptor_3_0_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static IORInterceptor_3_0_ptr _nil (void) - { - return static_cast<IORInterceptor_3_0_ptr> (0); - } - - - - // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 virtual void components_established ( @@ -228,7 +151,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -240,7 +163,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -252,37 +175,37 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - IORInterceptor_3_0 (void); + IORInterceptor (void); - virtual ~IORInterceptor_3_0 (void); + virtual ~IORInterceptor (void); private: // Private and unimplemented for concrete interfaces. - IORInterceptor_3_0 (const IORInterceptor_3_0 &); + IORInterceptor (const IORInterceptor &); - void operator= (const IORInterceptor_3_0 &); + void operator= (const IORInterceptor &); }; #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -293,8 +216,8 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ template<> struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor> @@ -306,40 +229,25 @@ namespace TAO ::PortableInterceptor::IORInterceptor_ptr ); static ::PortableInterceptor::IORInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::IORInterceptor_ptr p, TAO_OutputCDR & cdr ); }; #endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__TRAITS_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_3_0__TRAITS_ - - template<> - struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor_3_0> - { - static ::PortableInterceptor::IORInterceptor_3_0_ptr duplicate ( - ::PortableInterceptor::IORInterceptor_3_0_ptr - ); - static void release ( - ::PortableInterceptor::IORInterceptor_3_0_ptr - ); - static ::PortableInterceptor::IORInterceptor_3_0_ptr nil (void); - static ::CORBA::Boolean marshal ( - ::PortableInterceptor::IORInterceptor_3_0_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp index a917dc798d4..8dfe90401cf 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h" -#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h" +#include "IORInterceptor_Adapter_Impl.h" +#include "IORInterceptor_Adapter_Factory_Impl.h" #include "tao/ORB_Core.h" @@ -9,8 +9,6 @@ ACE_RCSID (IORInterceptor, IORInterceptor_Adapter_Factory_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void) { } @@ -23,7 +21,6 @@ TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (nia, TAO_IORInterceptor_Adapter_Impl (), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (nia); return nia; } @@ -46,8 +43,6 @@ TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( TAO_IORInterceptor_Adapter_Factory_Impl, ACE_TEXT ("Concrete_IORInterceptor_Adapter_Factory"), diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h index a08507cd6a6..f41d267a92f 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/IORInterceptor/iorinterceptor_export.h" +#include "iorinterceptor_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,6 @@ #include "tao/IORInterceptor_Adapter_Factory.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IORInterceptor_Adapter; @@ -52,15 +51,13 @@ public: static int Initializer (void); }; +ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl) +ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl) + static int TAO_Requires_IORInterceptor_Initializer = TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl) -ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl) - #define TAO_IORINTERCEPTOR_SAFE_INCLUDE #include "tao/IORInterceptor/IORInterceptorC.h" #undef TAO_IORINTERCEPTOR_SAFE_INCLUDE diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index b3f22718550..878419b151a 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h" -#include "tao/IORInterceptor/IORInfo.h" +#include "IORInterceptor_Adapter_Impl.h" +#include "IORInfo.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PI/PI.h" @@ -13,8 +13,6 @@ ACE_RCSID (IORInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void) { } @@ -31,19 +29,6 @@ TAO_IORInterceptor_Adapter_Impl::add_interceptor ( } void -TAO_IORInterceptor_Adapter_Impl::add_interceptor ( - PortableInterceptor::IORInterceptor_ptr i, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL - ) -{ - this->ior_interceptor_list_.add_interceptor (i, - policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) { this->ior_interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -109,7 +94,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components ( ACE_DEBUG ((LM_WARNING, "(%P|%t) Exception thrown while processing " "IORInterceptor \"%s\">\n", - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + ACE_TEXT_TO_TCHAR_IN (name.in ()))); } ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION, @@ -150,18 +135,10 @@ TAO_IORInterceptor_Adapter_Impl::components_established ( { ACE_TRY { - PortableInterceptor::IORInterceptor_ptr ior_interceptor = - this->ior_interceptor_list_.interceptor (j); - - PortableInterceptor::IORInterceptor_3_0_var ior_3_interceptor = - PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor); - if (!CORBA::is_nil (ior_3_interceptor.in ())) - { - ior_3_interceptor->components_established ( - info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->ior_interceptor_list_.interceptor (j)->components_established ( + info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -202,19 +179,11 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed ( for (size_t i = 0; i < interceptor_count; ++i) { - PortableInterceptor::IORInterceptor_ptr ior_interceptor = - this->ior_interceptor_list_.interceptor (i); - - PortableInterceptor::IORInterceptor_3_0_var ior_3_interceptor = - PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor); - if (!CORBA::is_nil (ior_3_interceptor.in ())) - { - ior_3_interceptor->adapter_state_changed ( - seq_obj_ref_template, - state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + this->ior_interceptor_list_.interceptor (i)->adapter_state_changed ( + seq_obj_ref_template, + state + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } } @@ -235,20 +204,10 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed ( for (size_t i = 0; i < interceptor_count; ++i) { - PortableInterceptor::IORInterceptor_ptr ior_interceptor = - this->ior_interceptor_list_.interceptor (i); - - PortableInterceptor::IORInterceptor_3_0_var ior_3_interceptor = - PortableInterceptor::IORInterceptor_3_0::_narrow (ior_interceptor); - if (!CORBA::is_nil (ior_3_interceptor.in ())) - { - ior_3_interceptor->adapter_manager_state_changed ( - id, - state - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + this->ior_interceptor_list_.interceptor(i)->adapter_manager_state_changed ( + id, + state + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h index 6257c699b9a..50d4a0eaa11 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/IORInterceptor/iorinterceptor_export.h" +#include "iorinterceptor_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,14 +25,10 @@ #include "tao/IORInterceptor/IORInterceptor.h" #include "tao/IORInterceptor_Adapter.h" #include "tao/PI/Interceptor_List_T.h" -#include "tao/IORInterceptor/IORInterceptor_Details.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - typedef Interceptor_List< ::PortableInterceptor::IORInterceptor, - IORInterceptor_Details> + typedef Interceptor_List< ::PortableInterceptor::IORInterceptor> IORInterceptor_List; } @@ -47,7 +43,7 @@ class TAO_Root_POA; * interfaces IORInfo and IORInterceptor. This is the derived class * that contains the actual implementations. */ -class TAO_IORInterceptor_Adapter_Impl +class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl : public TAO_IORInterceptor_Adapter { public: @@ -57,11 +53,6 @@ public: PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL); - virtual void add_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL) @@ -90,8 +81,6 @@ private: TAO::IORInterceptor_List ior_interceptor_list_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IORINTERCEPTOR_ADAPTER_IMPL_H */ diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp deleted file mode 100644 index 77835d4cfd0..00000000000 --- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "tao/IORInterceptor/IORInterceptor_Details.h" - -ACE_RCSID (IORInterceptor, - IORInterceptor_Details, - "$Id$") - -#include "tao/SystemException.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - void - IORInterceptor_Details::apply_policies ( - const CORBA::PolicyList &/*policies*/ - ACE_ENV_ARG_DECL) - { - // There are currently no policies that apply to IOR Interceptors. - ACE_THROW (CORBA::INV_POLICY ()); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.h b/TAO/tao/IORInterceptor/IORInterceptor_Details.h deleted file mode 100644 index bb2ce8b0fa8..00000000000 --- a/TAO/tao/IORInterceptor/IORInterceptor_Details.h +++ /dev/null @@ -1,63 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IORInterceptor_Details.h - * - * $Id$ - * - * This file declares a class that manages the details - * about a registered client request interceptor. Policies can be - * used when interceptors are registered, and the policy values - * will be processed and used to modify the values of the - * IORInterceptor_Details object associated with the registered - * client request interceptor. - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_IOR_INTERCEPTOR_DETAILS_H -#define TAO_IOR_INTERCEPTOR_DETAILS_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Policy_ForwardC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - /** - * @class IORInterceptor_Details - * - * @brief The policy-driven details for a registered IOR interceptor - * - * Each time an IOR interceptor is registered with an ORB, an - * IORInterceptor_Details object will be created and associated with - * the registered IOR interceptor. If the interceptor is - * registered with policies, the policies will be used to adjust the - * values in the IORInterceptor_Details appropriately. - * - * Currently, there are no policies that are applicable to - * IOR Interceptors. - */ - class IORInterceptor_Details - { - public: - void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - }; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* TAO_IOR_INTERCEPTOR_DETAILS_H */ diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp index 7759e6793f3..87e2ca2971c 100644 --- a/TAO/tao/IORInterceptor_Adapter.cpp +++ b/TAO/tao/IORInterceptor_Adapter.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/IORInterceptor_Adapter.h" @@ -6,10 +6,7 @@ ACE_RCSID (tao, IORInterceptor_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index ea337f5c9f3..c37d8a3a940 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "ace/Array_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,12 +25,6 @@ #include "tao/SystemException.h" #include "tao/PI_ForwardC.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <class T> class ACE_Array_Base; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { class IORInterceptor; @@ -67,12 +61,6 @@ public: ACE_ENV_ARG_DECL ) = 0; - virtual void add_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL - ) = 0; - virtual void destroy_interceptors ( ACE_ENV_SINGLE_ARG_DECL ) = 0; @@ -107,7 +95,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IORINTERCEPTOR_ADAPTER_H */ diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.cpp b/TAO/tao/IORInterceptor_Adapter_Factory.cpp index 083299eeb96..4bf66592ee5 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp @@ -5,10 +5,6 @@ ACE_RCSID (tao, IORInterceptor_Adapter_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IORInterceptor_Adapter_Factory::~TAO_IORInterceptor_Adapter_Factory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index ebb5561ee76..e56e7994296 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -23,8 +23,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IORInterceptor_Adapter; /** @@ -48,8 +46,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IORINTERCEPTOR_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp index 4f66fb1a1c5..8f9b028afe9 100644 --- a/TAO/tao/IORManipulation/IORA.cpp +++ b/TAO/tao/IORManipulation/IORA.cpp @@ -32,14 +32,12 @@ #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/IORManipulation/IORManip_Loader.h" +#include "IORManip_Loader.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be/be_visitor_typecode/struct_typecode.cpp:74 @@ -902,5 +900,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index b30c619e153..80b5d8c433b 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/IORManipulation/IORManip_Loader.h" +#include "IORManip_Loader.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -1007,5 +1005,3 @@ CORBA::Boolean operator>> ( { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index 2c6bb305c61..3c3fb06fc6c 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -44,7 +44,7 @@ #error "You should not include IORC.h directly, use IORManip_Loader.h" #endif /* !TAO_IORMANIP_SAFE_INCLUDE */ -#include "tao/IORManipulation/ior_manip_export.h" +#include "ior_manip_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -71,8 +71,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_IOP { @@ -909,8 +907,6 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index eceb6b0b06b..5d06739f52c 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -1,5 +1,5 @@ -#include "tao/IORManipulation/IORManip_Loader.h" -#include "tao/IORManipulation/IORManipulation.h" +#include "IORManip_Loader.h" +#include "IORManipulation.h" #include "ace/Log_Msg.h" @@ -9,8 +9,6 @@ ACE_RCSID (IORManipulation, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IORManip_Loader::TAO_IORManip_Loader (void) { } @@ -35,8 +33,6 @@ TAO_IORManip_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_IORManip_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_IORManip_Loader, ACE_TEXT ("IORManip_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index fc45a394fae..f01484f7690 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // $Id$ @@ -19,7 +19,7 @@ #define TAO_IORMANIP_LOADER_H #include /**/ "ace/pre.h" -#include "tao/IORManipulation/ior_manip_export.h" +#include "ior_manip_export.h" #include "tao/Object_Loader.h" #include "ace/Service_Config.h" @@ -27,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader { public: @@ -46,16 +44,14 @@ public: static int Initializer (void); }; -static int -TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader) ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader) +static int +TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer (); + #define TAO_IORMANIP_SAFE_INCLUDE -#include "tao/IORManipulation/IORC.h" +#include "IORC.h" #undef TAO_IORMANIP_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 079f942eee2..3bba59dba08 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -1,4 +1,4 @@ -#include "tao/IORManipulation/IORManipulation.h" +#include "IORManipulation.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -13,7 +13,6 @@ ACE_RCSID (IORManipulation, IORManipulation, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void) { @@ -184,15 +183,17 @@ TAO_IOR_Manipulation_impl::remove_profiles ( ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (), CORBA::Object::_nil ()); - // We are done with add_profiles. - // At this point, we don't do remove_profiles() - // immediately like before, - // because it could result in an - // Object Reference with 0 profile. And it would not pass - // the CORBA::is_nil() evaluation. - // Instead, we create the Object Reference right here, which is - // earlier than before.(Actually, I just moved some code - // from below up to here). + ACE_AUTO_PTR_RESET (tmp_pfiles, + ior2->_stubobj ()->make_profiles (), + TAO_MProfile); + + if (Diff_Profiles.remove_profiles (tmp_pfiles.get ()) < 0) + ACE_THROW_RETURN (TAO_IOP::NotFound (), + CORBA::Object::_nil ()); + + // MS C++ knows nothing about reset! + // tmp_pfiles.reset (0); // get rid of last MProfile + TAO_ORB_Core *orb_core = TAO_ORB_Core_instance (); TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string @@ -223,20 +224,6 @@ TAO_IOR_Manipulation_impl::remove_profiles ( CORBA::Object::_nil ()); } - // Now we can remove the profiles which we want to elimitate from - // the Object. - ACE_AUTO_PTR_RESET (tmp_pfiles, - ior2->_stubobj ()->make_profiles (), - TAO_MProfile); - - TAO_MProfile& mp = stub -> base_profiles(); - if (mp.remove_profiles (tmp_pfiles.get ()) < 0) - ACE_THROW_RETURN (TAO_IOP::NotFound (), - CORBA::Object::_nil ()); - - // MS C++ knows nothing about reset! - // tmp_pfiles.reset (0); // get rid of last MProfile - return new_obj._retn (); } @@ -379,4 +366,3 @@ TAO_IOR_Manipulation_impl::get_profile_count ( return count; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index 9ad320bc8d0..0666e0ef6b7 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -19,26 +19,23 @@ #ifndef TAO_IOR_MANIPULATION_H #define TAO_IOR_MANIPULATION_H - #include /**/ "ace/pre.h" #include "tao/LocalObject.h" -#include "tao/IORManipulation/IORManip_Loader.h" +#include "IORManip_Loader.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IORManipulation/IORC.h" +#include "IORC.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_IOR_Manipulation_impl +class TAO_IORManip_Export TAO_IOR_Manipulation_impl : public TAO_IOP::TAO_IOR_Manipulation, public TAO_Local_RefCounted_Object { @@ -53,6 +50,9 @@ public: TAO_IOR_Manipulation_impl (void); // constructor + ~TAO_IOR_Manipulation_impl (void); + // destructor + virtual CORBA::Object_ptr merge_iors ( const TAO_IOP::TAO_IOR_Manipulation::IORList & iors ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -153,20 +153,13 @@ public: CORBA::SystemException, TAO_IOP::EmptyProfileList )); - -protected: - - ~TAO_IOR_Manipulation_impl (void); - // destructor +private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" - #endif /* TAO_IOR_MANIPULATION_H */ diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp index e43ccf18b34..6b5d631f90f 100644 --- a/TAO/tao/IORTable/IORTable.cpp +++ b/TAO/tao/IORTable/IORTable.cpp @@ -11,18 +11,13 @@ */ // ================================================================= -#include "tao/IORTable/IORTable.h" -#include "tao/IORTable/Table_Adapter.h" +#include "IORTable.h" +#include "Table_Adapter.h" ACE_RCSID (IORTable, IORTable, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_IORTable_Initializer::init (void) { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h index 7bae99afdb1..4044e6de93c 100644 --- a/TAO/tao/IORTable/IORTable.h +++ b/TAO/tao/IORTable/IORTable.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= @@ -17,16 +17,12 @@ #include /**/ "ace/pre.h" -#include "tao/IORTable/iortable_export.h" +#include "iortable_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IORTable_Export TAO_IORTable_Initializer { public: @@ -37,10 +33,8 @@ public: static int TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init (); -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_IORTABLE_SAFE_INCLUDE -#include "tao/IORTable/IORTableC.h" +#include "IORTableC.h" #undef TAO_IORTABLE_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index ce5ed991f03..afbeabe311b 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/IORTable/IORTable.h" +#include "IORTable.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -541,5 +539,3 @@ CORBA::Boolean operator>> ( { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index fcd0a17bdfc..4f2d10cf9f0 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/IORTable/iortable_export.h" +#include "iortable_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -68,8 +68,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace IORTable { @@ -453,8 +451,6 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index bb3b678e397..7b0d6bb538a 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -7,7 +7,7 @@ * */ -#include "tao/IORTable/IOR_Table_Impl.h" +#include "IOR_Table_Impl.h" #include "ace/Guard_T.h" ACE_RCSID (IORTable, @@ -15,8 +15,6 @@ ACE_RCSID (IORTable, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void) { } @@ -104,5 +102,3 @@ TAO_IOR_Table_Impl::set_locator ( ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->locator_ = IORTable::Locator::_duplicate (locator); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index 15ca6d6cc3f..acdcebdfa11 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/IORTable/IORTable.h" +#include "IORTable.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,9 +32,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_IOR_Table_Impl +class TAO_IORTable_Export TAO_IOR_Table_Impl : public virtual IORTable::Table, public virtual TAO_Local_RefCounted_Object { @@ -108,8 +106,6 @@ private: TAO_SYNCH_MUTEX lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index dbfbc20990a..4fedc0b3f29 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -7,20 +7,16 @@ * */ -#include "tao/IORTable/Table_Adapter.h" -#include "tao/IORTable/IOR_Table_Impl.h" +#include "Table_Adapter.h" +#include "IOR_Table_Impl.h" #include "tao/ORB_Core.h" #include "tao/Object.h" -#include "tao/Stub.h" #include "tao/ORB.h" -#include "tao/Profile.h" ACE_RCSID (IORTable, Table_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) , root_ (0) @@ -66,8 +62,26 @@ TAO_Table_Adapter::dispatch (TAO::ObjectKey &key, ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->find_object (key, forward_to) ? TAO_Adapter::DS_FORWARD - : TAO_Adapter::DS_MISMATCHED_KEY; + CORBA::String_var object_key; + TAO::ObjectKey::encode_sequence_to_string (object_key.out (), + key); + ACE_TRY + { + CORBA::String_var ior = + this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + forward_to = + this->orb_core_->orb ()->string_to_object (ior.in () + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCH (IORTable::NotFound, nf_ex) + { + return TAO_Adapter::DS_MISMATCHED_KEY; + } + ACE_ENDTRY; + return TAO_Adapter::DS_FORWARD; } const char * @@ -86,88 +100,15 @@ CORBA::Object_ptr TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub, const TAO_MProfile &) { - CORBA::Object_ptr result = CORBA::Object::_nil (); - - if (! this->initialize_collocated_object (stub)) // 0 == success - { - // A reference was found in the table. The stub has been forwarded - // to this. The collocation indicators are now correct on the stub - // (although they may well now indicate that the stub is not in fact - // collocated at all). - ACE_NEW_RETURN (result, - CORBA::Object (stub, - stub->is_collocated (), - stub->collocated_servant ()), - CORBA::Object::_nil ()); - - } - - return result; + return new CORBA::Object (stub); } CORBA::Long -TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub) +TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *, + CORBA::Object_ptr ) { - // Get the effective profile set. - const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ()) - : stub->base_profiles (); - TAO_PHandle j = 0; - // We only look at the key from the 0th profile but we only really care about - // corbaloc's here where all profiles share a single object key - TAO::ObjectKey_var key = mp.get_profile (j)->_key (); - - CORBA::Object_var forward_to = CORBA::Object::_nil (); - CORBA::Boolean found = false; - - ACE_TRY_NEW_ENV - { - found = this->find_object (key, forward_to.out ()); - } - ACE_CATCHANY - { - } - ACE_ENDTRY; - - if (found) - { - // This call will set the appropriate collocation values - // to correspond to the reference we found in the table. - stub->add_forward_profiles (forward_to->_stubobj ()->base_profiles ()); - stub->next_profile (); - } - - // 0 for success - return ! found; -} - -CORBA::Long -TAO_Table_Adapter::find_object (TAO::ObjectKey &key, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - CORBA::String_var object_key; - TAO::ObjectKey::encode_sequence_to_string (object_key.out (), - key); - ACE_TRY - { - CORBA::String_var ior = - this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - forward_to = - this->orb_core_->orb ()->string_to_object (ior.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCH (IORTable::NotFound, nf_ex) - { - return 0; - } - ACE_ENDTRY; - return 1; + return 0; } - // **************************************************************** TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void) @@ -180,8 +121,6 @@ TAO_Table_Adapter_Factory::create (TAO_ORB_Core *oc) return new TAO_Table_Adapter (oc); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_IORTable, TAO_Table_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Table_Adapter_Factory, ACE_TEXT ("TAO_IORTable"), diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index f01ebe13e64..3e1a8b2fcd8 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,7 +15,7 @@ #define TAO_TABLE_ADAPTER_H #include /**/ "ace/pre.h" -#include "tao/IORTable/iortable_export.h" +#include "iortable_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "tao/Adapter_Factory.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_IOR_Table_Impl; class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter @@ -56,15 +54,9 @@ public: virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); - virtual CORBA::Long initialize_collocated_object (TAO_Stub *); + virtual CORBA::Long initialize_collocated_object (TAO_Stub *, + CORBA::Object_ptr); private: - /// Helper method to find an object bound in the table. - /// @return 1 if found, 0 otherwise. - CORBA::Long find_object (TAO::ObjectKey &key, - CORBA::Object_out forward_to - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - /// The ORB Core we belong to TAO_ORB_Core *orb_core_; @@ -85,8 +77,6 @@ public: virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Table_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_IORTable, TAO_Table_Adapter_Factory) diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp index abc812d7f58..8852c907d52 100644 --- a/TAO/tao/IOR_Parser.cpp +++ b/TAO/tao/IOR_Parser.cpp @@ -4,11 +4,7 @@ ACE_RCSID(tao, IOR_Parser, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IOR_Parser::~TAO_IOR_Parser (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index 0058a743a0e..dc82f1c9cca 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -23,8 +22,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; @@ -65,7 +62,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IOR_PARSER_H */ diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 47fc9c960fe..e3112d44cf8 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/ImR_Client/ImR_Client.h" +#include "ImR_Client.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -15,8 +15,6 @@ ACE_RCSID (ImR_Client, ImR_Client, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace ImR_Client @@ -124,7 +122,7 @@ namespace TAO if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Informing IMR that we are running at: %s\n", - ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str()))); + ACE_TEXT_TO_TCHAR_IN (partial_ior.c_str()))); ACE_TRY { @@ -249,20 +247,16 @@ namespace TAO return ACE_Service_Config::process_directive (ace_svc_desc_ImR_Client_Adapter_Impl); } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ImR_Client_Adapter_Impl, + ACE_TEXT ("Concrete_ImR_Client_Adapter"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ImR_Client_Adapter_Impl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - ImR_Client_Adapter_Impl, - ACE_TEXT ("Concrete_ImR_Client_Adapter"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImR_Client_Adapter_Impl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - TAO_IMR_Client, - ImR_Client_Adapter_Impl, - TAO::ImR_Client::ImR_Client_Adapter_Impl) + ACE_FACTORY_DEFINE (TAO_IMR_Client, ImR_Client_Adapter_Impl) + } +} diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h index cf1e19b7f92..7df7a8296c9 100644 --- a/TAO/tao/ImR_Client/ImR_Client.h +++ b/TAO/tao/ImR_Client/ImR_Client.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/ImR_Client/imr_client_export.h" +#include "imr_client_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class ServerObject_i; namespace TAO @@ -64,17 +62,15 @@ namespace TAO ServerObject_i *server_object_; }; + ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl) + ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl) + static int TAO_Requires_ImR_Client_Initializer = TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer (); } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl) -ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl) - #include /**/ "ace/post.h" #endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */ diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp index d18206701dc..6643a51b990 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.cpp +++ b/TAO/tao/ImR_Client/ImplRepoC.cpp @@ -38,7 +38,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/ImR_Client/ImplRepoC.h" +#include "ImplRepoC.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -55,14 +55,12 @@ #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "tao/ImR_Client/ImplRepoC.inl" +#include "ImplRepoC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -3091,5 +3089,3 @@ operator>>= ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h index b683f485825..137f4f1e20e 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.h +++ b/TAO/tao/ImR_Client/ImplRepoC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ImR_Client/imr_client_export.h" +#include "imr_client_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -60,8 +60,6 @@ #endif #define TAO_EXPORT_MACRO TAO_IMR_Client_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -1092,10 +1090,8 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/ImR_Client/ImplRepoC.inl" +#include "ImplRepoC.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl index ca194cdf453..3ed7c4ecff0 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.inl +++ b/TAO/tao/ImR_Client/ImplRepoC.inl @@ -26,8 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -99,5 +97,3 @@ ImplementationRepository::Administration::Administration ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp index effee70d815..7f2910a0dbf 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.cpp +++ b/TAO/tao/ImR_Client/ImplRepoS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IMPLREPOS_CPP_ -#include "tao/ImR_Client/ImplRepoS.h" +#include "ImplRepoS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -70,8 +70,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -3106,7 +3104,5 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h index 6978c642426..826a4ce7455 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.h +++ b/TAO/tao/ImR_Client/ImplRepoS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/ImR_Client/ImplRepoC.h" +#include "ImplRepoC.h" #include "tao/ImR_Client/ServerObjectS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -47,8 +47,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_ImplementationRepository { @@ -720,7 +718,7 @@ namespace POA_ImplementationRepository // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp index 1d4d4afce68..8aa0505c7e2 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.cpp +++ b/TAO/tao/ImR_Client/ServerObjectC.cpp @@ -33,7 +33,7 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/ImR_Client/ServerObjectC.h" +#include "ServerObjectC.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -44,14 +44,12 @@ #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "tao/ImR_Client/ServerObjectC.inl" +#include "ServerObjectC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -459,5 +457,3 @@ operator>>= ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h index 5458d8ed88c..7cdd3ddebc6 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.h +++ b/TAO/tao/ImR_Client/ServerObjectC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ImR_Client/imr_client_export.h" +#include "imr_client_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -53,8 +53,6 @@ #endif #define TAO_EXPORT_MACRO TAO_IMR_Client_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -276,10 +274,8 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/ImR_Client/ServerObjectC.inl" +#include "ServerObjectC.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ImR_Client/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl index 5582a055944..8cc38b5b2e0 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.inl +++ b/TAO/tao/ImR_Client/ServerObjectC.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -62,5 +61,3 @@ ImplementationRepository::ServerObject::ServerObject ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp index e8e9f8bc894..e85dff9426d 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.cpp +++ b/TAO/tao/ImR_Client/ServerObjectS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_SERVEROBJECTS_CPP_ -#include "tao/ImR_Client/ServerObjectS.h" +#include "ServerObjectS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -65,8 +65,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -998,7 +996,5 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h index 06fabb5401b..f9f7c790be4 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.h +++ b/TAO/tao/ImR_Client/ServerObjectS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/ImR_Client/ServerObjectC.h" +#include "ServerObjectC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_ImplementationRepository { @@ -265,7 +263,7 @@ namespace POA_ImplementationRepository // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp index 8e777df8a31..1899c8afe02 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.cpp +++ b/TAO/tao/ImR_Client/ServerObject_i.cpp @@ -1,10 +1,9 @@ // $Id$ -#include "tao/ImR_Client/ServerObject_i.h" -#include "tao/PortableServer/Root_POA.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/ImR_Client/ServerObject_i.h" +#include "tao/PortableServer/Root_POA.h" ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) @@ -37,5 +36,3 @@ ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return PortableServer::POA::_duplicate (this->poa_.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h index a397952aab6..9ec22271d12 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.h +++ b/TAO/tao/ImR_Client/ServerObject_i.h @@ -1,18 +1,15 @@ -// -*- C++ -*- - //============================================================================= /** * @file ServerObject_i.h * * $Id$ * - * @author Darrell Brunsch - * @author Irfan Pyarali + * @author Darrell Brunsch and Irfan Pyarali */ // =================================================================== -#ifndef TAO_SERVEROBJECT_I_H -#define TAO_SERVEROBJECT_I_H +#ifndef TAO_IMPLREPO_I_H +#define TAO_IMPLREPO_I_H #include /**/ "ace/pre.h" @@ -25,8 +22,6 @@ #include "tao/ImR_Client/ServerObjectS.h" #include "tao/ImR_Client/imr_client_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class ServerObject_i * @@ -64,8 +59,6 @@ protected: PortableServer::POA_var poa_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" -#endif /* TAO_SERVEROBJECT_I_H */ +#endif /* TAO_IMPLREPO_I_H */ diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 654a385d469..61999fb1a11 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -1,12 +1,12 @@ -#include "tao/Incoming_Message_Queue.h" -#include "tao/debug.h" +#include "Incoming_Message_Queue.h" +#include "debug.h" #include "ace/Log_Msg.h" #include "ace/Malloc_Base.h" #if !defined (__ACE_INLINE__) -# include "tao/Incoming_Message_Queue.inl" +# include "Incoming_Message_Queue.inl" #endif /* __ACE_INLINE__ */ @@ -14,8 +14,6 @@ ACE_RCSID (tao, Incoming_Message_Queue, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core) : last_added_ (0), size_ (0), @@ -25,10 +23,10 @@ TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core) TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void) { - const CORBA::ULong sz = this->size_; + const int sz = this->size_; // Delete all the nodes left behind - for (CORBA::ULong i = 0; + for (int i = 0; i < sz; ++i) { @@ -37,6 +35,35 @@ TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void) } } +size_t +TAO_Incoming_Message_Queue::copy_tail (ACE_Message_Block &block) +{ + // The size of message that is copied + size_t n = 0; + + if (this->size_ > 0) + { + // Check to see if the length of the incoming block is less than + // that of the <missing_data_> of the tail. + if ((CORBA::Long)block.length () < this->last_added_->missing_data_) + { + n = block.length (); + } + else + { + n = this->last_added_->missing_data_; + } + + // Do the copy + this->last_added_->msg_block_->copy (block.rd_ptr (), + n); + + // Decerement the missing data + this->last_added_->missing_data_ -= n; + } + + return n; +} TAO_Queued_Data * TAO_Incoming_Message_Queue::dequeue_head (void) @@ -106,26 +133,73 @@ TAO_Incoming_Message_Queue::enqueue_tail (TAO_Queued_Data *nd) return 0; } +TAO_Queued_Data * +TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::Octet major, + CORBA::Octet minor) const +{ + TAO_Queued_Data *found = 0; + if (this->last_added_ != 0) + { + TAO_Queued_Data *qd = this->last_added_->next_; + + do { + if (qd->more_fragments_ && + qd->major_version_ == major && qd->minor_version_ == minor) + { + found = qd; + } + else + { + qd = qd->next_; + } + } while (found == 0 && qd != this->last_added_->next_); + } + + return found; +} + +TAO_Queued_Data * +TAO_Incoming_Message_Queue::find_fragment_chain (CORBA::ULong request_id) const +{ + TAO_Queued_Data *found = 0; + if (this->last_added_ != 0) + { + TAO_Queued_Data *qd = this->last_added_->next_; + + do { + if (qd->more_fragments_ && qd->request_id_ == request_id) + { + found = qd; + } + else + { + qd = qd->next_; + } + } while (found == 0 && qd != this->last_added_->next_); + } + + return found; +} + /************************************************************************/ // Methods for TAO_Queued_Data /************************************************************************/ /*! - * @brief Allocate and return a new empty message block of size \a span_size - * mimicking parameters of \a mb. - * - * This function allocates a new aligned message block using the same - * allocators and flags as found in \a mb. The size of the new message - * block is at least \a span_size; the size may be adjusted up in order - * to accomodate alignment requirements and still fit \a span_size bytes - * into the aligned buffer. - * - * @param mb message block whose parameters should be mimicked - * @param span_size size of the new message block (will be adjusted for proper - * alignment) - * @return an aligned message block with rd_ptr sitting at correct - * alignment spot, 0 on failure + \brief Allocate and return a new empty message block of size \a new_size mimicking parameters of \a mb. + + This function allocates a new aligned message block using the same + allocators and flags as found in \a mb. The size of the new message + block is at least \a new_size; the size may be adjusted up in order + to accomodate alignment requirements and still fit \a new_size bytes + into the aligned buffer. + + \param mb message block whose parameters should be mimicked + \param new_size size of the new message block (will be adjusted for proper alignment) + \return an aligned message block with rd_ptr sitting at correct alignment spot, 0 on failure + + \author Thanks to Rich Seibel for helping implement the public API for ACE_Message_Block! */ static ACE_Message_Block* clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size) @@ -134,15 +208,15 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size) size_t aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT); // Get the allocators - ACE_Allocator *data_allocator = 0; - ACE_Allocator *data_block_allocator = 0; - ACE_Allocator *message_block_allocator = 0; + ACE_Allocator *data_allocator; + ACE_Allocator *data_block_allocator; + ACE_Allocator *message_block_allocator; mb->access_allocators (data_allocator, data_block_allocator, message_block_allocator); // Create a new Message Block - ACE_Message_Block *nb = 0; + ACE_Message_Block *nb; ACE_NEW_MALLOC_RETURN (nb, static_cast<ACE_Message_Block*> ( message_block_allocator->malloc ( @@ -173,10 +247,11 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size) TAO_Queued_Data::TAO_Queued_Data (ACE_Allocator *alloc) : msg_block_ (0), missing_data_ (0), + byte_order_ (0), major_version_ (0), minor_version_ (0), - byte_order_ (0), more_fragments_ (0), + request_id_ (0), msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR), next_ (0), allocator_ (alloc) @@ -187,10 +262,11 @@ TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb, ACE_Allocator *alloc) : msg_block_ (mb), missing_data_ (0), + byte_order_ (0), major_version_ (0), minor_version_ (0), - byte_order_ (0), more_fragments_ (0), + request_id_ (0), msg_type_ (TAO_PLUGGABLE_MESSAGE_MESSAGERROR), next_ (0), allocator_ (alloc) @@ -200,10 +276,11 @@ TAO_Queued_Data::TAO_Queued_Data (ACE_Message_Block *mb, TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd) : msg_block_ (qd.msg_block_->duplicate ()), missing_data_ (qd.missing_data_), + byte_order_ (qd.byte_order_), major_version_ (qd.major_version_), minor_version_ (qd.minor_version_), - byte_order_ (qd.byte_order_), more_fragments_ (qd.more_fragments_), + request_id_ (qd.request_id_), msg_type_ (qd.msg_type_), next_ (0), allocator_ (qd.allocator_) @@ -320,7 +397,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd) return qd; } -int +void TAO_Queued_Data::consolidate (void) { // Is this a chain of fragments? @@ -331,15 +408,6 @@ TAO_Queued_Data::consolidate (void) this->msg_block_, this->msg_block_->total_length ()); - if (0 == dest) - { - // out of memory - return -1; - } - // Memory allocation succeeded, the new message block can hold the consolidated - // message. The following code just copies all the data into this new message block. - // No further memory allocation will take place. - // Reset the cont() parameter. We have cloned the message // block but not the chain as we will no longer have chain. dest->cont (0); @@ -354,8 +422,5 @@ TAO_Queued_Data::consolidate (void) this->msg_block_ = dest; this->more_fragments_ = 0; } - - return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index 18d324dd349..c5ca740eb13 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -22,12 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +/// Forward declarations class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Queued_Data; class TAO_Transport; @@ -70,9 +66,63 @@ public: TAO_Queued_Data *dequeue_tail (void); int enqueue_tail (TAO_Queued_Data *nd); + /// Copy message from @a block to the tail of the queue. The size + /// of message that is copied to the tail node is returned. The + /// number of bytes copied depends on the amount of bytes needed to + /// make the tail node consistent. + size_t copy_tail (ACE_Message_Block &block); + /// Return the length of the queue.. CORBA::ULong queue_length (void); + /*! + @name Node Inspection Predicates + + \brief These methods allow inspection of head and tail nodes for "completeness". + + These methods check to see whether the node on the head or tail is + "complete" and ready for further processing. See each method's + documentation for its definition of "complete". + */ + //@{ + /*! + "complete" == the GIOP message at the tail is not missing any data (it may be a complete GIOP Fragment, though) + + \retval -1 queue is empty + \retval 0 tail is not "complete" + \retval 1 tail is "complete" + */ + int is_tail_complete (void); + + /*! + + "complete" == the GIOP message at the head is not missing any data + AND, if it's the first message in a series of GIOP fragments, all + the fragments have been received, parsed, and placed into the + queue + + \retval -1 if queue is empty + \retval 0 if head is not "complete" + \retval 1 if head is "complete" + */ + int is_head_complete (void); + //@} + + /*! + \brief Check to see if the message at the tail (complete or incomplete) is a GIOP Fragment. + */ + int is_tail_fragmented (void); + + /// Return the size of data that is missing in tail of the queue. + size_t missing_data_tail (void) const; + + /// Find the first fragment that matches the GIOP version + TAO_Queued_Data *find_fragment_chain (CORBA::Octet major, + CORBA::Octet minor) const; + + /// Find the first fragment that matches the request id + TAO_Queued_Data *find_fragment_chain (CORBA::ULong request_id) const; + private: friend class TAO_Transport; @@ -94,10 +144,6 @@ private: TAO_ORB_Core *orb_core_; }; -/// Constant value indicating that the correct value is unknown yet, -/// probably parsing the header failed due to insufficient data in buffer. -const size_t TAO_MISSING_DATA_UNDEFINED = ~((size_t) 0); // MAX_SIZE_T - /************************************************************************/ /** @@ -139,11 +185,9 @@ public: static TAO_Queued_Data* duplicate (TAO_Queued_Data &qd); /// Consolidate this fragments chained message blocks into one. - /// @return -1 if consolidation failed, eg out or memory, otherwise 0 - int consolidate (void); + void consolidate (void); public: - /// The message block that contains the message. ACE_Message_Block *msg_block_; @@ -154,27 +198,28 @@ public: data missing from \a msg_block_. */ //@{ - /*! Data missing in the above message that hasn't been read or processed yet, - the value TAO_MISSING_DATA_UNDEFINED indicates it hasn't been processed yet, - otherwise greater or equal zero. */ - size_t missing_data_; + /*! Data missing in the above message that hasn't been read or processed yet. */ + CORBA::Long missing_data_; //@} + /// The byte order of the message that is stored in the node. + CORBA::Octet byte_order_; + /// Many protocols like GIOP have a major and minor version /// information that would be needed to read and decipher the /// message. CORBA::Octet major_version_; CORBA::Octet minor_version_; - /// The byte order of the message that is stored in the node. - CORBA::Octet byte_order_; - /// Some messages can be fragmented by the protocol (this is an ORB /// level fragmentation on top of the TCP/IP fragmentation. This /// member indicates whether the message that we have recd. and /// queue already has more fragments that is missing.. CORBA::Octet more_fragments_; + /// The fragment request id + CORBA::ULong request_id_; + /// The message type of the message TAO_Pluggable_Message_Type msg_type_; @@ -192,10 +237,9 @@ private: ACE_Allocator *allocator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "tao/Incoming_Message_Queue.inl" +# include "Incoming_Message_Queue.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl index 76ba787dd8e..99bcb4978d3 100644 --- a/TAO/tao/Incoming_Message_Queue.inl +++ b/TAO/tao/Incoming_Message_Queue.inl @@ -1,9 +1,6 @@ // -*- C++ -*- -// //$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +// -*- C++ -*- /************************************************************************/ // Methods for TAO_Incoming_Message_Queue /************************************************************************/ @@ -13,6 +10,57 @@ TAO_Incoming_Message_Queue::queue_length (void) return this->size_; } +ACE_INLINE int +TAO_Incoming_Message_Queue::is_tail_complete (void) +{ + // If the size is 0 return -1 + if (this->size_ == 0) + return -1; + + if (this->size_ && + this->last_added_->missing_data_ == 0) + return 1; + + return 0; +} + +ACE_INLINE int +TAO_Incoming_Message_Queue::is_head_complete (void) +{ + if (this->size_ == 0) + return -1; + + if (this->size_ && + this->last_added_->next_->missing_data_ == 0 && + !this->last_added_->next_->more_fragments_) + return 1; + + return 0; +} + +ACE_INLINE int +TAO_Incoming_Message_Queue::is_tail_fragmented (void) +{ + if (this->size_ == 0) + return 0; + + if (this->size_ && + this->last_added_->more_fragments_) + return 1; + + return 0; +} + +ACE_INLINE size_t +TAO_Incoming_Message_Queue::missing_data_tail (void) const +{ + if (this->size_ != 0) + return this->last_added_->missing_data_; + + return 0; +} + + /************************************************************************/ // Methods for TAO_Queued_Data /************************************************************************/ @@ -42,5 +90,3 @@ TAO_Queued_Data::replace_data_block (ACE_Message_Block &mb) // Remove the DONT_DELETE flags from mb mb.clr_self_flags (ACE_Message_Block::DONT_DELETE); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Incoming_Message_Stack.cpp b/TAO/tao/Incoming_Message_Stack.cpp deleted file mode 100644 index 8f704b65d9d..00000000000 --- a/TAO/tao/Incoming_Message_Stack.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -# include "tao/Incoming_Message_Stack.h" - -#if !defined (__ACE_INLINE__) -# include "tao/Incoming_Message_Stack.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Incoming_Message_Stack, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace TAO -{ -} -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h deleted file mode 100755 index 81f268aa2cb..00000000000 --- a/TAO/tao/Incoming_Message_Stack.h +++ /dev/null @@ -1,89 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Incoming_Message_Stack.h - * - * $Id$ - * - * @author Frank Rehberger <frehberg@prismtech.com> - */ -//============================================================================= - -#ifndef TAO_INCOMING_MESSAGE_STACK_H -#define TAO_INCOMING_MESSAGE_STACK_H - -#include /**/ "ace/pre.h" - -#include "tao/Incoming_Message_Queue.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) -#include "tao/TAO_Export.h" -#endif - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ -/** - * @class Incoming_Message_Stack - * - * @brief Implements stack for TAO_Queued_Data. - * - * Internal class, providing stack functionality for TAO_Queued_Data - * objects. Stack operations don't require memory allocation. -*/ -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) -class TAO_Export Incoming_Message_Stack -#else -class Incoming_Message_Stack -#endif -{ -public: - /// default constructor, intiliazes empty stack. - Incoming_Message_Stack(); - - /// destructor, releases all elements on stack - ~Incoming_Message_Stack() ; - - /// pushing a new element onto stack, - /// @a data must be a valid pointer, not NULL - void push(TAO_Queued_Data *data); - - /// removing top element of stack, - /// @return 0 for Ok and @a data is defined, -1 for error - int pop (TAO_Queued_Data* &data); - - /// peeking top element of stack - /// @return 0 for Ok, -1 for error - int top (TAO_Queued_Data* &data); - -private: - /// top element of stack - TAO_Queued_Data *top_; - -private: - /// Default Copy-Constructor - not for public usage. - Incoming_Message_Stack (const Incoming_Message_Stack&); - - /// Assignment operator - not for public usage - Incoming_Message_Stack& operator= (Incoming_Message_Stack& other); -}; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/Incoming_Message_Stack.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" -#endif /*TAO_INCOMING_MESSAGE_STACK_H*/ diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl deleted file mode 100755 index 75b724c7103..00000000000 --- a/TAO/tao/Incoming_Message_Stack.inl +++ /dev/null @@ -1,71 +0,0 @@ -// -*- C++ -*- -// -//$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/************************************************************************/ -// Methods for TAO_Incoming_Message_Stack -/************************************************************************/ -namespace TAO -{ -ACE_INLINE -Incoming_Message_Stack::Incoming_Message_Stack() -: top_(0) -{ -} - -ACE_INLINE -Incoming_Message_Stack::~Incoming_Message_Stack() -{ - // Delete all the nodes left behind - TAO_Queued_Data *del = 0; - - while (this->pop (del) != -1) - { - TAO_Queued_Data::release (del); - } -} - -ACE_INLINE void -Incoming_Message_Stack::push(TAO_Queued_Data *data) -{ - data->next_ = this->top_; - this->top_ = data; -} - - - /* @return 0 for Ok, -1 for error */ -ACE_INLINE int -Incoming_Message_Stack::pop (TAO_Queued_Data* &data) -{ - if (this->top_ == 0) - return -1; - - data = this->top_; - this->top_ = data->next_; - - return 0; -} - -ACE_INLINE int -Incoming_Message_Stack::top (TAO_Queued_Data* &data) -{ - if (this->top_ == 0) - return -1; - - data = this->top_; - - return 0; -} - -/* -ACE_INLINE bool -Incoming_Message_Stack::is_empty () -{ - return this->top_ == 0; -} -*/ - -} /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp deleted file mode 100644 index 2e25bad2b53..00000000000 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// $Id$ - -#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP -#define TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP - -#include "tao/Intrusive_Ref_Count_Base_T.h" - -#if !defined (__ACE_INLINE__) -#include "tao/Intrusive_Ref_Count_Base_T.inl" -#endif /* __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -template <typename T> -TAO_Intrusive_Ref_Count_Base<T>::~TAO_Intrusive_Ref_Count_Base() -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP */ diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h deleted file mode 100644 index 6c596d8f0f8..00000000000 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Intrusive_Ref_Count_Base_T.h - * - * $Id$ - * - * @authors Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_H -#define TAO_INTRUSIVE_REF_COUNT_BASE_T_H - -#include /**/ "ace/pre.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - -#include "ace/Atomic_Op.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_Intrusive_Ref_Count_Base<ACE_LOCK> - * - * @brief Template base class to provide intrusive reference-counting - * to subclasses. This makes the subclass capable of using a - * TAO_Intrusive_Ref_Count_Handle<X> class as a smart-pointer - * to an X object. In this case, X is a sub-class of this class, - * TAO_Intrusive_Ref_Count_Base<ACE_LOCK>. The ACE_LOCK type is - * used to protect the atomic reference count data member. - * - */ -template <class ACE_LOCK> -class TAO_Intrusive_Ref_Count_Base -{ -public: - - virtual ~TAO_Intrusive_Ref_Count_Base (void); - - void _add_ref (void); - void _remove_ref (void); - - -protected: - - TAO_Intrusive_Ref_Count_Base (void); - - -private: - - ACE_Atomic_Op<ACE_LOCK, long> ref_count_; - - // Prevent copying/assignment. - TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&); - TAO_Intrusive_Ref_Count_Base& operator= (const TAO_Intrusive_Ref_Count_Base&); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "tao/Intrusive_Ref_Count_Base_T.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Intrusive_Ref_Count_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_H */ diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl deleted file mode 100644 index 26e5026c413..00000000000 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl +++ /dev/null @@ -1,38 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) - : ref_count_(1) -{} - - -template <typename T> -ACE_INLINE -void -TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) -{ - ++this->ref_count_; -} - - -template <typename T> -ACE_INLINE -void -TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void) -{ - long const new_count = --this->ref_count_; - - if (new_count != 0) - { - return; - } - - delete this; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp deleted file mode 100644 index 5c8d02b76ba..00000000000 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP -#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP - -#include "tao/Intrusive_Ref_Count_Handle_T.h" - -#if !defined (__ACE_INLINE__) -#include "tao/Intrusive_Ref_Count_Handle_T.inl" -#endif /* __ACE_INLINE__ */ - -#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP */ diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h deleted file mode 100644 index 5138d3ad281..00000000000 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ /dev/null @@ -1,159 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Intrusive_Ref_Count_Handle_T.h - * - * $Id$ - * - * @authors Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H -#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H - -#include /**/ "ace/pre.h" - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_Intrusive_Ref_Count_Handle<T> - * - * @brief Template class for smart-pointer to (intrusively) ref-counted object. - * - * This class behaves just like a xxx_var type behaves. The only significant - * difference is that this class provides a "bool is_nil() const" method, - * and xxx_var types don't (they use the "bool CORBA::is_nil(xxx_ptr ptr)" - * method instead). For example, - * - * typedef TAO_Intrusive_Ref_Count_Handle<PortableServer::ServantBase> - * MyServantBase_var; - * - * The MyServantBase_var and the PortableServer::ServantBase_var are - * nearly idenitical. The only difference is that the MyServantBase_var - * has a "isNil()" method that indicates whether or not the smart pointer - * is in the 'nil' state or not. - * - * This class can be used to "safely" deal with an instance of a servant. - * For example, we can use a single variable - * TAO_Intrusive_Ref_Count_Handle<Foo_i> - * - * typedef TAO_Intrusive_Ref_Count_Handle<Foo_i> Foo_i_var; - * Foo_i_var servant_; - * - * instead of using two variables - * - * PortableServer::ServantBase_var servant_holder_; - * Foo_i* servant_; - - * to deal with the servant memory. - * - * The Foo_i_var type does everything that the PortableServer::ServantBase_var - * type does. In addition, the Foo_i_var type can provide access to the servant - * as derived class via the arrow operator. - */ -template <typename T> -class TAO_Intrusive_Ref_Count_Handle -{ -public: - - /// Default Constructor - enters the "nil" state. - TAO_Intrusive_Ref_Count_Handle (void); - - /// Ctor - By default, takes ownership of passed-in "copy" of reference - /// to T. But the second argument (bool) can be changed from - /// the default value of 'true' to the non-default value of 'false'. - /// The second argument dictates whether or not this handle object - /// should take ownership of the passed-in pointer to the T object. - /// By default, it takes ownership, leaving the reference counter - /// of the T object unchanged. When it is instructed to not take - /// ownership (false value for second arg), then the reference - /// counter of the T object will be incremented so that this - /// handle object has its own "copy". - TAO_Intrusive_Ref_Count_Handle (T* p, bool take_ownership = true); - - /// Copy Constructor - claims a "copy" of rhs object's reference to T. - TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b); - - /// Destructor - ~TAO_Intrusive_Ref_Count_Handle (void); - - /// Assignment Operator with T* argument. - /// Takes ownership of passed-in "copy" of reference to T. - TAO_Intrusive_Ref_Count_Handle& operator= (T* p); - - /// Assignment Operator with const TAO_Smart_Ptr<T>& argument. - /// Claims a "copy" of rhs object's reference to T. - TAO_Intrusive_Ref_Count_Handle& operator= - (const TAO_Intrusive_Ref_Count_Handle& b); - - /// Const Accessor to underlying pointer (T*) using arrow (->) operator. - T* operator->() const; - - /// Returns true if underlying pointer is NULL (0). - /// Returns false otherwise. - bool is_nil (void) const; - - /// Used to pass the underlying pointer as an "IN" argument to a method. - T* in (void) const; - - /// Used to pass the underlying pointer as an "IN/OUT" argument to a method. - T*& inout (void); - - /// Used to pass the underlying pointer as an "OUT" argument to a method. - T*& out (void); - - /// Used to take-away the underlying pointer from this smart pointer object. - /// Caller becomes responsibe for the returned "copy" to the reference. - /// Always leaves the smart pointer in the "nil" state upon return. - T* _retn (void); - - -private: - - /// Claim a "copy" of the reference-counted object by adding - /// one to its reference counter. Do nothing if this smart pointer - /// object is currently in the "nil" state. - void claim (void); - - /// Drop our "copy" of the reference-counted object by removing - /// one from its reference counter. Do nothing if this smart pointer - /// object is currently in the "nil" state. - /// Note that this method will always leave this smart pointer - /// in the "nil" state upon its return. - void drop (void); - - - /// The underlying pointer to the (intrusively) reference-counted object. - /// Set to 0 when this smart pointer is in the "nil" state. Otherwise, - /// this smart pointer always owns a (reference-counted) "copy" of the - /// object pointed to by the ptr_ data member. - T* ptr_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "tao/Intrusive_Ref_Count_Handle_T.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Intrusive_Ref_Count_Handle_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Handle_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" - -#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H */ diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl deleted file mode 100644 index 1ca7c2767bb..00000000000 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl +++ /dev/null @@ -1,162 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (void) - : ptr_(0) -{ -} - - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle ( - T* p, - bool take_ownership) - : ptr_(p) -{ - if (!take_ownership) - { - this->claim (); - } -} - - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle ( - const TAO_Intrusive_Ref_Count_Handle<T>& b) - : ptr_(b.ptr_) -{ - this->claim(); -} - - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::~TAO_Intrusive_Ref_Count_Handle() -{ - this->drop(); -} - - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>& -TAO_Intrusive_Ref_Count_Handle<T>::operator=(T* p) -{ - if (this->ptr_ != p) - { - this->drop(); - this->ptr_ = p; - } - - return *this; -} - - -template <typename T> -ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>& -TAO_Intrusive_Ref_Count_Handle<T>::operator= - (const TAO_Intrusive_Ref_Count_Handle<T>& b) -{ - // Strongly exception-safe assignment through the usual copy and - // swap technique. - - TAO_Intrusive_Ref_Count_Handle<T> tmp (b); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; - - return *this; -} - - -template <typename T> -ACE_INLINE -T* -TAO_Intrusive_Ref_Count_Handle<T>::operator->() const -{ - return this->ptr_; -} - - -template <typename T> -ACE_INLINE -bool -TAO_Intrusive_Ref_Count_Handle<T>::is_nil() const -{ - return this->ptr_ == 0; -} - - -template <typename T> -ACE_INLINE -T* -TAO_Intrusive_Ref_Count_Handle<T>::in() const -{ - return this->ptr_; -} - - -template <typename T> -ACE_INLINE -T*& -TAO_Intrusive_Ref_Count_Handle<T>::inout() -{ - return this->ptr_; -} - - -template <typename T> -ACE_INLINE -T*& -TAO_Intrusive_Ref_Count_Handle<T>::out() -{ - this->drop(); - return this->ptr_; -} - - -template <typename T> -ACE_INLINE -T* -TAO_Intrusive_Ref_Count_Handle<T>::_retn() -{ - T* retval = this->ptr_; - this->ptr_ = 0; - return retval; -} - - -template <typename T> -ACE_INLINE -void -TAO_Intrusive_Ref_Count_Handle<T>::claim() -{ - if (this->ptr_ != 0) - { - this->ptr_->_add_ref(); - } -} - - -template <typename T> -ACE_INLINE -void -TAO_Intrusive_Ref_Count_Handle<T>::drop() -{ - if (this->ptr_ != 0) - { - this->ptr_->_remove_ref(); - this->ptr_ = 0; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 612b6bbbb18..98ec2a02f51 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -1,17 +1,17 @@ //$Id$ -#include "tao/Invocation_Adapter.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/operation_details.h" -#include "tao/Stub.h" -#include "tao/ORB_Core.h" -#include "tao/Synch_Invocation.h" -#include "tao/debug.h" -#include "tao/Collocated_Invocation.h" -#include "tao/Transport.h" -#include "tao/Transport_Mux_Strategy.h" -#include "tao/Collocation_Proxy_Broker.h" -#include "tao/GIOP_Utils.h" +#include "Invocation_Adapter.h" +#include "Profile_Transport_Resolver.h" +#include "operation_details.h" +#include "Stub.h" +#include "ORB_Core.h" +#include "Synch_Invocation.h" +#include "debug.h" +#include "Collocated_Invocation.h" +#include "Transport.h" +#include "Transport_Mux_Strategy.h" +#include "Collocation_Proxy_Broker.h" + #if !defined (__ACE_INLINE__) # include "tao/Invocation_Adapter.inl" #endif /* __ACE_INLINE__ */ @@ -21,8 +21,6 @@ ACE_RCSID (tao, Invocation_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Invocation_Adapter::~Invocation_Adapter (void) @@ -191,16 +189,8 @@ namespace TAO effective_target = coll_inv.steal_forwarded_reference (); -#if TAO_HAS_INTERCEPTORS == 1 - const bool is_permanent_forward = - (coll_inv.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); -#else - const bool is_permanent_forward = false; -#endif - (void) this->object_forwarded (effective_target, - stub, - is_permanent_forward + stub ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); } @@ -276,6 +266,8 @@ namespace TAO // Update the request id now that we have a transport details.request_id (resolver.transport ()->tms ()->request_id ()); + Invocation_Status s = TAO_INVOKE_FAILURE; + if (this->type_ == TAO_ONEWAY_INVOCATION) { return this->invoke_oneway (details, @@ -293,7 +285,7 @@ namespace TAO ACE_ENV_ARG_PARAMETER); } - return TAO_INVOKE_FAILURE; + return s; } Invocation_Status @@ -330,16 +322,8 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); -#if TAO_HAS_INTERCEPTORS == 1 - const bool is_permanent_forward = - (synch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); -#else - const bool is_permanent_forward = false; -#endif - this->object_forwarded (effective_target, - r.stub (), - is_permanent_forward + r.stub () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); } @@ -369,15 +353,8 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); -#if TAO_HAS_INTERCEPTORS == 1 - const bool is_permanent_forward = - (synch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); -#else - const bool is_permanent_forward = false; -#endif this->object_forwarded (effective_target, - r.stub (), - is_permanent_forward + r.stub () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); } @@ -387,8 +364,7 @@ namespace TAO void Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target, - TAO_Stub *stub, - CORBA::Boolean permanent_forward + TAO_Stub *stub ACE_ENV_ARG_DECL) { // The object pointer has to be changed to a TAO_Stub pointer @@ -405,7 +381,7 @@ namespace TAO // Reset the profile in the stubs - stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward); + stub->add_forward_profiles (stubobj->base_profiles ()); if (stub->next_profile () == 0) ACE_THROW (CORBA::TRANSIENT ( @@ -417,5 +393,3 @@ namespace TAO return; } } // End namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 122c7da64a1..66e3f223499 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -29,14 +29,10 @@ #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Stub; +class ACE_Time_Value; + namespace CORBA { @@ -235,8 +231,7 @@ namespace TAO /// Helper method that takes care of setting the profiles within /// the stub object if the target gets forwarded void object_forwarded (CORBA::Object_var &effective_target, - TAO_Stub *stub, - CORBA::Boolean permanent_forward + TAO_Stub *stub ACE_ENV_ARG_DECL); /// Helper method to set the response flags within @a details @@ -283,7 +278,6 @@ namespace TAO }; } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Invocation_Adapter.inl" diff --git a/TAO/tao/Invocation_Adapter.inl b/TAO/tao/Invocation_Adapter.inl index 3ee1410310c..b27c3070466 100644 --- a/TAO/tao/Invocation_Adapter.inl +++ b/TAO/tao/Invocation_Adapter.inl @@ -1,9 +1,5 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE @@ -16,6 +12,7 @@ namespace TAO Collocation_Proxy_Broker *p, Invocation_Type type, Invocation_Mode mode) + : target_ (target) , args_ (args) , number_args_ (arg_number) @@ -27,5 +24,3 @@ namespace TAO { } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index dd2ab25d2cf..61f210e8d08 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -1,19 +1,19 @@ -#include "tao/Invocation_Base.h" -#include "tao/Stub.h" -#include "tao/operation_details.h" -#include "tao/ORB_Core.h" -#include "tao/SystemException.h" -#include "tao/PortableInterceptor.h" /* Must always be visible. */ +#include "Invocation_Base.h" +#include "Stub.h" +#include "operation_details.h" +#include "ORB_Core.h" +#include "SystemException.h" +#include "PortableInterceptor.h" /* Must always be visible. */ #include "ace/Dynamic_Service.h" #if TAO_HAS_INTERCEPTORS == 1 -# include "tao/PortableInterceptorC.h" -# include "tao/ClientRequestInterceptor_Adapter_Factory.h" +# include "PortableInterceptorC.h" +# include "ClientRequestInterceptor_Adapter_Factory.h" #endif /* TAO_HAS_INTERCEPTORS == 1*/ #if !defined (__ACE_INLINE__) -# include "tao/Invocation_Base.inl" +# include "Invocation_Base.inl" #endif /* __ACE_INLINE__ */ @@ -22,16 +22,13 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Invocation_Base::Invocation_Base (CORBA::Object_ptr ot, CORBA::Object_ptr t, TAO_Stub *stub, TAO_Operation_Details &details, - bool response_expected, - bool request_is_remote) + bool response_expected) : details_ (details) , forwarded_to_ (0) , response_expected_ (response_expected) @@ -44,12 +41,8 @@ namespace TAO , stack_size_ (0) , invoke_status_ (TAO_INVOKE_START) , caught_exception_ (0) - , is_remote_request_ (request_is_remote) #endif /*TAO_HAS_INTERCEPTORS == 1*/ { -#if TAO_HAS_INTERCEPTORS == 0 - ACE_UNUSED_ARG (request_is_remote); -#endif /*TAO_HAS_INTERCEPTORS == 0*/ } Invocation_Base::~Invocation_Base (void) @@ -276,5 +269,3 @@ namespace TAO } #endif /*TAO_HAS_INTERCEPTORS == 1*/ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 328127e9dc0..fafe93b6d1e 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -29,8 +29,6 @@ #include "tao/ClientRequestInterceptor_Adapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Service_Context; class TAO_Operation_Details; class TAO_Stub; @@ -127,8 +125,7 @@ namespace TAO CORBA::Object_ptr target, TAO_Stub *stub, TAO_Operation_Details &op, - bool response_expected, - bool request_is_remote); + bool response_expected); protected: /// The operation details on which we are operating on. @@ -190,11 +187,6 @@ namespace TAO PortableInterceptor::ReplyStatus reply_status (void) const; - /// Accessor used to determine if the current invocation is part - /// of a remote request, and if not, it will be considered to be - /// part of a collocated request. - bool is_remote_request() const; - protected: /// Helper method to invoke send_request interception call to all /// the registered interceptors. @@ -231,19 +223,13 @@ namespace TAO private: /// Pointer to the caught exception. CORBA::Exception *caught_exception_; - - /// Flag used to distinguish a remote invocation versus a collocated - /// (thru-poa) invocation. - bool is_remote_request_; #endif /*TAO_HAS_INTERCEPTORS*/ //@} }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Invocation_Base.inl" +# include "Invocation_Base.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl index c6a27ca28ab..fcdf1d95f41 100644 --- a/TAO/tao/Invocation_Base.inl +++ b/TAO/tao/Invocation_Base.inl @@ -1,9 +1,5 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE TAO_ORB_Core * @@ -84,13 +80,7 @@ namespace TAO { return this->invoke_status_; } +#endif /*TAO_HAS_INTERCEPTORS*/ - ACE_INLINE bool - Invocation_Base::is_remote_request (void) const - { - return this->is_remote_request_; - } -#endif /* TAO_HAS_INTERCEPTORS */ -} -TAO_END_VERSIONED_NAMESPACE_DECL +} diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 6d6c0957427..f77b369c63a 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -1,20 +1,22 @@ +// -*- C++ -*- //$Id$ #include "tao/Invocation_Endpoint_Selectors.h" #include "tao/Stub.h" #include "tao/Profile.h" #include "tao/ORB_Core.h" #include "tao/IIOP_Endpoint.h" -#include "tao/Base_Transport_Property.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/ORB_Constants.h" -#include "tao/SystemException.h" +#include "Base_Transport_Property.h" +#include "Profile_Transport_Resolver.h" +#include "ORB_Constants.h" +#include "SystemException.h" ACE_RCSID (tao, Invocation_Endpoint_Selectors, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Invocation_Endpoint_Selector::TAO_Invocation_Endpoint_Selector (void) +{ +} TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void) { @@ -22,6 +24,10 @@ TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void) // **************************************************************** +TAO_Default_Endpoint_Selector::TAO_Default_Endpoint_Selector (void) +{ +} + TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void) { } @@ -160,5 +166,3 @@ TAO_Default_Endpoint_Selector::select_endpoint ( ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index 29b5580d88a..776d6bc8411 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -17,24 +17,16 @@ #define TAO_INVOCATION_ENDPOINT_SELECTOR_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/CORBA_macros.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/TAO_Export.h" class TAO_MProfile; +class ACE_Time_Value; namespace TAO { @@ -63,6 +55,8 @@ namespace CORBA class TAO_Export TAO_Invocation_Endpoint_Selector { public: + /// Constructor. + TAO_Invocation_Endpoint_Selector (void); /// Destructor. virtual ~TAO_Invocation_Endpoint_Selector (void); @@ -88,10 +82,12 @@ public: * profile in the IOR. If that doesn't work, try the next * profile, and so on. */ -class TAO_Export TAO_Default_Endpoint_Selector - : public TAO_Invocation_Endpoint_Selector +class TAO_Export TAO_Default_Endpoint_Selector : + public TAO_Invocation_Endpoint_Selector { public: + /// Constructor. + TAO_Default_Endpoint_Selector (void); /// Destructor. virtual ~TAO_Default_Endpoint_Selector (void); @@ -101,8 +97,5 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_INVOCATION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h index 9b8804ea690..083f69cc0b1 100644 --- a/TAO/tao/Invocation_Utils.h +++ b/TAO/tao/Invocation_Utils.h @@ -21,10 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { enum Invocation_Status @@ -71,7 +67,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_INVOCATION_UTILS_H */ diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index 4e73d328828..492ed96e02a 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -1,11 +1,9 @@ -#include "tao/LF_CH_Event.h" +#include "LF_CH_Event.h" ACE_RCSID(tao, LF_Invocation_Event, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_CH_Event::TAO_LF_CH_Event (void) : TAO_LF_Event (), prev_state_ (TAO_LF_Event::LFS_IDLE) @@ -96,10 +94,9 @@ TAO_LF_CH_Event::set_state (int new_state) } } + int TAO_LF_CH_Event::is_state_final (void) { return this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h index 2a92f9007ab..af303857916 100644 --- a/TAO/tao/LF_CH_Event.h +++ b/TAO/tao/LF_CH_Event.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/LF_Event.h" +#include "LF_Event.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LF_CH_Event * @@ -107,8 +105,6 @@ private: int prev_state_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LF_CH_EVENT_H */ diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index d1d71b550e3..68873f5fe66 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -1,18 +1,15 @@ -#include "tao/LF_Connect_Strategy.h" -#include "tao/Connection_Handler.h" -#include "tao/LF_Follower.h" -#include "tao/Leader_Follower.h" -#include "tao/Transport.h" -#include "tao/ORB_Core.h" +#include "LF_Connect_Strategy.h" +#include "Connection_Handler.h" +#include "LF_Follower.h" +#include "Leader_Follower.h" +#include "Transport.h" +#include "ORB_Core.h" #include "ace/Synch_Options.h" ACE_RCSID(tao, LF_Connect_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Connect_Strategy::TAO_LF_Connect_Strategy ( TAO_ORB_Core *orb_core) : TAO_Connect_Strategy (orb_core) @@ -77,5 +74,3 @@ TAO_LF_Connect_Strategy::wait (TAO_Transport *transport, return result; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h index 4cff8ed7976..5ca99679939 100644 --- a/TAO/tao/LF_Connect_Strategy.h +++ b/TAO/tao/LF_Connect_Strategy.h @@ -15,20 +15,15 @@ #include /**/ "ace/pre.h" -#include "tao/Connect_Strategy.h" +#include "Connect_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_Connector; class ACE_Time_Value; class ACE_Synch_Options; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Connector; /** * @class TAO_LF_Connect_Strategy @@ -62,8 +57,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_LF_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp index cc69d6fcea3..d3c5673b368 100644 --- a/TAO/tao/LF_Event.cpp +++ b/TAO/tao/LF_Event.cpp @@ -1,8 +1,8 @@ +// -*- C++ -*- // $Id$ - -#include "tao/LF_Event.h" -#include "tao/LF_Follower.h" -#include "tao/Leader_Follower.h" +#include "LF_Event.h" +#include "LF_Follower.h" +#include "Leader_Follower.h" #include "ace/Guard_T.h" #if !defined (__ACE_INLINE__) @@ -13,8 +13,6 @@ ACE_RCSID (tao, LF_Event, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Event::TAO_LF_Event (void) : state_ (TAO_LF_Event::LFS_IDLE) , follower_ (0) @@ -41,10 +39,9 @@ TAO_LF_Event::state_changed (int new_state, } } + void TAO_LF_Event::set_state (int new_state) { this->state_ = new_state; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 678be63cb3c..0a721b4cad4 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LF_Follower; class TAO_Leader_Follower; @@ -143,10 +139,8 @@ protected: TAO_LF_Follower *follower_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/LF_Event.inl" +# include "LF_Event.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl index 236c8ea69ac..d6509c68430 100644 --- a/TAO/tao/LF_Event.inl +++ b/TAO/tao/LF_Event.inl @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int TAO_LF_Event::bind (TAO_LF_Follower *follower) { @@ -33,5 +30,3 @@ TAO_LF_Event::keep_waiting (void) { return (this->successful () == 0) && (this->error_detected () == 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event_Binder.cpp b/TAO/tao/LF_Event_Binder.cpp index 27fc93c2c5e..a9fdf03c2ad 100644 --- a/TAO/tao/LF_Event_Binder.cpp +++ b/TAO/tao/LF_Event_Binder.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Event_Binder.h" @@ -6,15 +7,11 @@ # include "tao/LF_Event_Binder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event_Binder, +ACE_RCSID (tao, + LF_Event_Binder, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Event_Binder::~TAO_LF_Event_Binder (void) { this->event_->unbind (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h index f6dcac517ef..7dea4a58f61 100644 --- a/TAO/tao/LF_Event_Binder.h +++ b/TAO/tao/LF_Event_Binder.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LF_Follower; /** @@ -43,11 +41,9 @@ public: private: /// Keep a reference to the leader follower - TAO_LF_Event * const event_; + TAO_LF_Event *event_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/LF_Event_Binder.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Event_Binder.inl b/TAO/tao/LF_Event_Binder.inl index 14027194f35..12389b6c8cb 100644 --- a/TAO/tao/LF_Event_Binder.inl +++ b/TAO/tao/LF_Event_Binder.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *follower) @@ -12,4 +8,4 @@ TAO_LF_Event_Binder::TAO_LF_Event_Binder (TAO_LF_Event *event, this->event_->bind (follower); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp index 7fa8bc352b6..42e295f27ed 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Event_Loop_Thread_Helper.h" @@ -6,6 +7,6 @@ # include "tao/LF_Event_Loop_Thread_Helper.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Event_Loop_Thread_Helper, +ACE_RCSID (tao, + LF_Event_Loop_Thread_Helper, "$Id$") diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h index 3d5dfd95581..c51bf5495a8 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.h +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @brief Helper class to enter and exit the Leader/Followers event * loop. @@ -56,8 +54,6 @@ private: int event_loop_return_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/LF_Event_Loop_Thread_Helper.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl index 2fd8c6d98e7..62b5eada2d5 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl @@ -2,15 +2,13 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE -TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper ( - TAO_Leader_Follower &leader_follower, - TAO_LF_Strategy &lf_strategy, - ACE_Time_Value *max_wait_time) - : leader_follower_ (leader_follower) - , lf_strategy_ (lf_strategy) +TAO_LF_Event_Loop_Thread_Helper:: + TAO_LF_Event_Loop_Thread_Helper (TAO_Leader_Follower &leader_follower, + TAO_LF_Strategy &lf_strategy, + ACE_Time_Value *max_wait_time) + : leader_follower_ (leader_follower) + , lf_strategy_ (lf_strategy) { this->event_loop_return_ = this->lf_strategy_.set_event_loop_thread (max_wait_time, leader_follower_); @@ -29,5 +27,3 @@ TAO_LF_Event_Loop_Thread_Helper::event_loop_return (void) const { return this->event_loop_return_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp index 9e9cba91522..ccf7ca522f1 100644 --- a/TAO/tao/LF_Follower.cpp +++ b/TAO/tao/LF_Follower.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Follower.h" @@ -11,8 +12,6 @@ ACE_RCSID (tao, LF_Follower, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower) : leader_follower_ (leader_follower) , condition_ (leader_follower.lock ()) @@ -38,4 +37,3 @@ TAO_LF_Follower::signal (void) return this->condition_.signal (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower.h b/TAO/tao/LF_Follower.h index b6dc6583cba..efd4a0ccbf0 100644 --- a/TAO/tao/LF_Follower.h +++ b/TAO/tao/LF_Follower.h @@ -14,21 +14,16 @@ #define TAO_LF_FOLLOWER_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/Intrusive_List_Node.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Condition_Thread_Mutex.h" #include "ace/Synch_Traits.h" -#include "ace/Intrusive_List_Node.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/TAO_Export.h" class TAO_Leader_Follower; @@ -42,7 +37,7 @@ class TAO_Leader_Follower; * loop should be implemented by this class. * */ -class TAO_Export TAO_LF_Follower +class TAO_Export TAO_LF_Follower : public ACE_Intrusive_List_Node<TAO_LF_Follower> { public: @@ -69,8 +64,6 @@ private: ACE_SYNCH_CONDITION condition_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/LF_Follower.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl index 8e88e259759..b7e612b94ee 100644 --- a/TAO/tao/LF_Follower.inl +++ b/TAO/tao/LF_Follower.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Leader_Follower & TAO_LF_Follower::leader_follower (void) { @@ -15,5 +11,3 @@ TAO_LF_Follower::wait (ACE_Time_Value *tv) { return this->condition_.wait (tv); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Adder.cpp b/TAO/tao/LF_Follower_Auto_Adder.cpp index 4798d5c34c7..99659ea63b9 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.cpp +++ b/TAO/tao/LF_Follower_Auto_Adder.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Follower_Auto_Adder.h" @@ -6,15 +7,11 @@ # include "tao/LF_Follower_Auto_Adder.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower_Auto_Adder, +ACE_RCSID (tao, + LF_Follower_Auto_Adder, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Follower_Auto_Adder::~TAO_LF_Follower_Auto_Adder (void) { this->leader_follower_.remove_follower (this->follower_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h index f1161f6b14f..468bec0c1d0 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.h +++ b/TAO/tao/LF_Follower_Auto_Adder.h @@ -23,8 +23,6 @@ #include "tao/Leader_Follower.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @brief Implement an auto_adder-like class for the TAO_LF_Followers * allocated via a TAO_Leader_Follower set. @@ -49,8 +47,6 @@ private: TAO_LF_Follower *follower_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/LF_Follower_Auto_Adder.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Follower_Auto_Adder.inl b/TAO/tao/LF_Follower_Auto_Adder.inl index 0fa419366d0..62817754d77 100644 --- a/TAO/tao/LF_Follower_Auto_Adder.inl +++ b/TAO/tao/LF_Follower_Auto_Adder.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_LF_Follower_Auto_Adder:: TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &lf, @@ -13,5 +9,3 @@ TAO_LF_Follower_Auto_Adder:: { (void) this->leader_follower_.add_follower (this->follower_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Ptr.cpp b/TAO/tao/LF_Follower_Auto_Ptr.cpp index 7152175eb48..df1c8f51980 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.cpp +++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Follower_Auto_Ptr.h" @@ -6,15 +7,11 @@ # include "tao/LF_Follower_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower_Auto_Ptr, +ACE_RCSID (tao, + LF_Follower_Auto_Ptr, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Follower_Auto_Ptr::~TAO_LF_Follower_Auto_Ptr (void) { this->leader_follower_.release_follower (this->follower_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Follower_Auto_Ptr.h b/TAO/tao/LF_Follower_Auto_Ptr.h index 52c2aae3411..b1b13f5499b 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.h +++ b/TAO/tao/LF_Follower_Auto_Ptr.h @@ -23,8 +23,6 @@ #include "tao/Leader_Follower.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @brief Implement an auto_ptr-like class for the TAO_LF_Followers * allocated via a TAO_Leader_Follower set. @@ -53,8 +51,6 @@ private: TAO_LF_Follower *follower_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/LF_Follower_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl index 8d933799401..43deadfca37 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.inl +++ b/TAO/tao/LF_Follower_Auto_Ptr.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf) : leader_follower_ (lf) @@ -28,5 +24,3 @@ TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void) { return this->follower_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp index fc42ec084fc..5dcd5a60402 100644 --- a/TAO/tao/LF_Invocation_Event.cpp +++ b/TAO/tao/LF_Invocation_Event.cpp @@ -1,12 +1,10 @@ // -*- C++ -*- -#include "tao/LF_Invocation_Event.h" +#include "LF_Invocation_Event.h" ACE_RCSID(tao, LF_Invocation_Event, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Invocation_Event::TAO_LF_Invocation_Event (void) : TAO_LF_Event () { @@ -88,5 +86,3 @@ TAO_LF_Invocation_Event::is_state_final (void) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h index a3db772d40d..98a836f5506 100644 --- a/TAO/tao/LF_Invocation_Event.h +++ b/TAO/tao/LF_Invocation_Event.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/LF_Event.h" +#include "LF_Event.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LF_Invocation_Event * @@ -79,8 +77,6 @@ private: int is_state_final (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LF_INVOCATION_EVENT_H */ diff --git a/TAO/tao/LF_Strategy.cpp b/TAO/tao/LF_Strategy.cpp index 8c30e4b4e96..2deb35e08eb 100644 --- a/TAO/tao/LF_Strategy.cpp +++ b/TAO/tao/LF_Strategy.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Strategy.h" @@ -6,10 +7,6 @@ ACE_RCSID (tao, LF_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Strategy::~TAO_LF_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Strategy.h b/TAO/tao/LF_Strategy.h index 782821a2542..6b665bff5f1 100644 --- a/TAO/tao/LF_Strategy.h +++ b/TAO/tao/LF_Strategy.h @@ -21,14 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Leader_Follower; /** @@ -75,8 +68,6 @@ public: TAO_Leader_Follower &) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LF_STRATEGY_H */ diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp index 7f6294247cc..8ae4cc0b00f 100644 --- a/TAO/tao/LF_Strategy_Complete.cpp +++ b/TAO/tao/LF_Strategy_Complete.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/LF_Strategy_Complete.h" @@ -14,8 +15,6 @@ ACE_RCSID (tao, LF_Strategy_Complete, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void) { } @@ -44,12 +43,10 @@ TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset, if (call_reset) lf.reset_event_loop_thread (); - int const result = lf.elect_new_leader (); + int result = lf.elect_new_leader (); if (result == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Failed to wake up ") ACE_TEXT ("a follower thread\n"))); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h index c1a2a007135..a0c1f4cf21d 100644 --- a/TAO/tao/LF_Strategy_Complete.h +++ b/TAO/tao/LF_Strategy_Complete.h @@ -21,12 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - /** * @brief A concrete TAO_LF_Strategy for ORB configurations that use * the Leader/Followers event loop. @@ -51,8 +45,6 @@ public: TAO_Leader_Follower &); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/LF_Strategy_Complete.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/LF_Strategy_Complete.inl b/TAO/tao/LF_Strategy_Complete.inl index 2a52ea3456a..240b3ba5dd0 100644 --- a/TAO/tao/LF_Strategy_Complete.inl +++ b/TAO/tao/LF_Strategy_Complete.inl @@ -1,12 +1,6 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_LF_Strategy_Complete::TAO_LF_Strategy_Complete (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp index 2b2b1f9472a..4f814cbd1fa 100644 --- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "tao/LRU_Connection_Purging_Strategy.h" -#include "tao/Transport.h" +#include "LRU_Connection_Purging_Strategy.h" +#include "Transport.h" -ACE_RCSID (tao, - LRU_Connection_Purging_Strategy, +ACE_RCSID (tao, + LRU_Connection_Purging_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LRU_Connection_Purging_Strategy::TAO_LRU_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum), @@ -25,7 +23,6 @@ TAO_LRU_Connection_Purging_Strategy::~TAO_LRU_Connection_Purging_Strategy (void) void TAO_LRU_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { - transport->purging_order (++this->order_); + transport->purging_order (this->order_++); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.h b/TAO/tao/LRU_Connection_Purging_Strategy.h index 8ea7319d723..07f1fdfd307 100644 --- a/TAO/tao/LRU_Connection_Purging_Strategy.h +++ b/TAO/tao/LRU_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file LRU_Connection_Purging_Strategy.h @@ -23,8 +21,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LRU_Connection_Purging_Strategy * @@ -36,7 +32,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * first. */ -class TAO_Export TAO_LRU_Connection_Purging_Strategy +class TAO_Export TAO_LRU_Connection_Purging_Strategy : public TAO_Connection_Purging_Strategy { public: @@ -54,8 +50,6 @@ private: unsigned long order_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LRU_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index d494f48f7b3..cd387e73f15 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -21,9 +21,6 @@ ACE_RCSID (tao, Leader_Follower, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Leader_Follower::~TAO_Leader_Follower (void) { while (!this->follower_free_list_.empty ()) @@ -160,7 +157,7 @@ TAO_Leader_Follower::set_client_thread (void) // re-enable it if we want to receive any replys... this->orb_core_->reactor ()->reset_reactor_event_loop (); } - ++this->clients_; + this->clients_++; } void @@ -175,7 +172,7 @@ TAO_Leader_Follower::reset_client_thread (void) ++this->leaders_; } - --this->clients_; + this->clients_--; if (this->clients_ == 0 && this->orb_core_->has_shutdown ()) { @@ -488,4 +485,3 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, return result; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 46fa3c312a7..810735673e0 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -28,15 +28,10 @@ #include "ace/Intrusive_List_Node.h" #include "ace/OS_NS_Thread.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_LF_Event; class TAO_Transport; class TAO_ORB_Core; +class ACE_Reactor; class TAO_ORB_Core_TSS_Resources; /** @@ -288,8 +283,6 @@ private: TAO_Leader_Follower &leader_follower_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Leader_Follower.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Leader_Follower.i b/TAO/tao/Leader_Follower.i index 60293532455..1c145aaab93 100644 --- a/TAO/tao/Leader_Follower.i +++ b/TAO/tao/Leader_Follower.i @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ // **************************************************************** @@ -7,8 +6,6 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core, TAO_New_Leader_Generator *new_leader_generator) @@ -223,5 +220,3 @@ TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void) { this->leader_follower_.reset_client_leader_thread (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp index 694bf8190b9..b96152bc26d 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/Leader_Follower_Flushing_Strategy.h" @@ -11,9 +12,6 @@ ACE_RCSID (tao, Leader_Follower_Flushing_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Leader_Follower_Flushing_Strategy::schedule_output (TAO_Transport *transport) { @@ -69,5 +67,3 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport ( return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h index 421ec7a591f..630b0302a8a 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.h +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/Flushing_Strategy.h" +#include "Flushing_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Leader_Follower_Flushing_Strategy * @@ -41,8 +39,6 @@ public: virtual int flush_transport (TAO_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LEADER_FOLLOWER_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 9a7368f9ec4..39d370f23be 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -1,14 +1,16 @@ +// -*- C++ -*- +// // $Id$ -#include "tao/LocalObject.h" +#include "LocalObject.h" #if !defined (__ACE_INLINE__) -# include "tao/LocalObject.i" +# include "LocalObject.i" #endif /* ! __ACE_INLINE__ */ -#include "tao/SystemException.h" -#include "tao/debug.h" -#include "tao/ORB_Constants.h" +#include "SystemException.h" +#include "debug.h" +#include "ORB_Constants.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" @@ -17,8 +19,6 @@ ACE_RCSID (tao, LocalObject, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::LocalObject::~LocalObject (void) { } @@ -42,12 +42,12 @@ CORBA::ULong CORBA::LocalObject::_hash (CORBA::ULong maximum ACE_ENV_ARG_DECL_NOT_USED) { - // Note that we reinterpret_cast to an "ptrdiff_t" instead of + // Note that we reinterpret_cast to an "unsigned long" instead of // CORBA::ULong since we need to first cast to an integer large // enough to hold an address to avoid compile-time warnings on some // 64-bit platforms. - CORBA::ULong const hash = + const CORBA::ULong hash = static_cast<CORBA::ULong> (reinterpret_cast<ptrdiff_t> (this)); return hash % maximum; @@ -64,7 +64,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (()) { - return (other_obj == this) ? true : false; + return (other_obj == this) ? 1 : 0; } // TAO's extensions @@ -90,7 +90,7 @@ CORBA::Boolean CORBA::LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // Always return false. - return false; + return 0; } void @@ -205,7 +205,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO), - false); + 0); } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -220,10 +220,6 @@ CORBA::LocalObject::_get_orb (ACE_ENV_SINGLE_ARG_DECL) // **************************************************************** -TAO_Local_RefCounted_Object::~TAO_Local_RefCounted_Object (void) -{ -} - void TAO_Local_RefCounted_Object::_add_ref (void) { @@ -239,4 +235,3 @@ TAO_Local_RefCounted_Object::_remove_ref (void) delete this; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index ebaabba991a..e7c3c8dce70 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -29,9 +29,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Object.h" namespace CORBA { @@ -42,6 +40,9 @@ namespace CORBA /** * @class LocalObject + * + * @note NW: It is not clear whether minimum CORBA should support + * LocalObject or not. I think it should. */ class TAO_Export LocalObject : public virtual CORBA::Object { @@ -222,9 +223,6 @@ class TAO_Export TAO_Local_RefCounted_Object { public: - /// Destructor. - virtual ~TAO_Local_RefCounted_Object (void); - /// Increment reference count. virtual void _add_ref (void); @@ -256,10 +254,9 @@ protected: ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "tao/LocalObject.i" +# include "LocalObject.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i index 3b84db89160..84891887973 100644 --- a/TAO/tao/LocalObject.i +++ b/TAO/tao/LocalObject.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::LocalObject_ptr CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj) @@ -51,5 +49,3 @@ TAO_Local_RefCounted_Object::TAO_Local_RefCounted_Object (void) : refcount_ (1) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index dac9e76cec7..11a9f280111 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -1,13 +1,13 @@ -#include "tao/LocateRequest_Invocation.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/operation_details.h" -#include "tao/Stub.h" -#include "tao/Bind_Dispatcher_Guard.h" -#include "tao/Transport.h" -#include "tao/Synch_Reply_Dispatcher.h" -#include "tao/GIOP_Utils.h" -#include "tao/Profile.h" -#include "tao/ORB_Constants.h" +#include "LocateRequest_Invocation.h" +#include "Profile_Transport_Resolver.h" +#include "operation_details.h" +#include "Stub.h" +#include "Bind_Dispatcher_Guard.h" +#include "Transport.h" +#include "Synch_Reply_Dispatcher.h" +#include "GIOP_Utils.h" +#include "Profile.h" +#include "ORB_Constants.h" #include "ace/Countdown_Time.h" @@ -15,8 +15,6 @@ ACE_RCSID (tao, LocateRequest_Invocation, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { LocateRequest_Invocation::LocateRequest_Invocation ( @@ -65,6 +63,9 @@ namespace TAO this->resolver_.transport (); TAO_OutputCDR &cdr = transport->out_stream (); +#if TAO_RESET_OUTPUT_CDR_AFTER_SEND == 1 + OutputCDR_Auto_Reset cdr_reset(cdr); +#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */ int retval = transport->generate_locate_request (tspec, @@ -188,5 +189,3 @@ namespace TAO return TAO_INVOKE_SUCCESS; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h index 40b213eef37..9006ada4f05 100644 --- a/TAO/tao/LocateRequest_Invocation.h +++ b/TAO/tao/LocateRequest_Invocation.h @@ -23,8 +23,6 @@ #include "tao/Synch_Invocation.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Synch_Reply_Dispatcher; namespace CORBA @@ -77,8 +75,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_LOCATEREQUEST_INVOCATION_H*/ diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 2d2e89c2f4f..527999bff53 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -1,23 +1,21 @@ -#include "tao/LocateRequest_Invocation_Adapter.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/operation_details.h" -#include "tao/LocateRequest_Invocation.h" -#include "tao/Transport.h" -#include "tao/Transport_Mux_Strategy.h" -#include "tao/ORB_Core.h" +#include "LocateRequest_Invocation_Adapter.h" +#include "Profile_Transport_Resolver.h" +#include "operation_details.h" +#include "LocateRequest_Invocation.h" +#include "Transport.h" +#include "Transport_Mux_Strategy.h" +#include "ORB_Core.h" ACE_RCSID (tao, LocateRequest_Invocation_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { LocateRequest_Invocation_Adapter::LocateRequest_Invocation_Adapter ( - CORBA::Object *target) + CORBA::Object *target) : target_ (target) - , list_ (0) + , list_ (0) { } @@ -113,5 +111,3 @@ namespace TAO return has_timeout; } } // End namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h index cfed80c24fc..64d7a59bbea 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.h +++ b/TAO/tao/LocateRequest_Invocation_Adapter.h @@ -20,18 +20,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; typedef Object *Object_ptr; } +class ACE_Time_Value; + namespace TAO { /** @@ -72,8 +68,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_LOCATEREQUEST_INVOCATION_ADAPTER_H*/ diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 517b32ce0b5..0e1dd30f277 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/LongDoubleSeqC.h" +#include "LongDoubleSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -157,5 +155,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h index 8c5eebed71f..87a2dcaab12 100644 --- a/TAO/tao/LongDoubleSeqC.h +++ b/TAO/tao/LongDoubleSeqC.h @@ -61,8 +61,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -150,8 +148,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index 0d0d0edc761..d0142375188 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/LongLongSeqC.h" +#include "LongLongSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -157,5 +155,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h index 13e708a51ad..78c8d8223b9 100644 --- a/TAO/tao/LongLongSeqC.h +++ b/TAO/tao/LongLongSeqC.h @@ -61,8 +61,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -150,8 +148,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 9bcd5e632d1..fcb07e3e606 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/LongSeqC.h" +#include "LongSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -157,5 +155,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h index 98d23f21266..4fd2f60e996 100644 --- a/TAO/tao/LongSeqC.h +++ b/TAO/tao/LongSeqC.h @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -150,8 +148,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 08a25649f56..154aa0f1d7a 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -1,9 +1,9 @@ -#include "tao/MCAST_Parser.h" -#include "tao/default_ports.h" -#include "tao/ORB_Core.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "tao/debug.h" +#include "MCAST_Parser.h" +#include "default_ports.h" +#include "ORB_Core.h" +#include "ORB.h" +#include "Environment.h" +#include "debug.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Dgram.h" @@ -11,7 +11,7 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "tao/MCAST_Parser.i" +#include "MCAST_Parser.i" #endif /* __ACE_INLINE__ */ @@ -22,13 +22,11 @@ ACE_RCSID (tao, static const char mcast_prefix[] = "mcast:"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_MCAST_Parser::~TAO_MCAST_Parser (void) { } + int TAO_MCAST_Parser::match_prefix (const char *ior_string) const { @@ -190,7 +188,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, else { // Set NIC - dgram.set_nic (ACE_TEXT_CHAR_TO_TCHAR (mcast_nic), + dgram.set_nic (ACE_TEXT_TO_TCHAR_IN (mcast_nic), multicast_addr.get_type ()); // Set TTL @@ -329,7 +327,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, else if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%N: service resolved to IOR <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (buf))); + ACE_TEXT_TO_TCHAR_IN (buf))); } } } @@ -339,7 +337,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, { ACE_ERROR ((LM_ERROR, ACE_TEXT("\nmulticast discovery of %s failed.\n"), - ACE_TEXT_CHAR_TO_TCHAR (service_name))); + ACE_TEXT_TO_TCHAR_IN (service_name))); if (ACE_OS::strcasecmp (service_name, "NameService") == 0) @@ -510,8 +508,6 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name) -1).c_str (); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser, ACE_TEXT ("MCAST_Parser"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index e4fc9560cd1..4dc327b33b5 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -24,8 +24,6 @@ #include "tao/CORBA_String.h" #include "tao/IOR_Parser.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_MCAST_Parser * @@ -87,10 +85,8 @@ private: CORBA::String_var service_name_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/MCAST_Parser.i" +# include "MCAST_Parser.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser) diff --git a/TAO/tao/MCAST_Parser.i b/TAO/tao/MCAST_Parser.i index fc19f658c44..c2a5c736f82 100644 --- a/TAO/tao/MCAST_Parser.i +++ b/TAO/tao/MCAST_Parser.i @@ -1,12 +1,6 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_MCAST_Parser::TAO_MCAST_Parser (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index e6362be15a0..cc6fb34f23d 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -19,7 +19,6 @@ ACE_RCSID (tao, # include "tao/MProfile.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_MProfile::~TAO_MProfile (void) { @@ -361,5 +360,3 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) return ret_val; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index ba45b3a4a5d..194027593d5 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -29,8 +29,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations class TAO_Profile; namespace CORBA @@ -242,8 +240,6 @@ private: TAO_PHandle last_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/MProfile.i" #endif /*__ACE_INLINE__ */ diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i index 7992f28aa06..48805e3c14d 100644 --- a/TAO/tao/MProfile.i +++ b/TAO/tao/MProfile.i @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_MProfile::TAO_MProfile (CORBA::ULong sz) : policy_list_ (0), @@ -198,5 +196,3 @@ TAO_MProfile::policy_list (CORBA::PolicyList *policy_list) { this->policy_list_ = policy_list; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index d0f636cd724..30c9cf929f6 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -6,7 +6,7 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc +## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc includedir = @includedir@/tao pkgconfigdir = @libdir@/pkgconfig @@ -116,7 +116,6 @@ libTAO_la_SOURCES = \ IORInterceptor_Adapter_Factory.cpp \ IOR_Parser.cpp \ Incoming_Message_Queue.cpp \ - Incoming_Message_Stack.cpp \ Invocation_Adapter.cpp \ Invocation_Base.cpp \ Invocation_Endpoint_Selectors.cpp \ @@ -310,6 +309,7 @@ nobase_include_HEADERS = \ CORBALOC_Parser.h \ CORBALOC_Parser.i \ CORBANAME_Parser.h \ + CORBANAME_Parser.i \ CORBA_String.h \ CORBA_String.inl \ CORBA_methods.h \ @@ -347,6 +347,7 @@ nobase_include_HEADERS = \ CurrentC.h \ CurrentS.h \ DLL_Parser.h \ + DLL_Parser.i \ Default_Collocation_Resolver.h \ Default_Endpoint_Selector_Factory.h \ Default_Protocols_Hooks.h \ @@ -369,6 +370,7 @@ nobase_include_HEADERS = \ Exception_Data.h \ Exclusive_TMS.h \ FILE_Parser.h \ + FILE_Parser.i \ Fault_Tolerance_Service.h \ Fault_Tolerance_Service.i \ Fixed_Array_Argument_T.cpp \ @@ -426,15 +428,7 @@ nobase_include_HEADERS = \ IOR_Parser.h \ Incoming_Message_Queue.h \ Incoming_Message_Queue.inl \ - Incoming_Message_Stack.h \ - Incoming_Message_Stack.inl \ InterfaceDef.pidl \ - Intrusive_Ref_Count_Base_T.cpp \ - Intrusive_Ref_Count_Base_T.h \ - Intrusive_Ref_Count_Base_T.inl \ - Intrusive_Ref_Count_Handle_T.cpp \ - Intrusive_Ref_Count_Handle_T.h \ - Intrusive_Ref_Count_Handle_T.inl \ InvalidName.pidl \ Invocation_Adapter.h \ Invocation_Adapter.inl \ @@ -686,7 +680,6 @@ nobase_include_HEADERS = \ Var_Size_Argument_T.h \ Var_Size_Argument_T.inl \ Version.h \ - Versioned_Namespace.h \ WCharSeq.pidl \ WCharSeqC.h \ WCharSeqS.h \ @@ -1059,6 +1052,7 @@ libTAO_CodecFactory_la_SOURCES = \ CodecFactory/CDR_Encaps_Codec.cpp \ CodecFactory/CodecFactory.cpp \ CodecFactory/CodecFactory_impl.cpp \ + CodecFactory/IOP_CodecA.cpp \ CodecFactory/IOP_CodecC.cpp libTAO_CodecFactory_la_LDFLAGS = \ @@ -1077,7 +1071,6 @@ nobase_include_HEADERS += \ CodecFactory/IOP_CodecC.h \ CodecFactory/IOP_CodecS.h \ CodecFactory/IOP_Codec_include.pidl \ - CodecFactory/IOP_Codec_includeA.h \ CodecFactory/IOP_Codec_includeC.h \ CodecFactory/IOP_Codec_includeS.h \ CodecFactory/codecfactory_export.h @@ -1108,7 +1101,6 @@ libTAO_PI_la_CPPFLAGS = \ -DTAO_PI_BUILD_DLL libTAO_PI_la_SOURCES = \ - PI/ClientRequestDetails.cpp \ PI/ClientRequestInfo.cpp \ PI/ClientRequestInfoA.cpp \ PI/ClientRequestInfoC.cpp \ @@ -1121,6 +1113,7 @@ libTAO_PI_la_SOURCES = \ PI/InvalidSlotA.cpp \ PI/InvalidSlotC.cpp \ PI/ORBInitInfo.cpp \ + PI/ORBInitInfoA.cpp \ PI/ORBInitInfoC.cpp \ PI/ORBInitializerA.cpp \ PI/ORBInitializerC.cpp \ @@ -1134,14 +1127,10 @@ libTAO_PI_la_SOURCES = \ PI/PICurrent_Loader.cpp \ PI/PIForwardRequestA.cpp \ PI/PIForwardRequestC.cpp \ - PI/PI_ORBInitializer.cpp \ - PI/PI_PolicyFactory.cpp \ PI/PolicyFactoryA.cpp \ PI/PolicyFactoryC.cpp \ PI/PolicyFactory_Loader.cpp \ PI/PolicyFactory_Registry.cpp \ - PI/ProcessingModePolicy.cpp \ - PI/ProcessingModePolicyC.cpp \ PI/RequestInfoA.cpp \ PI/RequestInfoC.cpp \ PI/RequestInfo_Util.cpp @@ -1156,22 +1145,17 @@ libTAO_PI_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ - PI/ClientRequestDetails.h \ - PI/ClientRequestDetails.inl \ PI/ClientRequestInfo.h \ PI/ClientRequestInfo.pidl \ - PI/ClientRequestInfoA.h \ PI/ClientRequestInfoC.h \ PI/ClientRequestInfoS.h \ PI/ClientRequestInterceptor.pidl \ - PI/ClientRequestInterceptorA.h \ PI/ClientRequestInterceptorC.h \ PI/ClientRequestInterceptorS.h \ PI/ClientRequestInterceptor_Adapter_Impl.h \ PI/ClientRequestInterceptor_Adapter_Impl.inl \ PI/ClientRequestInterceptor_Factory_Impl.h \ PI/Interceptor.pidl \ - PI/InterceptorA.h \ PI/InterceptorC.h \ PI/InterceptorS.h \ PI/Interceptor_List_T.cpp \ @@ -1186,7 +1170,6 @@ nobase_include_HEADERS += \ PI/ORBInitInfoC.h \ PI/ORBInitInfoS.h \ PI/ORBInitializer.pidl \ - PI/ORBInitializerA.h \ PI/ORBInitializerC.h \ PI/ORBInitializerS.h \ PI/ORBInitializer_Registry_Impl.h \ @@ -1202,23 +1185,14 @@ nobase_include_HEADERS += \ PI/PICurrent_Impl.inl \ PI/PICurrent_Loader.h \ PI/PIForwardRequest.pidl \ - PI/PIForwardRequestA.h \ PI/PIForwardRequestC.h \ PI/PIForwardRequestS.h \ - PI/PI_ORBInitializer.h \ - PI/PI_PolicyFactory.h \ PI/PolicyFactory.pidl \ - PI/PolicyFactoryA.h \ PI/PolicyFactoryC.h \ PI/PolicyFactoryS.h \ PI/PolicyFactory_Loader.h \ PI/PolicyFactory_Registry.h \ - PI/ProcessingModePolicy.h \ - PI/ProcessingModePolicy.pidl \ - PI/ProcessingModePolicyC.h \ - PI/ProcessingModePolicyS.h \ PI/RequestInfo.pidl \ - PI/RequestInfoA.h \ PI/RequestInfoC.h \ PI/RequestInfoS.h \ PI/RequestInfo_Util.h \ @@ -1350,6 +1324,7 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/LifespanStrategyTransientFactoryImpl.cpp \ PortableServer/Local_Servant_Base.cpp \ PortableServer/Non_Servant_Upcall.cpp \ + PortableServer/ORT_Adapter.cpp \ PortableServer/ORT_Adapter_Factory.cpp \ PortableServer/Object_Adapter.cpp \ PortableServer/Object_Adapter_Factory.cpp \ @@ -1366,6 +1341,7 @@ libTAO_PortableServer_la_SOURCES = \ PortableServer/POA_Current_Impl.cpp \ PortableServer/POA_Guard.cpp \ PortableServer/POA_Policy_Set.cpp \ + PortableServer/PS_CurrentA.cpp \ PortableServer/PS_CurrentC.cpp \ PortableServer/PS_ForwardA.cpp \ PortableServer/PS_ForwardC.cpp \ @@ -1528,6 +1504,7 @@ nobase_include_HEADERS += \ PortableServer/POA_Cached_Policies.h \ PortableServer/POA_Cached_Policies.i \ PortableServer/POA_Current.h \ + PortableServer/POA_Current.inl \ PortableServer/POA_Current_Factory.h \ PortableServer/POA_Current_Impl.h \ PortableServer/POA_Current_Impl.inl \ @@ -1647,179 +1624,6 @@ EXTRA_DIST += \ PortableServer/TAO_PortableServer.rc -## Makefile.CSD_Framework.am - -lib_LTLIBRARIES += libTAO_CSD_Framework.la - -libTAO_CSD_Framework_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tao \ - -DTAO_CSD_FW_BUILD_DLL - -libTAO_CSD_Framework_la_SOURCES = \ - CSD_Framework/CSD_Default_Servant_Dispatcher.cpp \ - CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp \ - CSD_Framework/CSD_FrameworkA.cpp \ - CSD_Framework/CSD_FrameworkC.cpp \ - CSD_Framework/CSD_Framework_Loader.cpp \ - CSD_Framework/CSD_ORBInitializer.cpp \ - CSD_Framework/CSD_Object_Adapter.cpp \ - CSD_Framework/CSD_Object_Adapter_Factory.cpp \ - CSD_Framework/CSD_POA.cpp \ - CSD_Framework/CSD_Strategy_Base.cpp \ - CSD_Framework/CSD_Strategy_Proxy.cpp \ - CSD_Framework/CSD_Strategy_Repository.cpp - -libTAO_CSD_Framework_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CSD_Framework_la_LIBADD = \ - libTAO_PI.la \ - libTAO_CodecFactory.la \ - libTAO_PortableServer.la \ - libTAO_AnyTypeCode.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CSD_Framework/CSD_Default_Servant_Dispatcher.h \ - CSD_Framework/CSD_FW_Export.h \ - CSD_Framework/CSD_FW_Server_Request_Wrapper.h \ - CSD_Framework/CSD_FW_Server_Request_Wrapper.inl \ - CSD_Framework/CSD_Framework.pidl \ - CSD_Framework/CSD_FrameworkA.h \ - CSD_Framework/CSD_FrameworkC.h \ - CSD_Framework/CSD_Framework_Loader.h \ - CSD_Framework/CSD_ORBInitializer.h \ - CSD_Framework/CSD_Object_Adapter.h \ - CSD_Framework/CSD_Object_Adapter_Factory.h \ - CSD_Framework/CSD_POA.h \ - CSD_Framework/CSD_POA.inl \ - CSD_Framework/CSD_Strategy_Base.h \ - CSD_Framework/CSD_Strategy_Base.inl \ - CSD_Framework/CSD_Strategy_Proxy.h \ - CSD_Framework/CSD_Strategy_Proxy.inl \ - CSD_Framework/CSD_Strategy_Repository.h - -pkgconfig_DATA += \ - TAO_CSD_Framework.pc - -CLEANFILES += \ - TAO_CSD_Framework.pc - -TAO_CSD_Framework.pc: ${top_builddir}/config.status ${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/CSD_Framework/TAO_CSD_Framework.pc.in - -EXTRA_DIST += \ - CSD_Framework/TAO_CSD_Framework.pc.in - - -## Makefile.CSD_ThreadPool.am - -lib_LTLIBRARIES += libTAO_CSD_ThreadPool.la - -libTAO_CSD_ThreadPool_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tao \ - -DTAO_CSD_TP_BUILD_DLL - -libTAO_CSD_ThreadPool_la_SOURCES = \ - CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp \ - CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp \ - CSD_ThreadPool/CSD_TP_Corba_Request.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Request.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp \ - CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp \ - CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp \ - CSD_ThreadPool/CSD_TP_Queue.cpp \ - CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp \ - CSD_ThreadPool/CSD_TP_Remote_Request.cpp \ - CSD_ThreadPool/CSD_TP_Request.cpp \ - CSD_ThreadPool/CSD_TP_Servant_State.cpp \ - CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp \ - CSD_ThreadPool/CSD_TP_Strategy.cpp \ - CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp \ - CSD_ThreadPool/CSD_TP_Synch_Helper.cpp \ - CSD_ThreadPool/CSD_TP_Task.cpp \ - CSD_ThreadPool/CSD_ThreadPool.cpp - -libTAO_CSD_ThreadPool_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ - -libTAO_CSD_ThreadPool_la_LIBADD = \ - libTAO_CSD_Framework.la \ - libTAO_PI.la \ - libTAO_CodecFactory.la \ - libTAO_PortableServer.la \ - libTAO_AnyTypeCode.la \ - libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -nobase_include_HEADERS += \ - CSD_ThreadPool/CSD_TP_Cancel_Visitor.h \ - CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl \ - CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h \ - CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h \ - CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl \ - CSD_ThreadPool/CSD_TP_Corba_Request.h \ - CSD_ThreadPool/CSD_TP_Corba_Request.inl \ - CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h \ - CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl \ - CSD_ThreadPool/CSD_TP_Custom_Request.h \ - CSD_ThreadPool/CSD_TP_Custom_Request.inl \ - CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h \ - CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl \ - CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h \ - CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl \ - CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h \ - CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl \ - CSD_ThreadPool/CSD_TP_Export.h \ - CSD_ThreadPool/CSD_TP_Queue.h \ - CSD_ThreadPool/CSD_TP_Queue.inl \ - CSD_ThreadPool/CSD_TP_Queue_Visitor.h \ - CSD_ThreadPool/CSD_TP_Queue_Visitor.inl \ - CSD_ThreadPool/CSD_TP_Remote_Request.h \ - CSD_ThreadPool/CSD_TP_Remote_Request.inl \ - CSD_ThreadPool/CSD_TP_Request.h \ - CSD_ThreadPool/CSD_TP_Request.inl \ - CSD_ThreadPool/CSD_TP_Servant_State.h \ - CSD_ThreadPool/CSD_TP_Servant_State.inl \ - CSD_ThreadPool/CSD_TP_Servant_State_Map.h \ - CSD_ThreadPool/CSD_TP_Servant_State_Map.inl \ - CSD_ThreadPool/CSD_TP_Strategy.h \ - CSD_ThreadPool/CSD_TP_Strategy.inl \ - CSD_ThreadPool/CSD_TP_Strategy_Factory.h \ - CSD_ThreadPool/CSD_TP_Synch_Helper.h \ - CSD_ThreadPool/CSD_TP_Synch_Helper.inl \ - CSD_ThreadPool/CSD_TP_Task.h \ - CSD_ThreadPool/CSD_TP_Task.inl \ - CSD_ThreadPool/CSD_ThreadPool.h - -pkgconfig_DATA += \ - TAO_CSD_ThreadPool.pc - -CLEANFILES += \ - TAO_CSD_ThreadPool.pc - -TAO_CSD_ThreadPool.pc: ${top_builddir}/config.status ${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - ${top_builddir}/config.status --file $@:${srcdir}/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - -EXTRA_DIST += \ - CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in - - ## Makefile.IFR_Client.am lib_LTLIBRARIES += libTAO_IFR_Client.la @@ -2069,7 +1873,6 @@ libTAO_Messaging_la_SOURCES = \ Messaging/Connection_Timeout_Policy_i.cpp \ Messaging/ExceptionHolderA.cpp \ Messaging/ExceptionHolderC.cpp \ - Messaging/ExceptionHolder_i.cpp \ Messaging/Messaging.cpp \ Messaging/MessagingA.cpp \ Messaging/MessagingC.cpp \ @@ -2114,7 +1917,6 @@ nobase_include_HEADERS += \ Messaging/ExceptionHolderC.h \ Messaging/ExceptionHolderC.inl \ Messaging/ExceptionHolderS.h \ - Messaging/ExceptionHolder_i.h \ Messaging/Messaging.h \ Messaging/Messaging.pidl \ Messaging/MessagingA.h \ @@ -2319,8 +2121,7 @@ libTAO_IORInterceptor_la_SOURCES = \ IORInterceptor/IORInfoC.cpp \ IORInterceptor/IORInterceptorC.cpp \ IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \ - IORInterceptor/IORInterceptor_Adapter_Impl.cpp \ - IORInterceptor/IORInterceptor_Details.cpp + IORInterceptor/IORInterceptor_Adapter_Impl.cpp libTAO_IORInterceptor_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -2345,7 +2146,6 @@ nobase_include_HEADERS += \ IORInterceptor/IORInterceptorC.h \ IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h \ IORInterceptor/IORInterceptor_Adapter_Impl.h \ - IORInterceptor/IORInterceptor_Details.h \ IORInterceptor/iorinterceptor_export.h pkgconfig_DATA += \ @@ -2529,7 +2329,6 @@ libTAO_PI_Server_la_SOURCES = \ PI_Server/PortableServer_ORBInitializer.cpp \ PI_Server/PortableServer_PolicyFactory.cpp \ PI_Server/ServerInterceptorAdapter.cpp \ - PI_Server/ServerRequestDetails.cpp \ PI_Server/ServerRequestInfo.cpp \ PI_Server/ServerRequestInfoA.cpp \ PI_Server/ServerRequestInfoC.cpp \ @@ -2560,16 +2359,12 @@ nobase_include_HEADERS += \ PI_Server/PortableServer_ORBInitializer.h \ PI_Server/PortableServer_PolicyFactory.h \ PI_Server/ServerInterceptorAdapter.h \ - PI_Server/ServerRequestDetails.h \ - PI_Server/ServerRequestDetails.inl \ PI_Server/ServerRequestInfo.h \ PI_Server/ServerRequestInfo.inl \ PI_Server/ServerRequestInfo.pidl \ - PI_Server/ServerRequestInfoA.h \ PI_Server/ServerRequestInfoC.h \ PI_Server/ServerRequestInfoS.h \ PI_Server/ServerRequestInterceptor.pidl \ - PI_Server/ServerRequestInterceptorA.h \ PI_Server/ServerRequestInterceptorC.h \ PI_Server/ServerRequestInterceptorS.h \ PI_Server/ServerRequestInterceptor_Factory_Impl.h \ @@ -2820,7 +2615,6 @@ nobase_include_HEADERS += \ RTScheduling/RTScheduler_include.pidl \ RTScheduling/RTScheduler_includeA.h \ RTScheduling/RTScheduler_includeC.h \ - RTScheduling/RTScheduler_includeS.h \ RTScheduling/Request_Interceptor.h \ RTScheduling/ThreadAction.h \ RTScheduling/rtscheduler_export.h @@ -2884,8 +2678,6 @@ EXTRA_DIST += \ ## Makefile.Strategies.am -if !BUILD_ACE_FOR_TAO - lib_LTLIBRARIES += libTAO_Strategies.la libTAO_Strategies_la_CPPFLAGS = \ @@ -2907,9 +2699,6 @@ libTAO_Strategies_la_SOURCES = \ Strategies/LFU_Connection_Purging_Strategy.cpp \ Strategies/LF_Strategy_Null.cpp \ Strategies/NULL_Connection_Purging_Strategy.cpp \ - Strategies/OC_Endpoint_Selector_Factory.cpp \ - Strategies/OC_Endpoint_Selector_Loader.cpp \ - Strategies/Optimized_Connection_Endpoint_Selector.cpp \ Strategies/SCIOP_Acceptor.cpp \ Strategies/SCIOP_Connection_Handler.cpp \ Strategies/SCIOP_Connector.cpp \ @@ -2960,9 +2749,6 @@ nobase_include_HEADERS += \ Strategies/LF_Strategy_Null.h \ Strategies/LF_Strategy_Null.inl \ Strategies/NULL_Connection_Purging_Strategy.h \ - Strategies/OC_Endpoint_Selector_Factory.h \ - Strategies/OC_Endpoint_Selector_Loader.h \ - Strategies/Optimized_Connection_Endpoint_Selector.h \ Strategies/SCIOP_Acceptor.h \ Strategies/SCIOP_Acceptor.i \ Strategies/SCIOP_Connection_Handler.h \ @@ -3006,8 +2792,6 @@ CLEANFILES += \ TAO_Strategies.pc: ${top_builddir}/config.status ${srcdir}/Strategies/TAO_Strategies.pc.in ${top_builddir}/config.status --file $@:${srcdir}/Strategies/TAO_Strategies.pc.in -endif !BUILD_ACE_FOR_TAO - EXTRA_DIST += \ Strategies/TAO_Strategies.pc.in \ Strategies/TAO_Strategies.rc @@ -3027,7 +2811,6 @@ libTAO_FlResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) \ -DTAO_FLRESOURCE_BUILD_DLL libTAO_FlResource_la_SOURCES = \ @@ -3035,13 +2818,12 @@ libTAO_FlResource_la_SOURCES = \ FlResource_Loader.cpp libTAO_FlResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_FlResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ FlResource_Factory.h \ @@ -3065,7 +2847,8 @@ libTAO_QtResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) \ + -I$(QTDIR)/include \ + -DQT_THREAD_SUPPORT \ -DTAO_QTRESOURCE_BUILD_DLL libTAO_QtResource_la_SOURCES = \ @@ -3073,13 +2856,13 @@ libTAO_QtResource_la_SOURCES = \ QtResource_Loader.cpp libTAO_QtResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_QtResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) + -lqt-mt nobase_include_HEADERS += \ QtResource_Factory.h \ @@ -3101,8 +2884,6 @@ libTAO_TkResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_TK_CPPFLAGS) \ - $(ACE_TCL_CPPFLAGS) \ -DTAO_TKRESOURCE_BUILD_DLL libTAO_TkResource_la_SOURCES = \ @@ -3110,14 +2891,12 @@ libTAO_TkResource_la_SOURCES = \ TkResource_Loader.cpp libTAO_TkResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_TkResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \ libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_TK_LIBS) \ - $(ACE_TCL_LIBS) + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ TAO_TkResource_Export.h \ @@ -3140,8 +2919,6 @@ libTAO_XtResource_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) \ -DTAO_XTRESOURCE_BUILD_DLL libTAO_XtResource_la_SOURCES = \ @@ -3149,14 +2926,12 @@ libTAO_XtResource_la_SOURCES = \ XtResource_Loader.cpp libTAO_XtResource_la_LDFLAGS = \ - -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) + -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ libTAO_XtResource_la_LIBADD = \ $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS += \ TAO_XtResource_Export.h \ diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp index 1334d4ac165..5c2b8ed152f 100644 --- a/TAO/tao/Managed_Types.cpp +++ b/TAO/tao/Managed_Types.cpp @@ -10,20 +10,12 @@ ACE_RCSID (tao, Managed_Types, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // assignment from CORBA::String_var makes a copy TAO_String_Manager& TAO_String_Manager::operator= (const CORBA::String_var &var) { - // Strongly exception safe by means of copy and non-throwing swap - // technique. - TAO_String_Manager tmp (var.in ()); - - char * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; - + CORBA::string_free (this->ptr_); + this->ptr_ = CORBA::string_dup (var.in ()); return *this; } @@ -46,14 +38,8 @@ TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var) TAO_WString_Manager& TAO_WString_Manager::operator= (const CORBA::WString_var &var) { - // Strongly exception safe by means of copy and non-throwing swap - // technique. - TAO_WString_Manager tmp (var.in ()); - - CORBA::WChar * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; - + CORBA::wstring_free (this->ptr_); + this->ptr_ = CORBA::wstring_dup (var.in ()); return *this; } @@ -69,5 +55,3 @@ TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var) *this->ptr_ = CORBA::wstring_dup (var.in ()); return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h index fef6ad3c28b..3d41e8880b4 100644 --- a/TAO/tao/Managed_Types.h +++ b/TAO/tao/Managed_Types.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -24,9 +24,11 @@ #include "tao/Basic_Types.h" #include "tao/CORBA_String.h" -/****************************************************************/ +#if !defined (ACE_LACKS_DEPRECATED_MACROS) +# include "ace/OS_NS_string.h" +#endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/****************************************************************/ /** * @class TAO_String_Manager @@ -49,9 +51,6 @@ public: /// copy constructor TAO_String_Manager (const TAO_String_Manager &); - /// constructor from const char* makes a copy. - TAO_String_Manager (const char *); - /// destructor ~TAO_String_Manager (void); @@ -202,9 +201,6 @@ public: /// copy constructor TAO_WString_Manager (const TAO_WString_Manager &); - /// constructor from const whar* makes a copy. - TAO_WString_Manager (const CORBA::WChar *); - /// destructor ~TAO_WString_Manager (void); @@ -331,7 +327,43 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL +// Allows for the implicit conversion of TAO_String_Manager to const char* +#if !defined (ACE_LACKS_DEPRECATED_MACROS) +namespace ACE_OS +{ + inline size_t + strlen (const TAO_String_Manager& str) + { + return ACE_OS::strlen( str.in() ); + } + inline int + strcmp( const TAO_String_Manager& lhs, const char* rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs ); + } + inline int + strcmp( const TAO_String_Manager& lhs, const TAO_String_Manager& rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs.in() ); + } + + inline size_t + strlen( const TAO_WString_Manager& str ) + { + return ACE_OS::strlen( str.in() ); + } + inline int + strcmp( const TAO_WString_Manager& lhs, const CORBA::WChar* rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs ); + } + inline int + strcmp( const TAO_WString_Manager& lhs, const TAO_WString_Manager& rhs ) + { + return ACE_OS::strcmp( lhs.in(), rhs.in() ); + } +} +#endif /* ACE_LACKS_DEPRECATED_MACROS */ #if defined (__ACE_INLINE__) #include "tao/Managed_Types.i" diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i index aa03deb7c56..73f66c7cdf6 100644 --- a/TAO/tao/Managed_Types.i +++ b/TAO/tao/Managed_Types.i @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -17,8 +16,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // default CTOR initializes to empty string ACE_INLINE TAO_String_Manager::TAO_String_Manager (void) @@ -33,12 +30,6 @@ TAO_String_Manager::TAO_String_Manager (const TAO_String_Manager &rhs) { } -ACE_INLINE -TAO_String_Manager::TAO_String_Manager (const char *s) - : ptr_ (CORBA::string_dup (s)) -{ -} - // destructor ACE_INLINE TAO_String_Manager::~TAO_String_Manager (void) @@ -50,14 +41,11 @@ TAO_String_Manager::~TAO_String_Manager (void) ACE_INLINE TAO_String_Manager& TAO_String_Manager::operator= (const TAO_String_Manager &rhs) { - // Strongly exception safe by means of copy and non-throwing swap - // technique. - TAO_String_Manager tmp (rhs); - - char * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this == &rhs) + return *this; + CORBA::string_free (this->ptr_); + this->ptr_ = CORBA::string_dup (rhs.ptr_); return *this; } @@ -65,14 +53,8 @@ TAO_String_Manager::operator= (const TAO_String_Manager &rhs) ACE_INLINE TAO_String_Manager & TAO_String_Manager::operator= (const char * p) { - // Strongly exception safe by means of copy and non-throwing swap - // technique. - TAO_String_Manager tmp (p); - - char * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; - + CORBA::string_free (this->ptr_); + this->ptr_ = CORBA::string_dup (p); return *this; } @@ -226,12 +208,6 @@ TAO_WString_Manager::TAO_WString_Manager (const TAO_WString_Manager &rhs) { } -ACE_INLINE -TAO_WString_Manager::TAO_WString_Manager (const CORBA::WChar *ws) - : ptr_ (CORBA::wstring_dup (ws)) -{ -} - // destructor ACE_INLINE TAO_WString_Manager::~TAO_WString_Manager (void) @@ -243,14 +219,11 @@ TAO_WString_Manager::~TAO_WString_Manager (void) ACE_INLINE TAO_WString_Manager& TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs) { - // Strongly exception safe by means of copy and non-throwing swap - // technique. - TAO_WString_Manager tmp (rhs); - - CORBA::WChar * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this == &rhs) + return *this; + CORBA::wstring_free (this->ptr_); + this->ptr_ = CORBA::wstring_dup (rhs.ptr_); return *this; } @@ -258,14 +231,8 @@ TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs) ACE_INLINE TAO_WString_Manager & TAO_WString_Manager::operator= (const CORBA::WChar * p) { - // Strongly exception safe by means of copy and non-throwing swap - // technique. - TAO_WString_Manager tmp (p); - - CORBA::WChar * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; - + CORBA::wstring_free (this->ptr_); + this->ptr_ = CORBA::wstring_dup (p); return *this; } @@ -403,5 +370,3 @@ TAO_SeqElem_WString_Manager::_retn (void) *this->ptr_ = 0; return temp; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 44d96d99ad5..7d8710b6fac 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -15,8 +15,6 @@ #include "ace/Copy_Disabled.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () : mesg_base_ (0) , request_id_ (0) @@ -50,25 +48,25 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) { return; } - } - // If sending the exception to the client fails, then we just give - // up, release the transport and return. - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code - (TAO_AMH_REPLY_LOCATION_CODE, - EFAULT), - CORBA::COMPLETED_NO); - this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHALL - { - } - ACE_ENDTRY; - ACE_CHECK; + // If sending the exception to the client fails, then we just give + // up, release the transport and return. + ACE_DECLARE_NEW_CORBA_ENV; + ACE_TRY + { + CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code + (TAO_AMH_REPLY_LOCATION_CODE, + EFAULT), + CORBA::COMPLETED_NO); + this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHALL + { + } + ACE_ENDTRY; + ACE_CHECK; + } } void @@ -188,10 +186,10 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex if (this->reply_status_ != TAO_RS_UNINITIALIZED) { ACE_THROW (CORBA::BAD_INV_ORDER ( - CORBA::SystemException::_tao_minor_code ( - TAO_AMH_REPLY_LOCATION_CODE, - ENOTSUP), - CORBA::COMPLETED_YES)); + CORBA::SystemException::_tao_minor_code ( + TAO_AMH_REPLY_LOCATION_CODE, + ENOTSUP), + CORBA::COMPLETED_YES)); } this->reply_status_ = TAO_RS_SENDING; } @@ -241,9 +239,9 @@ TAO_AMH_Response_Handler::_remove_ref (void) if (this->allocator_) { - TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (this->allocator_); + TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_); - allocator.release (this); + allocator.release(this); } else { @@ -262,4 +260,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 738afa35200..678aa406821 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -7,13 +7,14 @@ * $Id$ * * @author Mayur Deshpande <mayur@ics.uci.edu> + * */ // ========================================================================= #ifndef TAO_AMH_RESPONSE_HANDLER_H #define TAO_AMH_RESPONSE_HANDLER_H -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Allocator.h" #include "tao/Service_Context.h" @@ -28,17 +29,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport; class TAO_Pluggable_Messaging; class TAO_Output_CDR; class TAO_ORB_Core; class TAO_ServerRequest; +class ACE_Allocator; typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR; @@ -69,7 +65,7 @@ class TAO_Messaging_Export TAO_AMH_Response_Handler // isn't consistent with the specified semantics detailed in the // CCM spec. Please remove this and place it where appropriate in // your AMH tests and examples. - : public TAO_Local_RefCounted_Object + : virtual public TAO_Local_RefCounted_Object { public: @@ -86,8 +82,8 @@ public: /** * Stores necessary information from a TAO_Server_Request onto the heap */ - virtual void init (TAO_ServerRequest &server_request, - TAO_AMH_BUFFER_ALLOCATOR* allocator); + virtual void init(TAO_ServerRequest &server_request, + TAO_AMH_BUFFER_ALLOCATOR* allocator); /// @name Mutators for refcount //@{ @@ -122,8 +118,8 @@ protected: private: // Private and undefined, standard C++ idiom to prohibit copying. - TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&); - TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&); + ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&)) + ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&)) private: /// Pointer to the original message-base @@ -217,6 +213,4 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_AMH_RESPONSE_HANDLER_H */ diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 893cab4df34..6d84968d1f6 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/Messaging/Asynch_Invocation.h" -#include "tao/Messaging/Asynch_Reply_Dispatcher.h" +#include "Asynch_Invocation.h" +#include "Asynch_Reply_Dispatcher.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/Invocation_Utils.h" @@ -20,8 +20,6 @@ ACE_RCSID (Messaging, Asynch_Invocation, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Asynch_Remote_Invocation::Asynch_Remote_Invocation ( @@ -186,4 +184,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h index 930d223bd3c..b058c4c43a0 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.h +++ b/TAO/tao/Messaging/Asynch_Invocation.h @@ -25,15 +25,9 @@ #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_InputCDR; +class ACE_Time_Value; class TAO_Asynch_Reply_Dispatcher_Base; namespace CORBA @@ -68,7 +62,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_MESSAGING_ASYNCH_INVOCATION_H*/ diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index b88ff2855ae..ddbd6c62b5a 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/Messaging/Asynch_Invocation_Adapter.h" -#include "tao/Messaging/Asynch_Reply_Dispatcher.h" -#include "tao/Messaging/Asynch_Invocation.h" +#include "Asynch_Invocation_Adapter.h" +#include "Asynch_Reply_Dispatcher.h" +#include "Asynch_Invocation.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/operation_details.h" @@ -12,7 +12,6 @@ #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Thread_Lane_Resources.h" -#include "tao/GIOP_Utils.h" ACE_RCSID (Messaging, @@ -20,8 +19,6 @@ ACE_RCSID (Messaging, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Asynch_Invocation_Adapter::Asynch_Invocation_Adapter ( @@ -175,16 +172,8 @@ namespace TAO { effective_target = asynch.steal_forwarded_reference (); -#if TAO_HAS_INTERCEPTORS == 1 - const CORBA::Boolean permanent_forward = - (asynch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); -#else - const CORBA::Boolean permanent_forward = false; -#endif - this->object_forwarded (effective_target, - r.stub (), - permanent_forward + r.stub () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); } @@ -193,5 +182,3 @@ namespace TAO } } // End namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index 97cc214a71d..f48671c9360 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -29,14 +29,9 @@ #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Stub; +class ACE_Time_Value; class TAO_Asynch_Reply_Dispatcher; class TAO_Asynch_Reply_Dispatcher_Base; @@ -95,17 +90,15 @@ namespace TAO ARDB_Refcount_Functor> safe_rd_; private: - /// Don't allow default initializations - Asynch_Invocation_Adapter (void); + /// Dont allow default initializations + ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter (void)) - Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &); - Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &); + ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &)) }; } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" -#endif /* TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H */ +#endif /*TAO_MESSAGING_ASYNCH_INVOCATION_ADAPTER_H*/ diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 7866e1277e7..e3fab16ec13 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Messaging/Asynch_Reply_Dispatcher.h" +#include "Asynch_Reply_Dispatcher.h" #include "tao/Pluggable_Messaging_Utils.h" #include "tao/ORB_Core.h" @@ -12,8 +12,6 @@ ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher ( const TAO_Reply_Handler_Skeleton &reply_handler_skel, @@ -110,7 +108,6 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( break; default: case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD: - case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM: // @@ Michael: Not even the spec mentions this case. // We have to think about this case. // Handle the forwarding and return so the stub restarts the @@ -279,5 +276,3 @@ TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id, request_id, max_wait_time); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 5b315547813..03a35ced0a3 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -16,23 +16,19 @@ #define TAO_ASYNCH_REPLY_DISPATCHER_H #include /**/ "ace/pre.h" -#include "tao/Messaging/Messaging.h" +#include "Messaging.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/Asynch_Timeout_Handler.h" +#include "Asynch_Timeout_Handler.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Reply dispatcher for Asynchoronous Method Invocation (AMI)s. -class TAO_Asynch_Reply_Dispatcher +class TAO_Messaging_Export TAO_Asynch_Reply_Dispatcher : public TAO_Asynch_Reply_Dispatcher_Base { public: @@ -73,7 +69,5 @@ private: TAO_Asynch_Timeout_Handler *timeout_handler_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ASYNCH_REPLY_DISPATCHER_H */ diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index f72a1d46d85..b3fecff6a83 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/Messaging/Asynch_Timeout_Handler.h" +#include "Asynch_Timeout_Handler.h" -#include "tao/Messaging/Asynch_Reply_Dispatcher.h" +#include "Asynch_Reply_Dispatcher.h" #include "tao/Transport_Mux_Strategy.h" #include "ace/Reactor.h" @@ -11,7 +11,6 @@ ACE_RCSID (Messaging, Asynch_Timeout_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler ( TAO_Asynch_Reply_Dispatcher_Base *rd, @@ -74,5 +73,3 @@ TAO_Asynch_Timeout_Handler::cancel () this->reactor_->cancel_timer (this); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h index 9b8a55eb8c2..be230bb6374 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,8 +30,6 @@ #include "ace/Event_Handler.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Asynch_Reply_Dispatcher_Base; class TAO_Transport_Mux_Strategy; @@ -40,7 +38,7 @@ class TAO_Transport_Mux_Strategy; * * @brief Handler registered with the reactor in case of AMI timeouts. */ -class TAO_Asynch_Timeout_Handler +class TAO_Messaging_Export TAO_Asynch_Timeout_Handler : public ACE_Event_Handler { public: @@ -75,8 +73,6 @@ public: ACE_Reactor *reactor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */ diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index 4eaaa3bdc12..df49288c887 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -1,5 +1,5 @@ //$Id$ -#include "tao/Messaging/Connection_Timeout_Policy_i.h" +#include "Connection_Timeout_Policy_i.h" #include "tao/ORB_Core.h" #include "tao/Stub.h" #include "tao/debug.h" @@ -12,8 +12,6 @@ ACE_RCSID (Messaging, #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) : ACE_NESTED_CLASS (CORBA, Object) () @@ -188,13 +186,11 @@ TAO_ConnectionTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) if (TAO_debug_level > 0) { - CORBA::ULong const msecs = time_value.msec (); + CORBA::ULong msecs = time_value.msec (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"), msecs)); } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 9e334a307a7..73f041dca16 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Connection_Timeout_Policy_i.h @@ -12,7 +11,6 @@ #ifndef TAO_CONNECTION_TIMEOUT_POLICY_I_H #define TAO_CONNECTION_TIMEOUT_POLICY_I_H - #include /**/ "ace/pre.h" #include "tao/orbconf.h" @@ -21,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/TAO_ExtC.h" +#include "TAO_ExtC.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) @@ -32,8 +30,6 @@ #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* * @class TAO_ConnectionTimeoutPolicy * @@ -42,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * This policy controls the connection timeout time while * establishing connections. This policy is proprietary to TAO. */ -class TAO_ConnectionTimeoutPolicy +class TAO_Messaging_Export TAO_ConnectionTimeoutPolicy : public TAO::ConnectionTimeoutPolicy, public TAO_Local_RefCounted_Object { @@ -93,8 +89,6 @@ private: TimeBase::TimeT relative_expiry_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ #if defined(_MSC_VER) @@ -102,5 +96,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #include /**/ "ace/post.h" - -#endif /* TAO_CONNECTION_TIMEOUT_POLICY_I_H */ +#endif /*TAO_CONNECTION_TIMEOUT_POLICY_I_H*/ diff --git a/TAO/tao/Messaging/ExceptionHolderA.cpp b/TAO/tao/Messaging/ExceptionHolderA.cpp index 99273a726d0..4acda37b712 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.cpp +++ b/TAO/tao/Messaging/ExceptionHolderA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/ExceptionHolderA.h" +#include "ExceptionHolderA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -43,7 +43,6 @@ #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_typecode/value_typecode.cpp:63 @@ -190,8 +189,8 @@ operator>>= ( ); } -#endif -TAO_END_VERSIONED_NAMESPACE_DECL + +#endif #endif diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h index 2efc2998af0..b3c03859799 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.h +++ b/TAO/tao/Messaging/ExceptionHolderA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/ExceptionHolderC.h" #include "tao/AnyTypeCode/OctetSeqA.h" #include "tao/AnyTypeCode/DynamicA.h" @@ -44,8 +44,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -81,8 +79,6 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp index 3673c01c5a8..285d835210b 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.cpp +++ b/TAO/tao/Messaging/ExceptionHolderC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/ExceptionHolderC.h" +#include "ExceptionHolderC.h" #include "tao/CDR.h" #include "tao/Valuetype/ValueFactory.h" #include "tao/ORB_Core.h" @@ -38,14 +38,12 @@ #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) #if !defined (__ACE_INLINE__) -#include "tao/Messaging/ExceptionHolderC.inl" +#include "ExceptionHolderC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -306,6 +304,4 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h index 37848e2adcf..ffedf44d5f4 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.h +++ b/TAO/tao/Messaging/ExceptionHolderC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/ORB.h" @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -283,10 +281,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Messaging/ExceptionHolderC.inl" +#include "ExceptionHolderC.inl" #endif /* defined INLINE */ #endif diff --git a/TAO/tao/Messaging/ExceptionHolderC.inl b/TAO/tao/Messaging/ExceptionHolderC.inl index cabe51e8d9f..6348b2eb0c7 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.inl +++ b/TAO/tao/Messaging/ExceptionHolderC.inl @@ -31,8 +31,6 @@ #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE Messaging::ExceptionHolder::ExceptionHolder (void) {} @@ -43,6 +41,4 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id () return "IDL:omg.org/Messaging/ExceptionHolder:1.0"; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp deleted file mode 100644 index 880f31b6d7d..00000000000 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "tao/Messaging/ExceptionHolder_i.h" - -ACE_RCSID (Messaging, - ExceptionHolder_i, - "$Id$") - -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -#include "tao/Messaging/Messaging.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - ExceptionHolder::ExceptionHolder (void) : - data_ (0), - count_ (0) - { - } - - ExceptionHolder::ExceptionHolder ( - ::CORBA::Boolean is_system_exception, - ::CORBA::Boolean byte_order, - const ::CORBA::OctetSeq &marshaled_exception, - ::TAO::Exception_Data* data, - ::CORBA::ULong exceptions_count) : - data_ (data), - count_ (exceptions_count) - { - // @todo According to the latest corba spec we should be able to - // pass this to the ExceptionHolder constructor but the TAO_IDL - // compiler doesn't seem to generate this. - this->is_system_exception (is_system_exception); - this->byte_order (byte_order); - this->marshaled_exception (marshaled_exception); - } - - ExceptionHolder::~ExceptionHolder () - { - } - - void ExceptionHolder::raise_exception ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - { - TAO_Messaging_Helper::exception_holder_raise ( - this->data_, - this->count_, - this->marshaled_exception ().get_buffer (), - this->marshaled_exception ().length (), - this->byte_order (), - this->is_system_exception () - ACE_ENV_ARG_PARAMETER); - } - - void ExceptionHolder::raise_exception_with_list ( - const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - { - // todo convert exceptionlist to something we can really use. - this->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - } - - CORBA::ValueBase * - ExceptionHolderFactory::create_for_unmarshal ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - { - TAO::ExceptionHolder* ret_val = 0; - ACE_NEW_THROW_EX (ret_val, - ExceptionHolder, - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - - return ret_val; - } - -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h deleted file mode 100644 index c80a5a23141..00000000000 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ /dev/null @@ -1,102 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ExceptionHolder_i.h - * - * $Id$ - * - * @author Johnny Willemsen <jwillemsen@remedy.nl> - */ -//============================================================================= - -#ifndef TAO_MESSAGING_EXCEPTIONHOLDER_I_H -#define TAO_MESSAGING_EXCEPTIONHOLDER_I_H -#include /**/ "ace/pre.h" - -#include "tao/Messaging/messaging_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/orbconf.h" - -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -#include "tao/Messaging/ExceptionHolderA.h" -#include "tao/Messaging/ExceptionHolderC.h" -#include "tao/Valuetype/ValueFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace Dynamic -{ - class ExceptionList; -} - -namespace Messaging -{ - class ReplyHandler; -} - -namespace TAO -{ - struct Exception_Data; - - class TAO_Messaging_Export ExceptionHolder - : public virtual ::OBV_Messaging::ExceptionHolder, - public virtual ::CORBA::DefaultValueRefCountBase - { - public: - ExceptionHolder (void); - - ExceptionHolder ( - ::CORBA::Boolean is_system_exception, - ::CORBA::Boolean byte_order, - const ::CORBA::OctetSeq &marshaled_exception, - ::TAO::Exception_Data* data_, - ::CORBA::ULong exceptions_count - ); - - virtual void raise_exception (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - - virtual void raise_exception_with_list ( - const ::Dynamic::ExceptionList & exc_list ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - protected: - - virtual ~ExceptionHolder (void); - - private: - - TAO::Exception_Data* const data_; - CORBA::ULong const count_; - - }; - - /** - * @class ExceptionHolderFactory - * - * @brief OBV factory implementation. - * - * Factory for ExceptionHolder - */ - class TAO_Messaging_Export ExceptionHolderFactory : - public virtual CORBA::ValueFactoryBase - { - public: - virtual CORBA::ValueBase * create_for_unmarshal ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - }; - -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif - -#include /**/ "ace/post.h" -#endif /* TAO_MESSAGING_EXCEPTIONHOLDER_I_H */ - diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index 6f34e95f288..8b245a2ac34 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- // $Id$ -#include "tao/Messaging/Messaging.h" -#include "tao/Messaging/Messaging_Loader.h" +#include "Messaging.h" +#include "Messaging_Loader.h" #include "tao/Exception_Data.h" #include "tao/debug.h" @@ -17,9 +17,6 @@ ACE_RCSID (Messaging, Messaging, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Messaging_Initializer::init (void) { @@ -88,7 +85,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0) continue; - CORBA::Exception * const exception = exception_data[i].alloc (); + CORBA::Exception *exception = exception_data[i].alloc (); if (exception == 0) ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, @@ -98,7 +95,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, // Raise the exception. #if defined (TAO_HAS_EXCEPTIONS) - ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception); + ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(exception); #endif ACE_ENV_RAISE (exception); @@ -114,5 +111,3 @@ exception_holder_raise (TAO::Exception_Data *exception_data, ACE_THROW (CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES)); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index 4c4647e5432..ba4077c94cb 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -14,20 +14,10 @@ #ifndef TAO_MESSAGING_H #define TAO_MESSAGING_H - #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" - -#define TAO_MESSAGING_SAFE_INCLUDE -#include "tao/Messaging/MessagingC.h" -#undef TAO_MESSAGING_SAFE_INCLUDE - -#include "tao/Messaging/MessagingA.h" -#include "tao/Messaging/TAO_ExtC.h" -#include "tao/TAOC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "messaging_export.h" class TAO_Messaging_Export TAO_Messaging_Initializer { @@ -39,6 +29,15 @@ public: static int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); +#define TAO_MESSAGING_SAFE_INCLUDE +#include "MessagingC.h" +#undef TAO_MESSAGING_SAFE_INCLUDE + +#include "MessagingA.h" +#include "TAO_ExtC.h" +#include "tao/TAOC.h" + + // Typedef for the Reply Handler Skeleton. // This is handcrafted not generated by the IDL compiler. @@ -92,7 +91,6 @@ namespace TAO_Messaging_Helper ACE_ENV_ARG_DECL); } -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_H */ diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp index d54d9ed1a34..ae94cc8598a 100644 --- a/TAO/tao/Messaging/MessagingA.cpp +++ b/TAO/tao/Messaging/MessagingA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/Messaging.h" +#include "Messaging.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -166,5 +164,3 @@ operator>>= ( } #endif - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h index 05db49af523..f07ee68a2ab 100644 --- a/TAO/tao/Messaging/MessagingA.h +++ b/TAO/tao/Messaging/MessagingA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/MessagingC.h" #include "tao/Messaging/Messaging_SyncScope_PolicyA.h" #include "tao/Messaging/Messaging_RT_PolicyA.h" @@ -47,8 +47,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -84,8 +82,6 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index e8c429787c5..0fb388a8db1 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -29,20 +29,18 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/Messaging.h" +#include "Messaging.h" #include "tao/CDR.h" #include "tao/Object_T.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "tao/Messaging/MessagingC.inl" +#include "MessagingC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -239,5 +237,3 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr) return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index ed12276ef97..a7ea6b985d0 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -44,7 +44,7 @@ #error "You should not include MessagingC.h directly, use Messaging.h" #endif /* !TAO_MESSAGING_SAFE_INCLUDE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -66,8 +66,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Messaging_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -242,10 +240,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rep // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Messaging/MessagingC.inl" +#include "MessagingC.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl index ee8e47e7f57..465190bb2db 100644 --- a/TAO/tao/Messaging/MessagingC.inl +++ b/TAO/tao/Messaging/MessagingC.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 @@ -62,5 +61,3 @@ Messaging::ReplyHandler::ReplyHandler ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index 913acc12d64..65746739df0 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_MESSAGINGS_CPP_ -#include "tao/Messaging/MessagingS.h" +#include "MessagingS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -63,8 +63,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -797,7 +795,5 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* ifndef */ diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h index 7c5f68e5eee..c633f3027ba 100644 --- a/TAO/tao/Messaging/MessagingS.h +++ b/TAO/tao/Messaging/MessagingS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/Messaging.h" +#include "Messaging.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_Messaging { @@ -203,9 +201,7 @@ namespace POA_Messaging // TAO_IDL - Generated from // be\be_codegen.cpp:1072 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "tao/Messaging/MessagingS_T.h" +#include "MessagingS_T.h" #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp index c7390c0ad31..1f53170dde1 100644 --- a/TAO/tao/Messaging/MessagingS_T.cpp +++ b/TAO/tao/Messaging/MessagingS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_MESSAGINGS_T_CPP_ #define _TAO_IDL_MESSAGINGS_T_CPP_ -#include "tao/Messaging/MessagingS_T.h" +#include "MessagingS_T.h" #if !defined (__ACE_INLINE__) -#include "tao/Messaging/MessagingS_T.inl" +#include "MessagingS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h index c111885476a..426a76f0529 100644 --- a/TAO/tao/Messaging/MessagingS_T.h +++ b/TAO/tao/Messaging/MessagingS_T.h @@ -33,8 +33,6 @@ #include /**/ "ace/pre.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -95,14 +93,12 @@ namespace POA_Messaging // TAO_IDL - Generated from // be\be_codegen.cpp:1165 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Messaging/MessagingS_T.inl" +#include "MessagingS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Messaging/MessagingS_T.cpp" +#include "MessagingS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Messaging/MessagingS_T.inl b/TAO/tao/Messaging/MessagingS_T.inl index 45319a7c078..0a3b3cfd130 100644 --- a/TAO/tao/Messaging/MessagingS_T.inl +++ b/TAO/tao/Messaging/MessagingS_T.inl @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -120,4 +119,3 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL) return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index 81555edbf4a..f823aabd690 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -1,24 +1,23 @@ // $Id$ -#include "tao/Messaging/Messaging_Loader.h" -#include "tao/Messaging/Messaging_ORBInitializer.h" +#include "Messaging_Loader.h" +#include "Messaging_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Messaging, Messaging_Loader, "$Id$") +ACE_RCSID (TAO, Messaging_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Messaging_Loader::TAO_Messaging_Loader (void) { } TAO_Messaging_Loader::~TAO_Messaging_Loader (void) { + } int @@ -62,7 +61,7 @@ TAO_Messaging_Loader::init (int, if (TAO_debug_level > 0) { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + "(%P | %t) Caught exception:"); } return -1; } @@ -71,8 +70,6 @@ TAO_Messaging_Loader::init (int, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_Messaging, TAO_Messaging_Loader) diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index d15ee63f1c7..08a4a7fd154 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -1,19 +1,23 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file Messaging_Loader.h * * $Id$ + * + * Header file for Loading RTScheduler. + * + * + * @author Yamuna Krishnamurthy <yamuna@oomworks.com> */ //============================================================================= -#ifndef TAO_MESSAGING_LOADER_H -#define TAO_MESSAGING_LOADER_H - +#ifndef TAO_RTSCHEDULER_LOADER_H +#define TAO_RTSCHEDULER_LOADER_H #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" @@ -22,10 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object { public: @@ -40,10 +40,8 @@ public: ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Messaging, TAO_Messaging_Loader) ACE_FACTORY_DECLARE (TAO_Messaging, TAO_Messaging_Loader) #include /**/ "ace/post.h" -#endif /* TAO_MESSAGING_LOADER_H */ +#endif /* TAO_RTSCHEDULER_LOADER_H */ diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp index bd636c617ee..cb4d2d6d29a 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/Messaging_No_ImplA.h" +#include "Messaging_No_ImplA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,8 +38,6 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -495,5 +493,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.h b/TAO/tao/Messaging/Messaging_No_ImplA.h index e11e3273d6c..a2d24bed959 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.h +++ b/TAO/tao/Messaging/Messaging_No_ImplA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/Messaging_No_ImplC.h" #include "tao/AnyTypeCode/TimeBaseA.h" #include "tao/AnyTypeCode/PolicyA.h" @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -153,8 +151,6 @@ TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::RoutingTypeRan TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::RoutingTypeRange *&); // deprecated TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const Messaging::RoutingTypeRange *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index 9615102b4f1..cd27dfdd4bc 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/Messaging_No_ImplC.h" +#include "Messaging_No_ImplC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -1490,5 +1488,3 @@ Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &) (strm >> _tao_aggregate.min) && (strm >> _tao_aggregate.max); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index ba97ba1885e..8efa3edd9dd 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -1765,8 +1763,6 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rou // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 16196807c78..d373535fff1 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -1,21 +1,16 @@ // -*- C++ -*- -#include "tao/Messaging/Messaging_ORBInitializer.h" +#include "Messaging_ORBInitializer.h" -#include "tao/Messaging/Messaging_Policy_i.h" -#include "tao/Messaging/Connection_Timeout_Policy_i.h" -#include "tao/Messaging/Messaging_PolicyFactory.h" -#include "tao/Messaging/ExceptionHolder_i.h" +#include "Messaging_Policy_i.h" +#include "Connection_Timeout_Policy_i.h" +#include "Messaging_PolicyFactory.h" #include "tao/ORB_Core.h" -#include "tao/PI/ORBInitInfo.h" -#include "tao/Valuetype/ValueFactory.h" ACE_RCSID (Messaging, Messaging_ORBInitializer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_Messaging_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -47,52 +42,9 @@ TAO_Messaging_ORBInitializer::post_init ( this->register_policy_factories (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - - this->register_value_factory (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Messaging_ORBInitializer::register_value_factory ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) -{ -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - ACE_UNUSED_ARG (info); -#else - // Narrow to a TAO_ORBInitInfo object to get access to the - // orb_core() TAO extension. - TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (tao_info.in ())) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "(%P|%t) TAO_Messaging_ORBInitializer::register_value_factory:\n" - "(%P|%t) Unable to narrow " - "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" - "(%P|%t) \"TAO_ORBInitInfo *.\"\n")); - - ACE_THROW (CORBA::INTERNAL ()); - } - - TAO::ExceptionHolderFactory *base_factory = 0; - ACE_NEW (base_factory, - TAO::ExceptionHolderFactory); - CORBA::ValueFactory_var factory = base_factory; - - tao_info->orb_core()->orb ()->register_value_factory ( - Messaging::ExceptionHolder::_tao_obv_static_repository_id (), - base_factory - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; -#endif -} -void TAO_Messaging_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) @@ -192,5 +144,3 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index e5d57c2a72d..f9d7398a5f1 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,10 +32,9 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Messaging ORB initializer. -class TAO_Messaging_ORBInitializer +class TAO_Messaging_Export TAO_Messaging_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual TAO_Local_RefCounted_Object { @@ -65,19 +64,14 @@ private: void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL); - - /// Register ExceptionHolder value factory - void register_value_factory ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ + + #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_ORB_INITIALIZER_H */ diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 7fcda386a8b..00b089ed21c 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -1,19 +1,17 @@ -#include "tao/Messaging/Messaging_PolicyFactory.h" +#include "Messaging_PolicyFactory.h" ACE_RCSID (Messaging, Messaging_PolicyFactory, "$Id$") -#include "tao/Messaging/Messaging_Policy_i.h" -#include "tao/Messaging/Connection_Timeout_Policy_i.h" +#include "Messaging_Policy_i.h" +#include "Connection_Timeout_Policy_i.h" #include "tao/PolicyC.h" #include "tao/Buffering_Constraint_Policy.h" #include "tao/AnyTypeCode/TAOA.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) CORBA::Policy_ptr @@ -107,5 +105,3 @@ TAO_Messaging_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h index c2b36ed1a43..823a3d46908 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,10 +33,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Policy factory for all Messaging related policies. -class TAO_Messaging_PolicyFactory +class TAO_Messaging_Export TAO_Messaging_PolicyFactory : public virtual PortableInterceptor::PolicyFactory, public virtual TAO_Local_RefCounted_Object { @@ -55,7 +53,6 @@ private: #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 025f6018620..f4e244a8696 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -6,15 +6,13 @@ #include "tao/AnyTypeCode/Any.h" #if ! defined (__ACE_INLINE__) -#include "tao/Messaging/Messaging_Policy_i.i" +#include "Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Messaging, Messaging_Policy_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( @@ -341,5 +339,3 @@ TAO_Sync_Scope_Policy::_tao_cached_type (void) const } #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 588ea35d89b..25ee477009e 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -23,8 +23,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) /* @@ -35,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * This policy controls the total (round-trip) timeout time for a * request. */ -class TAO_RelativeRoundtripTimeoutPolicy +class TAO_Messaging_Export TAO_RelativeRoundtripTimeoutPolicy : public Messaging::RelativeRoundtripTimeoutPolicy, public TAO_Local_RefCounted_Object { @@ -153,10 +151,8 @@ private: #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Messaging/Messaging_Policy_i.i" +#include "Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/Messaging/Messaging_Policy_i.i b/TAO/tao/Messaging/Messaging_Policy_i.i index f33ea289267..2915eaae01e 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.i +++ b/TAO/tao/Messaging/Messaging_Policy_i.i @@ -1,17 +1,11 @@ -// -*- C++ -*- -// // $Id$ #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_Sync_Scope_Policy::get_synchronization (Messaging::SyncScope &s) const { s = this->synchronization_; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp index 21854a2d37a..480dc301af5 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/Messaging_RT_PolicyA.h" +#include "Messaging_RT_PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -73,4 +71,4 @@ namespace Messaging &_tao_tc_Messaging_RelativeRoundtripTimeoutPolicy; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.h b/TAO/tao/Messaging/Messaging_RT_PolicyA.h index 97eb8c77a6a..02ca2ce7790 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/Messaging_RT_PolicyC.h" #include "tao/AnyTypeCode/TimeBaseA.h" #include "tao/AnyTypeCode/PolicyA.h" @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -62,8 +60,6 @@ namespace Messaging } // module Messaging -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 9fef86e1a69..8b89e1d6b0d 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/Messaging_RT_PolicyC.h" +#include "Messaging_RT_PolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -168,5 +166,3 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 7c084869fb8..94187df87b4 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -58,8 +58,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -225,8 +223,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp index a431f947a2c..587d65ab1a9 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/Messaging_SyncScope_PolicyA.h" +#include "Messaging_SyncScope_PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -53,4 +51,4 @@ namespace Messaging &_tao_tc_Messaging_SyncScopePolicy; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h index f330605f5b5..daa19a0c347 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/Messaging_SyncScope_PolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Messaging_SyncScopeA.h" @@ -42,9 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -58,8 +55,6 @@ namespace Messaging } // module Messaging -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index df474e3ac0e..ff6a8d19564 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/Messaging_SyncScope_PolicyC.h" +#include "Messaging_SyncScope_PolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -168,5 +166,3 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index c22a5b02446..8354217f535 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -58,8 +58,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -219,8 +217,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp index 133a1701ad9..8de6c9b59be 100644 --- a/TAO/tao/Messaging/OldExceptionHolderA.cpp +++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/OldExceptionHolderA.h" +#include "OldExceptionHolderA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -43,8 +43,6 @@ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_defn.cpp:937 @@ -189,6 +187,4 @@ operator>>= ( #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h index 11613cef0bd..428e264c75d 100644 --- a/TAO/tao/Messaging/OldExceptionHolderA.h +++ b/TAO/tao/Messaging/OldExceptionHolderA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/OldExceptionHolderC.h" #include "tao/AnyTypeCode/OctetSeqA.h" @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -79,8 +77,6 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi #endif -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp index e26cccea3c6..a51fe765e3c 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.cpp +++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp @@ -29,18 +29,16 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/OldExceptionHolderC.h" +#include "OldExceptionHolderC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -#include "tao/Messaging/OldExceptionHolderC.inl" +#include "OldExceptionHolderC.inl" #endif /* !defined INLINE */ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 @@ -339,6 +337,4 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h index a3bcc4ed8bb..6c4049eb423 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.h +++ b/TAO/tao/Messaging/OldExceptionHolderC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/Valuetype/ValueFactory.h" @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -290,10 +288,8 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Messaging/OldExceptionHolderC.inl" +#include "OldExceptionHolderC.inl" #endif /* defined INLINE */ #endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl index c2586897783..0e9229fa8d4 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.inl +++ b/TAO/tao/Messaging/OldExceptionHolderC.inl @@ -31,8 +31,6 @@ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE Messaging::ExceptionHolder::ExceptionHolder (void) {} @@ -43,6 +41,4 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id () return "IDL:omg.org/Messaging/ExceptionHolder:1.0"; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* */ diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp index 71789ae1651..b2a14c34a8a 100644 --- a/TAO/tao/Messaging/PollableC.cpp +++ b/TAO/tao/Messaging/PollableC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/PollableC.h" +#include "PollableC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -45,8 +45,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -699,4 +697,3 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/PollableC.h b/TAO/tao/Messaging/PollableC.h index a8a9e8e9011..9a76deac2d3 100644 --- a/TAO/tao/Messaging/PollableC.h +++ b/TAO/tao/Messaging/PollableC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -56,8 +56,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -577,8 +575,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp index 66682024c37..82aadf99bb3 100644 --- a/TAO/tao/Messaging/TAO_ExtA.cpp +++ b/TAO/tao/Messaging/TAO_ExtA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/Messaging/TAO_ExtA.h" +#include "TAO_ExtA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -35,8 +35,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -53,4 +51,4 @@ namespace TAO &_tao_tc_TAO_ConnectionTimeoutPolicy; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Messaging/TAO_ExtA.h b/TAO/tao/Messaging/TAO_ExtA.h index a0d32a204b9..c83d58ed9e0 100644 --- a/TAO/tao/Messaging/TAO_ExtA.h +++ b/TAO/tao/Messaging/TAO_ExtA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/Messaging/TAO_ExtC.h" #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/TimeBaseA.h" @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -57,8 +55,6 @@ namespace TAO } // module TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 03b5f8f2aa8..597218703ad 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/Messaging/TAO_ExtC.h" +#include "TAO_ExtC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -168,5 +166,3 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 630976761af..edc68f14de5 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Messaging/messaging_export.h" +#include "messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -58,8 +58,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -219,8 +217,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl index 7775f89e4d1..7467a10720a 100644 --- a/TAO/tao/Messaging_PolicyValue.pidl +++ b/TAO/tao/Messaging_PolicyValue.pidl @@ -23,8 +23,8 @@ #ifndef TAO_MESSAGING_POLICYVALUE_PIDL #define TAO_MESSAGING_POLICYVALUE_PIDL -#include "tao/IOP_IOR.pidl" -#include "tao/Policy_Forward.pidl" +#include <IOP_IOR.pidl> +#include <Policy_Forward.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index d9e437f2c76..3bb08c79911 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/Messaging_PolicyValueC.h" +#include "Messaging_PolicyValueC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -208,5 +206,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index 9b48af9e2e6..abe0c4f2eb5 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -196,8 +194,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index 3b1402d9033..b515509a832 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/Messaging_SyncScopeC.h" +#include "Messaging_SyncScopeC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,12 +39,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index 4658f3d4e02..61b17540188 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace Messaging { @@ -108,8 +106,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 68df7c44eb5..5e8e70d012a 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -3,16 +3,14 @@ #include "tao/Muxed_TMS.h" #include "tao/Reply_Dispatcher.h" #include "tao/debug.h" -#include "tao/Transport.h" -#include "tao/ORB_Core.h" -#include "tao/Client_Strategy_Factory.h" +#include "Transport.h" +#include "ORB_Core.h" +#include "Client_Strategy_Factory.h" ACE_RCSID (tao, Muxed_TMS, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Muxed_TMS::TAO_Muxed_TMS (TAO_Transport *transport) : TAO_Transport_Mux_Strategy (transport) , request_id_generator_ (0) @@ -203,7 +201,7 @@ TAO_Muxed_TMS::clear_cache (void) if (this->dispatcher_table_.current_size () == 0) return -1; - REQUEST_DISPATCHER_TABLE::ITERATOR const end = + REQUEST_DISPATCHER_TABLE::ITERATOR end = this->dispatcher_table_.end (); ACE_Unbounded_Stack <TAO_Reply_Dispatcher *> ubs; @@ -215,7 +213,7 @@ TAO_Muxed_TMS::clear_cache (void) ubs.push ((*i).int_id_); this->dispatcher_table_.unbind_all (); - size_t const sz = ubs.size (); + size_t sz = ubs.size (); for (size_t k = 0 ; k != sz ; ++k) { @@ -229,4 +227,3 @@ TAO_Muxed_TMS::clear_cache (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index 77aa902177a..30b055963b3 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -15,18 +15,15 @@ #define TAO_MUXED_TMS_H #include /**/ "ace/pre.h" - -#include "tao/Transport_Mux_Strategy.h" +#include "ace/Hash_Map_Manager_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Hash_Map_Manager_T.h" #include "ace/Null_Mutex.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Transport_Mux_Strategy.h" class TAO_ORB_Core; class TAO_Pluggable_Reply_Params; @@ -91,8 +88,6 @@ protected: int clear_cache (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* MUXED_TMS_H */ diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp index 063f473ac6d..a79fd8fde97 100644 --- a/TAO/tao/NVList_Adapter.cpp +++ b/TAO/tao/NVList_Adapter.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/NVList_Adapter.h" @@ -6,10 +6,7 @@ ACE_RCSID (tao, NVList_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NVList_Adapter::~TAO_NVList_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index e9bc13af0ec..207d5c2e014 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,13 +21,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" - #include "ace/Service_Object.h" +#include "tao/Basic_Types.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class NVList; @@ -58,7 +55,5 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NVLIST_ADAPTER_H */ diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp index 5edd8e55e60..3139d42ad27 100644 --- a/TAO/tao/New_Leader_Generator.cpp +++ b/TAO/tao/New_Leader_Generator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/New_Leader_Generator.h" +#include "New_Leader_Generator.h" ACE_RCSID (tao, @@ -8,10 +8,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_New_Leader_Generator::~TAO_New_Leader_Generator (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h index fdb96209dea..17d4dd6cae1 100644 --- a/TAO/tao/New_Leader_Generator.h +++ b/TAO/tao/New_Leader_Generator.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_New_Leader_Generator * @@ -44,8 +42,6 @@ public: virtual void no_leaders_available (void) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NEW_LEADER_GENERATOR_H */ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index a4554a2ed2b..ada0052ef94 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1,37 +1,37 @@ // "$Id$" -#include "tao/ORB.h" +#include "ORB.h" ACE_RCSID (tao, ORB, "$Id$") -#include "tao/ORB_Table.h" -#include "tao/Connector_Registry.h" -#include "tao/IOR_Parser.h" -#include "tao/Stub.h" -#include "tao/ORB_Core.h" -#include "tao/ORB_Core_TSS_Resources.h" -#include "tao/TAO_Internal.h" -#include "tao/Dynamic_Adapter.h" -#include "tao/Profile.h" -#include "tao/default_ports.h" -#include "tao/ORBInitializer_Registry_Adapter.h" -#include "tao/PolicyFactory_Registry_Adapter.h" -#include "tao/NVList_Adapter.h" -#include "tao/TAO_Singleton_Manager.h" -#include "tao/Policy_Current.h" -#include "tao/Policy_Manager.h" -#include "tao/Valuetype_Adapter.h" -#include "tao/IFR_Client_Adapter.h" -#include "tao/TypeCodeFactory_Adapter.h" -#include "tao/debug.h" -#include "tao/CDR.h" -#include "tao/SystemException.h" -#include "tao/default_environment.h" +#include "ORB_Table.h" +#include "Connector_Registry.h" +#include "IOR_Parser.h" +#include "Stub.h" +#include "ORB_Core.h" +#include "ORB_Core_TSS_Resources.h" +#include "TAO_Internal.h" +#include "Dynamic_Adapter.h" +#include "Profile.h" +#include "default_ports.h" +#include "ORBInitializer_Registry_Adapter.h" +#include "PolicyFactory_Registry_Adapter.h" +#include "NVList_Adapter.h" +#include "TAO_Singleton_Manager.h" +#include "Policy_Current.h" +#include "Policy_Manager.h" +#include "Valuetype_Adapter.h" +#include "IFR_Client_Adapter.h" +#include "TypeCodeFactory_Adapter.h" +#include "debug.h" +#include "CDR.h" +#include "SystemException.h" +#include "default_environment.h" #if !defined (__ACE_INLINE__) -# include "tao/ORB.i" +# include "ORB.i" #endif /* ! __ACE_INLINE__ */ #include "ace/Dynamic_Service.h" @@ -51,6 +51,7 @@ void TAO_unexpected_exception_handler (void) } #endif /* ACE_HAS_EXCEPTIONS */ + static const char ior_prefix[] = "IOR:"; // = Static initialization. @@ -63,8 +64,6 @@ namespace // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::ORB::InvalidName::InvalidName (void) : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", "InvalidName") @@ -188,7 +187,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ()))); + ACE_TEXT_TO_TCHAR_IN (this->orb_core ()->orbid ()))); } this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1452,7 +1451,7 @@ CORBA::ORB_init (int &argc, if (arg_shifter.is_parameter_next ()) { orbid_string = - ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ()); + ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()); arg_shifter.consume_arg (); } } @@ -1464,9 +1463,9 @@ CORBA::ORB_init (int &argc, // but we should skip an optional space... if (current_arg[orbid_len] == ' ') orbid_string = - ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len + 1); + ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len + 1); else - orbid_string = ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len); + orbid_string = ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len); } else arg_shifter.ignore_arg (); @@ -1562,7 +1561,7 @@ CORBA::ORB_init (int &argc, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) created new ORB <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (orbid_string.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (orbid_string.c_str ()))); } // Before returning remember to store the ORB into the table... @@ -2022,4 +2021,3 @@ CORBA::ORB::lookup_value_factory (const char *repository_id return this->orb_core ()->valuetype_adapter ()->vf_map_find (repository_id); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index a02b90d56da..cecd70319ed 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -19,26 +19,24 @@ #include /**/ "ace/pre.h" -#include "tao/UserException.h" +#include "UserException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orb_typesC.h" -#include "tao/objectid.h" -#include "tao/CORBA_methods.h" -#include "tao/VarOut_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" -#include "tao/Sequence_T.h" -#include "tao/Policy_ForwardC.h" +#include "orb_typesC.h" +#include "objectid.h" +#include "CORBA_methods.h" +#include "VarOut_T.h" +#include "Seq_Var_T.h" +#include "Seq_Out_T.h" +#include "Sequence_T.h" +#include "Policy_ForwardC.h" #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - typedef enum { TAO_SERVICEID_NAMESERVICE, @@ -483,9 +481,9 @@ namespace CORBA * appropriate @c ACE_Time_Value as described in run(). **/ void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void perform_work (ACE_Time_Value &tv + void perform_work (ACE_Time_Value & ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void perform_work (ACE_Time_Value *tv + void perform_work (ACE_Time_Value * ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** @@ -672,7 +670,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/ORB.i" diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i index 81c1e4ae8e0..16a9d6be7e6 100644 --- a/TAO/tao/ORB.i +++ b/TAO/tao/ORB.i @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // --------------------------------------------------------------------------- // ORB specific @@ -11,9 +10,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong CORBA::ORB::_incr_refcnt (void) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, - guard, - lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, + guard, + lock_, 0); return ++this->refcount_; } @@ -89,4 +88,3 @@ CORBA::release (CORBA::ORB_ptr obj) obj->_decr_refcnt (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 0d88b73a39c..b025c20488c 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -1,10 +1,10 @@ -#include "tao/ORBInitializer_Registry.h" -#include "tao/ORBInitializer_Registry_Adapter.h" -#include "tao/PortableInterceptorC.h" -#include "tao/ORB.h" -#include "tao/ORB_Constants.h" -#include "tao/TAO_Singleton_Manager.h" -#include "tao/SystemException.h" +#include "ORBInitializer_Registry.h" +#include "ORBInitializer_Registry_Adapter.h" +#include "PortableInterceptorC.h" +#include "ORB.h" +#include "ORB_Constants.h" +#include "TAO_Singleton_Manager.h" +#include "SystemException.h" #include "ace/Service_Config.h" #include "ace/Dynamic_Service.h" @@ -19,8 +19,6 @@ ACE_RCSID (tao, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { void @@ -86,4 +84,3 @@ namespace PortableInterceptor } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h index 677e4c50436..0169e5df76b 100644 --- a/TAO/tao/ORBInitializer_Registry.h +++ b/TAO/tao/ORBInitializer_Registry.h @@ -15,18 +15,15 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Environment.h" -#include "tao/default_environment.h" - #include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Environment.h" +#include "default_environment.h" namespace PortableInterceptor { @@ -41,8 +38,6 @@ namespace PortableInterceptor ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ORB_INITIALIZER_REGISTRY_H */ diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp index 1798764e211..75cd36c8285 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp +++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp @@ -1,18 +1,14 @@ -// $Id$ +//$Id$ -#include "tao/ORBInitializer_Registry_Adapter.h" +#include "ORBInitializer_Registry_Adapter.h" ACE_RCSID (tao, ORBInitializer_Registry_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ORBInitializer_Registry_Adapter::~ORBInitializer_Registry_Adapter (void) { } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 4515f10ec11..ffd9b863d58 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -15,18 +15,16 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" -#include "tao/SystemException.h" #include "ace/Service_Object.h" #include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Basic_Types.h" +#include "tao/SystemException.h" class TAO_ORB_Core; @@ -97,8 +95,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ORB_INITIALIZER_REGISTRY_ADAPTER_H */ diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h index b7e090dcedf..6e324f0f908 100644 --- a/TAO/tao/ORB_Constants.h +++ b/TAO/tao/ORB_Constants.h @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // A hash define for the regular two way operation. #define TAO_TWOWAY_RESPONSE_FLAG 255 @@ -236,8 +234,6 @@ const CORBA::ULong TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE = (0x15U << 7); //@} //@} -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ORB_CONSTANTS_H */ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 74bca60c41d..4bc1b51a0c9 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1,45 +1,45 @@ // $Id$ -#include "tao/ORB_Core.h" -#include "tao/ORB_Core_TSS_Resources.h" -#include "tao/ORB_Table.h" -#include "tao/TAO_Internal.h" -#include "tao/default_server.h" -#include "tao/Profile.h" -#include "tao/Stub.h" -#include "tao/LF_Follower.h" -#include "tao/Leader_Follower.h" -#include "tao/LF_Event_Loop_Thread_Helper.h" -#include "tao/Connector_Registry.h" -#include "tao/Transport_Queueing_Strategies.h" -#include "tao/Object_Loader.h" -#include "tao/ObjectIdListC.h" -#include "tao/BiDir_Adapter.h" -#include "tao/Collocation_Resolver.h" -#include "tao/Flushing_Strategy.h" -#include "tao/Request_Dispatcher.h" -#include "tao/Stub_Factory.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Thread_Lane_Resources_Manager.h" -#include "tao/TSS_Resources.h" -#include "tao/Protocols_Hooks.h" -#include "tao/IORInterceptor_Adapter.h" -#include "tao/IORInterceptor_Adapter_Factory.h" -#include "tao/debug.h" -#include "tao/TAOC.h" -#include "tao/Endpoint_Selector_Factory.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/Adapter_Factory.h" -#include "tao/Adapter.h" -#include "tao/GUIResource_Factory.h" -#include "tao/PolicyFactory_Registry_Adapter.h" -#include "tao/PolicyFactory_Registry_Factory.h" -#include "tao/ORBInitializer_Registry_Adapter.h" -#include "tao/Codeset_Manager.h" +#include "ORB_Core.h" +#include "ORB_Core_TSS_Resources.h" +#include "ORB_Table.h" +#include "TAO_Internal.h" +#include "default_server.h" +#include "Profile.h" +#include "Stub.h" +#include "LF_Follower.h" +#include "Leader_Follower.h" +#include "LF_Event_Loop_Thread_Helper.h" +#include "Connector_Registry.h" +#include "Transport_Queueing_Strategies.h" +#include "Object_Loader.h" +#include "ObjectIdListC.h" +#include "BiDir_Adapter.h" +#include "Collocation_Resolver.h" +#include "Flushing_Strategy.h" +#include "Request_Dispatcher.h" +#include "Stub_Factory.h" +#include "Thread_Lane_Resources.h" +#include "Thread_Lane_Resources_Manager.h" +#include "TSS_Resources.h" +#include "Protocols_Hooks.h" +#include "IORInterceptor_Adapter.h" +#include "IORInterceptor_Adapter_Factory.h" +#include "debug.h" +#include "TAOC.h" +#include "Endpoint_Selector_Factory.h" +#include "Client_Strategy_Factory.h" +#include "Adapter_Factory.h" +#include "Adapter.h" +#include "GUIResource_Factory.h" +#include "PolicyFactory_Registry_Adapter.h" +#include "PolicyFactory_Registry_Factory.h" +#include "ORBInitializer_Registry_Adapter.h" +#include "Codeset_Manager.h" #if (TAO_HAS_CORBA_MESSAGING == 1) -#include "tao/Policy_Manager.h" -#include "tao/Policy_Current.h" +#include "Policy_Manager.h" +#include "Policy_Current.h" #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #include "ace/Reactor.h" @@ -68,15 +68,13 @@ #if !defined (__ACE_INLINE__) -# include "tao/ORB_Core.i" +# include "ORB_Core.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, ORB_Core, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // **************************************************************** CORBA::Environment& @@ -132,7 +130,7 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void) iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"), valuetype_adapter_name_ ("Valuetype_Adapter"), poa_factory_name_ ("TAO_Object_Adapter_Factory"), - poa_factory_directive_ (ACE_TEXT_ALWAYS_CHAR (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_TAO_Object_Adapter_Factory", ""))) + poa_factory_directive_ (ACE_TEXT_TO_CHAR_IN (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_TAO_Object_Adapter_Factory", ""))) { } @@ -140,11 +138,6 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void) TAO_ORB_Core::TAO_ORB_Core (const char *orbid) : protocols_hooks_ (0), -#if TAO_USE_LOCAL_MEMORY_POOL == 1 - use_local_memory_pool_ (true), -#else - use_local_memory_pool_ (false), -#endif lock_ (), thread_lane_resources_manager_ (0), collocation_resolver_ (0), @@ -331,9 +324,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // Use TCP_NODELAY. int nodelay = 1; - // Use SO_KEEPALIVE (default 0). - int so_keepalive = 0; - // Use dotted decimal addresses // @@ This option will be treated as a suggestion to each loaded // protocol to use a character representation for the numeric @@ -390,7 +380,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) //////////////////////////////////////////////////////////////// // begin with the 'parameterless' flags // //////////////////////////////////////////////////////////////// - if (0 != (current_arg = arg_shifter.get_the_parameter + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDottedDecimalAddresses")))) { // Use dotted decimal addresses @@ -400,7 +390,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoServerSideNameLookups")))) { // Don't look up the host name for incoming connections @@ -409,7 +399,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNameServicePort")))) { // Specify the port number for the NameService. @@ -419,7 +409,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBMulticastDiscoveryEndpoint")))) { // Specify mcast address:port@network_interface for the @@ -428,11 +418,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // If there is a '@' also, it means that the network // interface name is specified. this->orb_params ()->mcast_discovery_endpoint ( - ACE_TEXT_ALWAYS_CHAR(current_arg)); + ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNodelay")))) { // Use TCP_NODELAY or not. @@ -441,16 +431,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBKeepalive")))) - { - // Use SO_KEEPALIVE or not. - so_keepalive = - ACE_OS::atoi (current_arg); - - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBTradingServicePort")))) { // Specify the port number for the TradingService. @@ -459,7 +440,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBImplRepoServicePort")))) { // Specify the multicast port number for the Implementation @@ -468,7 +449,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRcvSock")))) { // @@ All protocol implementation may not use sockets, so @@ -481,7 +462,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSndSock")))) { // @@ All protocol implementation may not use sockets, so @@ -493,7 +474,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBObjRefStyle")))) { // Specifies the style of printed objrefs: URL or IOR @@ -523,7 +504,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCollocationStrategy")))) { // Specify which collocation policy we want to use. @@ -535,7 +516,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCollocation")))) { // Specify whether we want to optimize against collocation @@ -567,11 +548,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPreferredInterfaces")))) { if (this->orb_params ()->preferred_interfaces ( - ACE_TEXT_ALWAYS_CHAR (current_arg)) == false) + ACE_TEXT_TO_CHAR_IN (current_arg)) == false) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( TAO_ORB_CORE_INIT_LOCATION_CODE, @@ -581,14 +562,15 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEnforcePreferredInterfaces")))) { - int enforce_pref_interfaces = ACE_OS::atoi (current_arg); - if (enforce_pref_interfaces) - this->orb_params ()->enforce_pref_interfaces (false); - else + if (ACE_OS::strcasecmp (current_arg, + ACE_TEXT("YES")) == 0) this->orb_params ()->enforce_pref_interfaces (true); + else if (ACE_OS::strcasecmp (current_arg, + ACE_TEXT("NO")) == 0) + this->orb_params ()->enforce_pref_interfaces (false); arg_shifter.consume_arg (); } @@ -596,10 +578,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPreferIPV6Interfaces")))) { - int prefer_ipv6_interfaces = ACE_OS::atoi (current_arg); - if (prefer_ipv6_interfaces) + if (ACE_OS::strcasecmp (current_arg, + ACE_TEXT("YES")) == 0) this->orb_params ()->prefer_ipv6_interfaces (true); - else + else if (ACE_OS::strcasecmp (current_arg, + ACE_TEXT("NO")) == 0) this->orb_params ()->prefer_ipv6_interfaces (false); arg_shifter.consume_arg (); @@ -607,16 +590,17 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBConnectIPV6Only")))) { - int connect_ipv6_only = ACE_OS::atoi (current_arg); - if (connect_ipv6_only) + if (ACE_OS::strcasecmp (current_arg, + ACE_TEXT("YES")) == 0) this->orb_params ()->connect_ipv6_only (true); - else + else if (ACE_OS::strcasecmp (current_arg, + ACE_TEXT("NO")) == 0) this->orb_params ()->connect_ipv6_only (false); arg_shifter.consume_arg (); } #endif /* ACE_HAS_IPV6 */ - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCDRTradeoff")))) { cdr_tradeoff = ACE_OS::atoi (current_arg); @@ -627,7 +611,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // A new <ObjectID>:<IOR> mapping has been specified. This will be // used by the resolve_initial_references (). - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBInitRef")))) { const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '='); @@ -644,9 +628,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::COMPLETED_NO), -1); } - ACE_CString object_id (ACE_TEXT_ALWAYS_CHAR(current_arg), + ACE_CString object_id (ACE_TEXT_TO_CHAR_IN(current_arg), pos - current_arg); - ACE_CString IOR (ACE_TEXT_ALWAYS_CHAR(pos + 1)); + ACE_CString IOR (ACE_TEXT_TO_CHAR_IN(pos + 1)); if (!this->init_ref_map_.insert ( std::make_pair (InitRefMap::key_type (object_id), InitRefMap::data_type (IOR))).second) @@ -664,22 +648,22 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) } arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDefaultInitRef")))) { // Set the list of prefixes from -ORBDefaultInitRef. - this->orb_params ()->default_init_ref (ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->orb_params ()->default_init_ref (ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBStdProfileComponents")))) { std_profile_components = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBResources")))) { ACE_DEBUG ((LM_WARNING, @@ -688,7 +672,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLogFile")))) { // redirect all ACE_DEBUG and ACE_ERROR output to a file @@ -727,7 +711,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (-1); - output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name), ios::out | ios::app); + output_stream->open (ACE_TEXT_TO_CHAR_IN (file_name), ios::out | ios::app); if (!output_stream->bad ()) { @@ -740,7 +724,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBVerboseLogging")))) { unsigned long verbose_logging = ACE_OS::atoi (current_arg); @@ -765,7 +749,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) (ACE_LOG_MSG->*flagop)(value); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseIMR")))) { // Use IR or not. @@ -773,14 +757,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIMREndpointsInIOR")))) { this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBid")))) { // The ORBid is actually set in ORB_init(), and then passed @@ -799,24 +783,24 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBServerId")))) { // The this->server_id_ is to uniquely identify a server to // an IMR. // Fill in later. - this->server_id_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); + this->server_id_.set(ACE_TEXT_TO_CHAR_IN(current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLingerTimeout")))) { linger = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEndpoint")))) { // Each "endpoint" is of the form: @@ -839,13 +823,13 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // All endpoint strings should be of the above form(s). this->set_endpoint_helper (TAO_DEFAULT_LANE, - ACE_TEXT_ALWAYS_CHAR (current_arg) + ACE_TEXT_TO_CHAR_IN (current_arg) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBListenEndpoints")))) { // This option is similar to the -ORBEndPoint option. May be @@ -854,16 +838,16 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // used. this->set_endpoint_helper (TAO_DEFAULT_LANE, - ACE_TEXT_ALWAYS_CHAR (current_arg) + ACE_TEXT_TO_CHAR_IN (current_arg) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); arg_shifter.consume_arg (); } - else if ((0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBLaneEndpoint")))) || - (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBLaneListenEndpoints"))))) + else if ((current_arg = arg_shifter.get_the_parameter + (ACE_TEXT("-ORBLaneEndpoint"))) || + (current_arg = arg_shifter.get_the_parameter + (ACE_TEXT("-ORBLaneListenEndpoints")))) { // This option is similar to the -ORBEndPoint option but // specifies endpoints for each lane. @@ -871,13 +855,13 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) if (arg_shifter.is_option_next ()) return -1; - ACE_CString lane (ACE_TEXT_ALWAYS_CHAR (current_arg)); + ACE_CString lane (ACE_TEXT_TO_CHAR_IN (current_arg)); arg_shifter.consume_arg (); if(arg_shifter.is_option_next ()) return -1; - ACE_CString endpoints (ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ())); + ACE_CString endpoints (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ())); arg_shifter.consume_arg (); this->set_endpoint_helper (lane, @@ -885,7 +869,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoProprietaryActivation")))) { // This option can be used to set to not use any proprietary @@ -898,7 +882,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseSharedProfile")))) { this->orb_params ()->shared_profile @@ -906,14 +890,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNegotiateCodesets")))) { negotiate_codesets = (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSingleReadOptimization")))) { this->orb_params ()->single_read_optimization @@ -921,21 +905,24 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDisableRTCollocation")))) { - int disable_rt_collocation = ACE_OS::atoi (current_arg); - if (disable_rt_collocation) - this->orb_params ()->disable_rt_collocation_resolver (true); + const ACE_TCHAR *popt = current_arg; + if (ACE_OS::strcasecmp (popt, ACE_TEXT("NO")) == 0) + { + this->orb_params ()->disable_rt_collocation_resolver (false); + } + else if (ACE_OS::strcasecmp (popt, ACE_TEXT("YES")) == 0) + { + this->orb_params ()->disable_rt_collocation_resolver (true); + } else - this->orb_params ()->disable_rt_collocation_resolver (false); - - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_LIB_TEXT("-ORBUseLocalMemoryPool")))) - { - this->use_local_memory_pool_ = (0 != ACE_OS::atoi (current_arg)); + { + // Should we print an error mesg?? Probably we + // should. We will look into this after 1.4 and make all + // the options consistent. + } arg_shifter.consume_arg (); } @@ -1034,10 +1021,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) -1); } - // Set whether or not to use the local memory pool for the cdr allocators. - - trf->use_local_memory_pool (this->use_local_memory_pool_); - // @@ ???? // Make sure the reactor is initialized... ACE_Reactor *reactor = this->reactor (); @@ -1145,7 +1128,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) || dotted_decimal_addresses); this->orb_params ()->linger (linger); this->orb_params ()->nodelay (nodelay); - this->orb_params ()->sock_keepalive (so_keepalive); if (rcv_sock_size >= 0) this->orb_params ()->sock_rcvbuf_size (rcv_sock_size); if (snd_sock_size >= 0) @@ -1162,7 +1144,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) else if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) ORB_Core: ") + ACE_TEXT("(%P|%t) ORB_Core: ") ACE_TEXT("Codeset Manager not available\n"))); // Set up the pluggable protocol infrastructure. First get a @@ -1254,7 +1236,7 @@ TAO_ORB_Core::fini (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Destroying ORB <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->orbid_))); + ACE_TEXT_TO_TCHAR_IN (this->orbid_))); } // Finalize lane resources. @@ -1450,7 +1432,7 @@ TAO_ORB_Core::policy_factory_registry_i (void) if (loader == 0) { ACE_Service_Config::process_directive ( - ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader", + ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_PolicyFactory_Registry_Factory", "TAO_PI", "_make_PolicyFactory_Loader", "")); @@ -1665,7 +1647,7 @@ TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL) if (factory == 0) { ACE_Service_Config::process_directive ( - ACE_TEXT_CHAR_TO_TCHAR ( + ACE_TEXT_TO_TCHAR_IN ( static_resources->poa_factory_directive_.c_str())); factory = ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ( @@ -1804,91 +1786,54 @@ TAO_ORB_Core::create_object (TAO_Stub *stub) // @@ We should thow CORBA::NO_MEMORY in platforms with exceptions, // but we are stuck in platforms without exceptions! - TAO_ORB_Core_Auto_Ptr collocated_orb_core; - CORBA::Object_ptr x = 0; - + CORBA::Object_ptr x; { - // Lock the ORB_Table against concurrent modification while we - // iterate through the ORBs. ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, - TAO::ORB_Table::instance()->lock_, + this->lock_, CORBA::Object::_nil ()); TAO::ORB_Table * const table = TAO::ORB_Table::instance (); TAO::ORB_Table::iterator const end = table->end (); for (TAO::ORB_Table::iterator i = table->begin (); i != end; ++i) { - ::TAO_ORB_Core * const other_core = (*i).second.core (); + TAO_ORB_Core * const other_core = (*i).second.core (); if (this->is_collocation_enabled (other_core, mprofile)) { - other_core->_incr_refcnt(); - TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core); - collocated_orb_core = tmp_auto_ptr; - break; + TAO_Adapter_Registry *ar = + other_core->adapter_registry (); + + return ar->create_collocated_object (stub, + mprofile); } } } - if (collocated_orb_core.get ()) - { - TAO_Adapter_Registry *ar = - collocated_orb_core.get ()->adapter_registry (); - - x = ar->create_collocated_object (stub, - mprofile); - } - - - if (!x) - { - // The constructor sets the proxy broker as the - // Remote one. - ACE_NEW_RETURN (x, - CORBA::Object (stub, 0), - 0); - } - + // The constructor sets the proxy broker as the + // Remote one. + ACE_NEW_RETURN (x, + CORBA::Object (stub, 0), + 0); return x; } CORBA::Long TAO_ORB_Core::initialize_object (TAO_Stub *stub, - CORBA::Object_ptr) + CORBA::Object_ptr obj) { // @@ What about forwarding. With this approach we are never forwarded // when we use collocation! const TAO_MProfile &mprofile = stub->base_profiles (); - - return initialize_object_i (stub, - mprofile); -} - -CORBA::Long -TAO_ORB_Core::reinitialize_object (TAO_Stub *stub) -{ - return initialize_object_i (stub, stub->forward_profiles () - ? *(stub->forward_profiles ()) - : stub->base_profiles ()); -} - -CORBA::Long -TAO_ORB_Core::initialize_object_i (TAO_Stub *stub, - const TAO_MProfile &mprofile) - -{ - CORBA::Long retval = 0; - TAO_ORB_Core_Auto_Ptr collocated_orb_core; - { - // Lock the ORB_Table against concurrent modification while we - // iterate through the ORBs. + // @@ Ossama: maybe we need another lock for the table, to + // reduce contention on the Static_Object_Lock below, if so + // then we need to use that lock in the ORB_init() function. ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, - TAO::ORB_Table::instance()->lock_, + this->lock_, 0)); TAO::ORB_Table * const table = TAO::ORB_Table::instance (); @@ -1900,23 +1845,16 @@ TAO_ORB_Core::initialize_object_i (TAO_Stub *stub, if (this->is_collocation_enabled (other_core, mprofile)) { - other_core->_incr_refcnt (); - TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core); - collocated_orb_core = tmp_auto_ptr; - break; + TAO_Adapter_Registry * const ar = + other_core->adapter_registry (); + + return ar->initialize_collocated_object (stub, + obj); } } } - if (collocated_orb_core.get ()) - { - TAO_Adapter_Registry *ar = - collocated_orb_core.get ()->adapter_registry (); - - retval = ar->initialize_collocated_object (stub); - } - - return retval; + return 0; } CORBA::Boolean @@ -2136,7 +2074,6 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion #if (TAO_HAS_INTERCEPTORS == 1) CORBA::release (this->pi_current_); - this->pi_current_ = CORBA::Object::_nil (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ } ACE_CATCHALL @@ -2202,8 +2139,6 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { - ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); - #if TAO_HAS_INTERCEPTORS == 1 if (this->client_request_interceptor_adapter_ != 0) { @@ -2266,7 +2201,7 @@ TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL) if (loader == 0) { ACE_Service_Config::process_directive ( - ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory_Loader", + ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory", "TAO_TypeCodeFactory", "_make_TAO_TypeCodeFactory_Loader", "")); @@ -2287,7 +2222,7 @@ TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL) if (loader == 0) { ACE_Service_Config::process_directive ( - ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory_Loader", + ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory", "TAO_CodecFactory", "_make_TAO_CodecFactory_Loader", "")); @@ -2445,7 +2380,7 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane, ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)\n") ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"), - ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(endpoints.c_str ()))); ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( TAO_ORB_CORE_INIT_LOCATION_CODE, @@ -2770,14 +2705,6 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook) TAO_ORB_Core_Static_Resources::instance ()-> sync_scope_hook_ = hook; } -int -TAO_ORB_Core::add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup, - size_t &slot_id) -{ - return this->tss_cleanup_funcs_.register_cleanup_function (cleanup, - slot_id); -} - void TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub, bool &has_timeout, @@ -2994,7 +2921,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Cannot initialize the " + "(%P|%t) Cannot initialize the " "ior_interceptor_adapter \n"); } ACE_ENDTRY; @@ -3057,6 +2984,7 @@ TAO_ORB_Core::clientrequestinterceptor_adapter_i (void) return this->client_request_interceptor_adapter_; } + void TAO_ORB_Core::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor @@ -3079,58 +3007,6 @@ TAO_ORB_Core::add_interceptor ( } } -void -TAO_ORB_Core::add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) -{ - if (this->clientrequestinterceptor_adapter_i ()) - { - this->client_request_interceptor_adapter_->add_interceptor ( - interceptor, - policies - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR: ORB Core unable to find the ") - ACE_TEXT ("Client Request Interceptor Adapter Factory instance"))); - - ACE_THROW (CORBA::INTERNAL ()); - } -} - -void -TAO_ORB_Core::add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) -{ - if (this->serverrequestinterceptor_adapter_i ()) - { - this->server_request_interceptor_adapter_->add_interceptor ( - interceptor, - policies - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR: ORB Core unable to find the ") - ACE_TEXT ("Server Request Interceptor Adapter Factory instance"))); - - ACE_THROW (CORBA::INTERNAL ()); - } -} - TAO::ServerRequestInterceptor_Adapter * TAO_ORB_Core::serverrequestinterceptor_adapter_i (void) { @@ -3245,4 +3121,3 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object return TAO::TAO_CS_REMOTE_STRATEGY; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 9eb8910fac2..5a10589e734 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -38,16 +38,6 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "ace/Array_Map.h" -#include "ace/Thread_Manager.h" -#include "ace/Lock_Adapter_T.h" -#include "ace/TSS_T.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Data_Block; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if TAO_HAS_INTERCEPTORS == 1 namespace TAO @@ -58,6 +48,13 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ +#include "ace/Thread_Manager.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/TSS_T.h" + +// Forward declarations +class ACE_Data_Block; + class TAO_Adapter; class TAO_Acceptor; class TAO_Connector; @@ -614,11 +611,6 @@ public: CORBA::Long initialize_object (TAO_Stub *the_stub, CORBA::Object_ptr obj); - /// Reinitialise a stub after the effective profile has changed. - /// This will happen after a location forward has been received - /// or if a location forward supplied new target subsequently fails. - CORBA::Long reinitialize_object (TAO_Stub *stub); - /// Return ORBid string. const char *orbid (void) const; @@ -796,18 +788,6 @@ public: PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL); - /// Register a client request interceptor with policies. - void add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - - /// Register a server request interceptor with policies. - void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - /// Get the Client Request Interceptor adapter. /// Will not create a new one if not available yet. TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (void); @@ -888,12 +868,6 @@ public: /// flush TAO::Transport_Queueing_Strategy &default_transport_queueing_strategy (void); - /// Verify condition for permanent forward is given, - /// both parameters must provide group attributes. - CORBA::Boolean is_permanent_forward_condition - (const CORBA::Object_ptr obj, - const TAO_Service_Context &service_context); - protected: /// Destructor is protected since the ORB Core is a reference @@ -967,10 +941,6 @@ protected: /// this ORB core. TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (void); - /// Common code from ::initialize_object and ::reinitialize_object - CORBA::Long initialize_object_i (TAO_Stub *the_stub, - const TAO_MProfile& mprofile); - private: /// The ORB Core should not be copied. @@ -998,8 +968,6 @@ private: #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - bool use_local_memory_pool_; - protected: /// Synchronize internal state... @@ -1400,10 +1368,8 @@ TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/ORB_Core.i" +# include "ORB_Core.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 1506949fb16..9a0eb2e3a5b 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -5,7 +5,6 @@ #include "tao/ORB_Core_TSS_Resources.h" #include "tao/ORB_Table.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong TAO_ORB_Core::_incr_refcnt (void) @@ -362,6 +361,14 @@ TAO_ORB_Core::set_tss_resource (size_t slot_id, void *ts_object) return 0; } +ACE_INLINE int +TAO_ORB_Core::add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup, + size_t &slot_id) +{ + return this->tss_cleanup_funcs_.register_cleanup_function (cleanup, + slot_id); +} + ACE_INLINE TAO_Cleanup_Func_Registry * TAO_ORB_Core::tss_cleanup_funcs (void) { @@ -631,23 +638,3 @@ TAO_ORB_Core::serverrequestinterceptor_adapter (void) } #endif /* TAO_HAS_INTERCEPTORS */ - -/// Verify condition for permanent forward is given, -/// both parameters must provide group attributes. -ACE_INLINE CORBA::Boolean -TAO_ORB_Core::is_permanent_forward_condition -(const CORBA::Object_ptr obj, - const TAO_Service_Context &service_context) -{ - const TAO_Service_Callbacks *service_callback = - this->fault_tolerance_service ().service_callback (); - - const CORBA::Boolean permanent_forward_condition = - service_callback && - service_callback->is_permanent_forward_condition (obj, - service_context); - - return permanent_forward_condition; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp index 068897c2c38..a0b908a54dd 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.cpp +++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp @@ -1,16 +1,14 @@ -#include "tao/ORB_Core_Auto_Ptr.h" -#include "tao/ORB_Core.h" +#include "ORB_Core_Auto_Ptr.h" +#include "ORB_Core.h" #if !defined (__ACE_INLINE__) -# include "tao/ORB_Core_Auto_Ptr.inl" +# include "ORB_Core_Auto_Ptr.inl" #endif /* !__ACE_INLINE */ ACE_RCSID (tao, ORB_Core_Auto_Ptr, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ORB_Core_Auto_Ptr::~TAO_ORB_Core_Auto_Ptr (void) { if (this->get () != 0) @@ -29,5 +27,3 @@ TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p) this->p_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h index 19de5c918f1..f99c4f79a9d 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.h +++ b/TAO/tao/ORB_Core_Auto_Ptr.h @@ -18,14 +18,6 @@ #include "tao/TAO_Export.h" -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; /** @@ -68,10 +60,8 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/ORB_Core_Auto_Ptr.inl" +# include "ORB_Core_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl index d9bd041e77c..50cc45b0bb5 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.inl +++ b/TAO/tao/ORB_Core_Auto_Ptr.inl @@ -2,9 +2,6 @@ // // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p) : p_ (p) @@ -55,5 +52,3 @@ TAO_ORB_Core_Auto_Ptr::operator *() const // @@ Potential problem if this->p_ is zero! return *this->get (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp index 64d57768dba..a9d364e90f2 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.cpp +++ b/TAO/tao/ORB_Core_TSS_Resources.cpp @@ -2,8 +2,6 @@ #include "tao/ORB_Core_TSS_Resources.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void) : event_loop_thread_ (0) , client_leader_thread_ (0) @@ -29,4 +27,4 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void) // this->orb_core_->tss_cleanup_funcs ()->cleanup (this->ts_objects_); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h index 8f5e0c3abb8..9488216500e 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.h +++ b/TAO/tao/ORB_Core_TSS_Resources.h @@ -22,10 +22,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" #include "ace/Array_Base.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/orbconf.h" class TAO_ORB_Core; @@ -85,7 +83,7 @@ public: TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL + #include /**/ "ace/post.h" #endif /* TAO_ORB_CORE_H */ diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index 8624370348c..e313b23ad18 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -1,9 +1,9 @@ -#include "tao/ORB_Table.h" -#include "tao/ORB_Core.h" -#include "tao/TAO_Singleton.h" +#include "ORB_Table.h" +#include "ORB_Core.h" +#include "TAO_Singleton.h" #if !defined (__ACE_INLINE__) -# include "tao/ORB_Table.inl" +# include "ORB_Table.inl" #endif /* ! __ACE_INLINE__ */ #include "ace/SString.h" @@ -17,8 +17,6 @@ ACE_RCSID (tao, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ORB_Table::ORB_Table (void) : lock_ (), first_orb_not_default_ (false), @@ -182,5 +180,3 @@ TAO::ORB_Table::instance (void) #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index 4838b0754da..1b35ae545b0 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -30,8 +30,6 @@ #include "ace/Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_ORB_Core; @@ -62,7 +60,6 @@ namespace TAO */ class TAO_Export ORB_Table { - friend class ::TAO_ORB_Core; public: /// Constructor @@ -87,7 +84,7 @@ namespace TAO //@{ iterator begin (void); iterator end (void); - int bind (const char *orb_id, ::TAO_ORB_Core *orb_core); + int bind (const char *orb_id, TAO_ORB_Core *orb_core); /// Return @c TAO_ORB_Core corresponding to ORB with given @a /// orb_id. @@ -95,16 +92,16 @@ namespace TAO * @note The caller must decrease the reference count on the * returned ORB_Core, i.e. the callers "owns" it. */ - ::TAO_ORB_Core* find (const char *orb_id); + TAO_ORB_Core* find (const char *orb_id); int unbind (const char *orb_id); //@} - ::TAO_ORB_Core * const * get_orbs (size_t& num_orbs); + TAO_ORB_Core * const * get_orbs (size_t& num_orbs); /// Obtain the first ORB for the @c ORB_Core_instance() /// implementation. - ::TAO_ORB_Core * first_orb (void); + TAO_ORB_Core * first_orb (void); /// Return a unique instance static ORB_Table * instance (void); @@ -128,12 +125,18 @@ namespace TAO /// Return @c TAO_ORB_Core corresponding to ORB with given @a /// orb_id. (underlying unlocked implementation). - ::TAO_ORB_Core * find_i (char const * orb_id); + TAO_ORB_Core * find_i (char const * orb_id); + + /// Update our list of orbs + /** + * @todo Where the implementation for ORB_Table::update_orbs? + */ + void update_orbs (void); private: /// Lock used to synchronize access to the internal state. - ::TAO_SYNCH_MUTEX lock_; + TAO_SYNCH_MUTEX lock_; /// Variable to check if the first ORB decides not to be the /// default. @@ -143,13 +146,13 @@ namespace TAO Table table_; /// The first ORB created by the user - ::TAO_ORB_Core * first_orb_; + TAO_ORB_Core * first_orb_; /// List of orbs for get_orbs call /** * @todo ORB_Table::orbs_ appears to be unused. Remove it? */ - ::TAO_ORB_Core ** orbs_; + TAO_ORB_Core ** orbs_; /// Number of ORBs in the table. size_t num_orbs_; @@ -173,7 +176,7 @@ namespace TAO ORB_Core_Ref_Counter (void); /// Constructor. - ORB_Core_Ref_Counter (::TAO_ORB_Core * core); + ORB_Core_Ref_Counter (TAO_ORB_Core * core); /// Destructor. ~ORB_Core_Ref_Counter (void); @@ -185,18 +188,16 @@ namespace TAO void operator= (ORB_Core_Ref_Counter const & rhs); /// ORB_Core pointer accessor. - ::TAO_ORB_Core * core (void) const { return this->core_; } + TAO_ORB_Core * core (void) const { return this->core_; } private: - ::TAO_ORB_Core * core_; + TAO_ORB_Core * core_; }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/ORB_Table.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl index b3145b1f2e0..cef161c5c7f 100644 --- a/TAO/tao/ORB_Table.inl +++ b/TAO/tao/ORB_Table.inl @@ -4,11 +4,8 @@ #include "tao/ORB_Core.h" -#include <algorithm> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE ::TAO_ORB_Core * +ACE_INLINE TAO_ORB_Core * TAO::ORB_Table::first_orb (void) { return this->first_orb_; @@ -26,7 +23,7 @@ TAO::ORB_Table::end (void) return this->table_.end (); } -ACE_INLINE ::TAO_ORB_Core* const * +ACE_INLINE TAO_ORB_Core* const * TAO::ORB_Table::get_orbs (size_t& num_orbs) { num_orbs = this->num_orbs_; @@ -49,7 +46,7 @@ TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (void) } ACE_INLINE -TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (::TAO_ORB_Core * core) +TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (TAO_ORB_Core * core) : core_ (core) { // ACE_ASSERT (core != 0); @@ -86,5 +83,3 @@ TAO::ORB_Core_Ref_Counter::operator= (TAO::ORB_Core_Ref_Counter const & rhs) TAO::ORB_Core_Ref_Counter tmp (rhs); std::swap (this->core_, tmp.core_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp index 76d44538b45..ccf1e5bb0fc 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp @@ -31,13 +31,11 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" -#include "tao/ObjRefTemplate/Default_ORTC.h" +#include "Default_ORTC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be/be_visitor_typecode/value_typecode.cpp:50 @@ -123,4 +121,4 @@ operator>>= ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp index b3a94f7c90a..f44925afb77 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/ObjRefTemplate/Default_ORTC.h" +#include "Default_ORTC.h" #include "tao/CDR.h" #include "tao/Valuetype/ValueFactory.h" @@ -38,14 +38,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/ObjRefTemplate/Default_ORTC.inl" +#include "Default_ORTC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -241,5 +239,3 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR true ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h index bf461b7efcd..f7f225bf63b 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.h +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ObjRefTemplate/ort_export.h" +#include "ort_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/ORB.h" @@ -67,8 +67,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Default_ORT { @@ -240,10 +238,8 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/ObjRefTemplate/Default_ORTC.inl" +#include "Default_ORTC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp index d670c3ab051..5ca97d9d64b 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h" -#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h" +#include "ORT_Adapter_Factory_Impl.h" +#include "ORT_Adapter_Impl.h" #include "tao/PortableServer/Root_POA.h" ACE_RCSID (ORT, ORT_Adapter_Factory_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ORT_Adapter * @@ -40,19 +38,14 @@ namespace TAO ace_svc_desc_ORT_Adapter_Factory_Impl ); } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ORT_Adapter_Factory_Impl, + ACE_TEXT ("Concrete_ORT_Adapter_Factory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ORT_Adapter_Factory_Impl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) -ACE_STATIC_SVC_DEFINE ( - ORT_Adapter_Factory_Impl, - ACE_TEXT ("Concrete_ORT_Adapter_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ORT_Adapter_Factory_Impl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - TAO_ORT, - ORT_Adapter_Factory_Impl, - TAO::ORT_Adapter_Factory_Impl) + ACE_FACTORY_DEFINE (TAO_ORT, ORT_Adapter_Factory_Impl) +} diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h index 397addb069c..a41c3ab9f84 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h @@ -21,11 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ObjRefTemplate/ort_export.h" +#include "ort_export.h" #include "tao/PortableServer/ORT_Adapter_Factory.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -51,17 +48,14 @@ namespace TAO // Used to force the initialization of the code. static int Initializer (void); }; + + ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl) + ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl) } static int TAO_Requires_ORTFactory_Initializer = TAO::ORT_Adapter_Factory_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (ORT_Adapter_Factory_Impl) -ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl) - - #define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" #undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp index 1e697edc9cc..050be03e0dc 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h" +#include "ORT_Adapter_Impl.h" #include "tao/PortableServer/Root_POA.h" #include "tao/CORBA_String.h" #include "tao/ORB_Constants.h" @@ -11,8 +11,6 @@ ACE_RCSID (ObjRefTemplate, ORT_Adapter_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - char * TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -113,5 +111,3 @@ TAO::ORT_Adapter_Impl::activate ( return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h index ff30c49bbdf..ad2f8ecdf17 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/ObjRefTemplate/ort_export.h" +#include "ort_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +31,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -40,7 +38,7 @@ namespace TAO * * @brief Implementation of the TAO::ORT_Adapter */ - class ORT_Adapter_Impl + class TAO_ORT_Export ORT_Adapter_Impl : public ORT_Adapter { public: @@ -109,8 +107,6 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) # pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl index f26d45984bc..335fd5ad8d9 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl @@ -33,15 +33,18 @@ #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_ #define _OBJECT_REFERENCE_TEMPLATE_IDL_ -#include "tao/PI_Forward.pidl" +#include <PI_Forward.pidl> module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; abstract valuetype ObjectReferenceFactory { + // boolean equals (in ObjectReferenceFactory other); Object make_object (in string repository_id, in ObjectId id); + // IOP::TaggedProfileSeq make_profiles (in string repository_id, + // in ObjectId id); }; abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory { diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp index 2eda0aa733e..a5fcc1c409e 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp @@ -32,14 +32,12 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" -#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h" +#include "ObjectReferenceTemplate.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be/be_visitor_typecode/value_typecode.cpp:50 @@ -319,5 +317,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index 36ed1030c9d..9ffbc54f337 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h" +#include "ObjectReferenceTemplate.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -44,14 +44,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl" +#include "ObjectReferenceTemplateC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -489,5 +487,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index 7c95d92555f..70c007519ce 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -43,7 +43,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ObjRefTemplate/ort_export.h" +#include "ort_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/ORB.h" @@ -75,8 +75,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -432,10 +430,8 @@ TAO_ORT_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl" +#include "ObjectReferenceTemplateC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index 5aade26a354..9965d1edb67 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -1,4 +1,4 @@ -#include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h" +#include "ObjectReferenceTemplate_i.h" #include "tao/PortableServer/Root_POA.h" #include "tao/CORBA_String.h" @@ -8,8 +8,6 @@ ACE_RCSID (ORT, ObjectReferenceTemplate_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ObjectReferenceTemplate::ObjectReferenceTemplate ( @@ -76,5 +74,3 @@ namespace TAO return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h index cb19700492a..aca0b876cdf 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ObjRefTemplate/Default_ORTC.h" +#include "Default_ORTC.h" #include "tao/SystemException.h" #if defined(_MSC_VER) @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { class POA; @@ -45,13 +43,13 @@ namespace PortableServer namespace TAO { /** - * @class ObjectReferenceTemplate + * @class TAO_ObjectReferenceTemplate * * @brief Implementation of the PortableInterceptor::ObjectReferenceTemplate * interface. This is a default implementation created to be returned * by the IORInfo when the user requests the ORT or ORF. */ - class ObjectReferenceTemplate + class TAO_ORT_Export ObjectReferenceTemplate : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate, public virtual CORBA::DefaultValueRefCountBase { @@ -113,8 +111,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h index bef52c5826e..1b15e680078 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ObjRefTemplate/ort_export.h" +#include "ort_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -71,8 +71,6 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { @@ -81,8 +79,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:963 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h index 65f2ae33b8a..0d6946f8b84 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplateS.h" -#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h" +#include "ObjectReferenceTemplate_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 3b5b83c9c8d..14ed6f02fa3 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -6,19 +6,19 @@ // // ORB: CORBA::Object operations -#include "tao/Object.h" -#include "tao/Stub.h" -#include "tao/Profile.h" -#include "tao/ORB_Core.h" -#include "tao/Connector_Registry.h" -#include "tao/LocateRequest_Invocation_Adapter.h" -#include "tao/debug.h" -#include "tao/Dynamic_Adapter.h" -#include "tao/IFR_Client_Adapter.h" -#include "tao/Remote_Object_Proxy_Broker.h" -#include "tao/CDR.h" -#include "tao/SystemException.h" -#include "tao/PolicyC.h" +#include "Object.h" +#include "Stub.h" +#include "Profile.h" +#include "ORB_Core.h" +#include "Connector_Registry.h" +#include "LocateRequest_Invocation_Adapter.h" +#include "debug.h" +#include "Dynamic_Adapter.h" +#include "IFR_Client_Adapter.h" +#include "Remote_Object_Proxy_Broker.h" +#include "CDR.h" +#include "SystemException.h" +#include "PolicyC.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" @@ -33,8 +33,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Object::~Object (void) { if (this->protocol_proxy_) @@ -47,8 +45,10 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy, CORBA::Boolean collocated, TAO_Abstract_ServantBase * servant, TAO_ORB_Core *orb_core) - : is_local_ (false) - , is_evaluated_ (true) + : servant_ (servant) + , is_collocated_ (collocated) + , is_local_ (0) + , is_evaluated_ (1) , ior_ (0) , orb_core_ (orb_core) , protocol_proxy_ (protocol_proxy) @@ -66,18 +66,24 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy, this->refcount_lock_ = this->orb_core_->resource_factory ()->create_corba_object_lock (); - // Set the collocation marker on the stub. This may not be news to it. - // This may also change the stub's object proxy broker. - this->protocol_proxy_->is_collocated (collocated); - - // Set the collocated servant pointer (null if not collocated) on the stub. - this->protocol_proxy_->collocated_servant (servant); + // If the object is collocated then set the broker using the + // factory otherwise use the remote proxy broker. + if (this->is_collocated_ && + _TAO_Object_Proxy_Broker_Factory_function_pointer != 0) + this->proxy_broker_ = + _TAO_Object_Proxy_Broker_Factory_function_pointer (this); + else + this->proxy_broker_ = + the_tao_remote_object_proxy_broker (); } CORBA::Object::Object (IOP::IOR *ior, TAO_ORB_Core *orb_core) - : is_local_ (false) - , is_evaluated_ (false) + : servant_ (0) + , proxy_broker_ (0) + , is_collocated_ (0) + , is_local_ (0) + , is_evaluated_ (0) , ior_ (ior) , orb_core_ (orb_core) , protocol_proxy_ (0) @@ -178,13 +184,7 @@ CORBA::Object::marshal (CORBA::Object_ptr x, TAO_Abstract_ServantBase* CORBA::Object::_servant (void) const { - if (this->protocol_proxy_ == 0) - { - // No stub set. Should not happen. - return 0; - } - - return this->protocol_proxy_->collocated_servant (); + return this->servant_; } // IS_A ... ask the object if it's an instance of the type whose @@ -213,14 +213,14 @@ CORBA::Object::_is_a (const char *type_id // XXX if type_id is that of CORBA::Object, "yes, we comply" :-) if (this->protocol_proxy_ == 0) - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false); + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); if (this->_stubobj ()->type_id.in () != 0 && ACE_OS::strcmp (type_id, this->_stubobj ()->type_id.in ()) == 0) - return true; + return 1; - return this->proxy_broker ()->_is_a (this, + return this->proxy_broker_->_is_a (this, type_id ACE_ENV_ARG_PARAMETER); } @@ -234,19 +234,7 @@ CORBA::Object::_interface_repository_id (void) const CORBA::Boolean CORBA::Object::_is_collocated (void) const { - if (this->protocol_proxy_) - { - return this->protocol_proxy_->is_collocated (); - } - - return false; -} - -void -CORBA::Object::set_collocated_servant (TAO_Abstract_ServantBase *b) -{ - this->protocol_proxy_->collocated_servant (b); - this->protocol_proxy_->is_collocated (true); + return this->is_collocated_; } CORBA::Boolean @@ -298,7 +286,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj { if (other_obj == this) { - return true; + return 1; } TAO_OBJECT_IOR_EVALUATE_RETURN; @@ -306,7 +294,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj if (this->protocol_proxy_ != 0) return this->protocol_proxy_->is_equivalent (other_obj); - return false; + return 0; } // TAO's extensions @@ -337,7 +325,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL) void CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker) { - this->protocol_proxy_->object_proxy_broker (proxy_broker); + this->proxy_broker_ = proxy_broker; } CORBA::Boolean @@ -479,7 +467,7 @@ CORBA::Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY { - retval = this->proxy_broker ()->_non_existent (this + retval = this->proxy_broker_->_non_existent (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -502,7 +490,7 @@ CORBA::InterfaceDef_ptr CORBA::Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL) { TAO_OBJECT_IOR_EVALUATE_RETURN; - return this->proxy_broker ()->_get_interface (this + return this->proxy_broker_->_get_interface (this ACE_ENV_ARG_PARAMETER); } @@ -516,7 +504,7 @@ CORBA::Object_ptr CORBA::Object::_get_component (ACE_ENV_SINGLE_ARG_DECL) { TAO_OBJECT_IOR_EVALUATE_RETURN; - return this->proxy_broker ()->_get_component (this + return this->proxy_broker_->_get_component (this ACE_ENV_ARG_PARAMETER); } @@ -524,7 +512,7 @@ char* CORBA::Object::_repository_id (ACE_ENV_SINGLE_ARG_DECL) { TAO_OBJECT_IOR_EVALUATE_RETURN; - return this->proxy_broker ()->_repository_id (this + return this->proxy_broker_->_repository_id (this ACE_ENV_ARG_PARAMETER); } @@ -589,7 +577,7 @@ CORBA::Object::_set_policy_overrides ( ACE_NEW_THROW_EX (obj, CORBA::Object (stub, - this->_is_collocated ()), + this->is_collocated_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( 0, @@ -634,7 +622,7 @@ CORBA::Object::_validate_connection ( // If the object is collocated then use non_existent to see whether // it's there. - if (this->_is_collocated ()) + if (this->is_collocated_) return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER)); TAO::LocateRequest_Invocation_Adapter tao_call (this); @@ -682,22 +670,6 @@ CORBA::Object::_get_orb (ACE_ENV_SINGLE_ARG_DECL) } } -TAO::Object_Proxy_Broker * -CORBA::Object::proxy_broker (void) const -{ - // Paranoid check. We *should* never access the proxy_broker - // when the object has not been initialised so there *should* - // alway be a stub, but just in case... - - if (this->protocol_proxy_) - { - return this->protocol_proxy_->object_proxy_broker (); - } - - // We have no stub. We cannot be collocated. - return the_tao_remote_object_proxy_broker (); -} - /***************************************************************** * Global Functions ****************************************************************/ @@ -725,9 +697,27 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x) TAO_Stub *stubobj = x->_stubobj (); if (stubobj == 0) - return false; + return 0; - return (stubobj->marshal (cdr)); + // STRING, a type ID hint + if ((cdr << stubobj->type_id.in ()) == 0) + return 0; + + const TAO_MProfile& mprofile = stubobj->base_profiles (); + + CORBA::ULong profile_count = mprofile.profile_count (); + if ((cdr << profile_count) == 0) + return 0; + + // @@ The MProfile should be locked during this iteration, is there + // anyway to achieve that? + for (CORBA::ULong i = 0; i < profile_count; ++i) + { + const TAO_Profile* p = mprofile.get_profile (i); + if (p->encode (cdr) == 0) + return 0; + } + return (CORBA::Boolean) cdr.good_bit (); } /*static*/ void @@ -815,9 +805,9 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) { if (TAO_debug_level > 0) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("TAO - ERROR creating stub ") + ACE_TEXT ("TAO (%P|%t) ERROR creating stub ") ACE_TEXT ("object when demarshaling object ") - ACE_TEXT ("reference.")); + ACE_TEXT ("reference.\n")); return; } @@ -826,14 +816,22 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) TAO_Stub_Auto_Ptr safe_objdata (objdata); - // This call will set the stub proxy broker if necessary if (orb_core->initialize_object (safe_objdata.get (), obj) == -1) return; obj->protocol_proxy_ = objdata; - obj->is_evaluated_ = true; + // If the object is collocated then set the broker using the + // factory otherwise use the remote proxy broker. + if (obj->is_collocated_ && + _TAO_Object_Proxy_Broker_Factory_function_pointer != 0) + obj->proxy_broker_ = + _TAO_Object_Proxy_Broker_Factory_function_pointer (obj); + else + obj->proxy_broker_ = the_tao_remote_object_proxy_broker (); + + obj->is_evaluated_ = 1; // Release the contents of the ior to keep memory consumption down. obj->ior_ = 0; @@ -846,7 +844,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) CORBA::Boolean operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { - bool lazy_strategy = false; + int lazy_strategy = 0; TAO_ORB_Core *orb_core = cdr.orb_core (); if (orb_core == 0) @@ -863,7 +861,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { if (orb_core->resource_factory ()->resource_usage_strategy () == TAO_Resource_Factory::TAO_LAZY) - lazy_strategy = true; + lazy_strategy = 1; } if (!lazy_strategy) @@ -943,7 +941,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { if (TAO_debug_level > 0) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ("TAO - ERROR creating stub ") + ACE_TEXT ("TAO (%P|%t) ERROR creating stub ") ACE_TEXT ("object when demarshaling object ") ACE_TEXT ("reference.\n")); @@ -1012,7 +1010,7 @@ namespace TAO } // close TAO namespace -TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0; - +TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index fc1a51490d6..548cf871edd 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -39,16 +39,12 @@ # undef IOR #endif /* HPUX && IOR */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Stub; class TAO_Abstract_ServantBase; class TAO_ORB_Core; +class ACE_Lock; + namespace TAO { class ObjectKey; @@ -279,13 +275,9 @@ namespace CORBA static CORBA::Boolean marshal (Object_ptr obj, TAO_OutputCDR &strm); - /// Accessor for the cached servant reference held on the stub - /// if this object is collocated virtual TAO_Abstract_ServantBase *_servant (void) const; /// Is this object collocated with the servant? - /// Note this does not return this->is_collocated_ but will instead - /// query the underlying stub for its collocation status virtual CORBA::Boolean _is_collocated (void) const; /// Is this a local object? @@ -357,18 +349,31 @@ namespace CORBA /// Initializing a local object. Object (int dummy = 0); - /// Convenience accessor for the object proxy broker of the - /// underlying stub. - TAO::Object_Proxy_Broker *proxy_broker () const; - private: // = Unimplemented methods Object (const Object &); Object &operator = (const Object &); + protected: + + /// Servant pointer. It is 0 except for collocated objects. + TAO_Abstract_ServantBase *servant_; + private: + /// Pointer to the Proxy Broker + /** + * This cached pointer instance takes care of routing the call for + * standard calls in CORBA::Object like _is_a (), _get_component + * () etc. + */ + TAO::Object_Proxy_Broker *proxy_broker_; + + /// Flag to indicate collocation. It is 0 except for collocated + /// objects. + CORBA::Boolean is_collocated_; + /// Specify whether this is a local object or not. CORBA::Boolean is_local_; @@ -443,7 +448,9 @@ namespace TAO /// library is present. extern TAO_Export TAO::Object_Proxy_Broker * - (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void); + (*_TAO_Object_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR&, const CORBA::Object*); @@ -451,7 +458,6 @@ operator<< (TAO_OutputCDR&, const CORBA::Object*); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR&, CORBA::Object *&); -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Object.i" diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index 0db6581b912..e86207df933 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -4,11 +4,12 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Object::Object (int) - : is_local_ (true), + : servant_ (0), + proxy_broker_ (0), + is_collocated_ (false), + is_local_ (true), is_evaluated_ (true), ior_ (), orb_core_ (0), @@ -79,6 +80,13 @@ CORBA::Object::is_evaluated (void) const return this->is_evaluated_; } +ACE_INLINE void +CORBA::Object::set_collocated_servant (TAO_Abstract_ServantBase *b) +{ + this->servant_ = b; + this->is_collocated_ = 1; +} + ACE_INLINE TAO_ORB_Core * CORBA::Object::orb_core (void) const { @@ -96,5 +104,3 @@ CORBA::Object::ior (void) const { return this->ior_.in (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index ea194be0136..a46f7400069 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/ObjectIdListC.h" +#include "ObjectIdListC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -157,5 +155,3 @@ return false; } #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h index 034e9d43ea3..41ec5807c6d 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -153,8 +151,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index 2915c3dd7ec..ab186bbfaef 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -1,16 +1,13 @@ // $Id$ -#include "tao/ObjectKey_Table.h" -#include "tao/ORB_Core.h" -#include "tao/Refcounted_ObjectKey.h" +#include "ObjectKey_Table.h" +#include "ORB_Core.h" +#include "Refcounted_ObjectKey.h" ACE_RCSID(tao, ObjectKey_Table, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, const TAO::ObjectKey &rhs) const @@ -31,9 +28,9 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, return 1; } else if (lhs[i] > rhs[i]) - { - return 0; - } + { + return 0; + } } return 0; @@ -183,4 +180,3 @@ TAO::ObjectKey_Table::unbind_i (TAO::Refcounted_ObjectKey *&key_new) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index ef55ed9facd..db3027c7d05 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -23,9 +23,6 @@ #include "ace/Null_Mutex.h" #include "tao/Object_KeyC.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations class TAO_ORB_Core; @@ -139,8 +136,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_OBJECT_KEY_TABLE_H*/ diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index 7ddc254c6d8..9d949775999 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_OBJECT_ARGUMENT_T_CPP -#define TAO_OBJECT_ARGUMENT_T_CPP +#ifndef TAO_OBJECT_ARGUMENT_T_C +#define TAO_OBJECT_ARGUMENT_T_C #include "tao/Object_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/Object_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Object_Argument_T, + "$Id$") template<typename S_ptr, typename Insert_Policy> CORBA::Boolean @@ -100,6 +102,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_OBJECT_ARGUMENT_T_CPP */ +#endif /* TAO_OBJECT_ARGUMENT_T_C */ diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index a5c0f8b7a71..b5157e3616f 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -153,8 +151,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Object_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index f8105b5a561..b4a778c9299 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S_ptr, typename Insert_Policy> ACE_INLINE TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::In_Object_Argument_T (S_ptr x) @@ -83,4 +81,3 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void) return this->x_._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 7e79e07d473..3f46183a1f5 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/Object_KeyC.h" +#include "Object_KeyC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" @@ -44,8 +44,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -333,5 +331,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 6e070fcbea2..2198a47af4f 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -175,8 +173,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp index 5379fa97148..b510b74bcc4 100644 --- a/TAO/tao/Object_Loader.cpp +++ b/TAO/tao/Object_Loader.cpp @@ -1,16 +1,13 @@ // $Id$ -#include "tao/Object_Loader.h" +#include "Object_Loader.h" +#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Object_Loader, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Object_Loader::~TAO_Object_Loader (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index 69b1a7559bc..fd9279e1fd0 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file Object_Loader.h @@ -22,8 +20,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; @@ -64,8 +60,5 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_OBJECT_LOADER_H */ diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp index 8a8a1d6ee09..b718a9886ea 100644 --- a/TAO/tao/Object_Proxy_Broker.cpp +++ b/TAO/tao/Object_Proxy_Broker.cpp @@ -1,15 +1,13 @@ -// $Id$ - #include "tao/Object_Proxy_Broker.h" ACE_RCSID (tao, - Object_Proxy_Broker, + TAO_Object_Proxy_Broker, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void) +namespace TAO { + Object_Proxy_Broker::~Object_Proxy_Broker (void) + { + // No-Op. + } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index 0c1b7dc2102..1d1e35f0c1a 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -30,8 +30,6 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class InterfaceDef; @@ -81,8 +79,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_OBJECT_PROXY_BROKER_H_ */ diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index f5f4554f1a9..f3814f23b2a 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Object_Ref_Table.h" -#include "tao/ORB.h" -#include "tao/Environment.h" -#include "tao/debug.h" -#include "tao/ORB_Constants.h" -#include "tao/SystemException.h" +#include "Object_Ref_Table.h" +#include "ORB.h" +#include "Environment.h" +#include "debug.h" +#include "ORB_Constants.h" +#include "SystemException.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" @@ -22,8 +22,6 @@ ACE_RCSID (tao, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Object_Ref_Table::bind (const char *id, CORBA::Object_ptr obj) @@ -58,7 +56,7 @@ TAO_Object_Ref_Table::bind (const char *id, ACE_TEXT ("bind:") ACE_TEXT (" Could not register duplicate object <%s> ") ACE_TEXT ("with the ORB\n"), - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); } return -1; @@ -83,5 +81,3 @@ TAO_Object_Ref_Table::find (const char *id) return CORBA::Object::_duplicate ((*found).second.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index ac4d6adcda8..014463862e1 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -28,8 +28,6 @@ #include "ace/Array_Map.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Environment; @@ -70,11 +68,10 @@ public: * Register an object reference with the table, and map the given * ID to it. * @retval 0 Success - * @retval -1 Duplicate id if @c rebind is false + * @retval -1 Duplicate id */ int register_initial_reference (const char * id, - CORBA::Object_ptr obj, - bool rebind = false); + CORBA::Object_ptr obj); /// Return the object reference associated with the given ID. /// A duplicate is returned. @@ -107,9 +104,9 @@ private: private: - // Disallow copying and assignment. - TAO_Object_Ref_Table (const TAO_Object_Ref_Table &); - void operator= (const TAO_Object_Ref_Table &); + /// Prevent copying + ACE_UNIMPLEMENTED_FUNC (TAO_Object_Ref_Table (const TAO_Object_Ref_Table &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Object_Ref_Table &)) private: @@ -121,7 +118,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/Object_Ref_Table.inl" diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index e9abc371750..e2cc5ccccab 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE) @@ -14,18 +12,9 @@ TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) ACE_INLINE int TAO_Object_Ref_Table::register_initial_reference ( const char *id, - CORBA::Object_ptr obj, - bool rebind) + CORBA::Object_ptr obj) { - if (rebind) - { - if (this->unbind (id) == -1) - return -1; - else - return this->bind (id, obj); - } - else - return this->bind (id, obj); + return this->bind (id, obj); } ACE_INLINE CORBA::Object_ptr @@ -71,5 +60,3 @@ TAO_Object_Ref_Table::unbind (const char *id) return (this->table_.erase (CORBA::String_var (id)) == 0 ? -1 : 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 706d9d3dbee..69ad710c664 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -1,13 +1,14 @@ // $Id$ - -#ifndef TAO_OBJECT_T_CPP -#define TAO_OBJECT_T_CPP +#ifndef TAO_OBJECT_T_C +#define TAO_OBJECT_T_C #include "tao/Object_T.h" #include "tao/Stub.h" #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Object_T, + "$Id$") namespace TAO { @@ -87,7 +88,7 @@ namespace TAO { return proxy; } - + TAO_Stub* stub = obj->_stubobj (); if (stub == 0) @@ -131,6 +132,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_OBJECT_T_CPP */ +#endif /* TAO_OBJECT_T_C */ diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h index c4cfd88230c..57c11c5950a 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -17,17 +17,8 @@ #include /**/ "ace/pre.h" -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Versioned_Namespace.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; @@ -67,8 +58,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Object_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index 6c3ab3e046c..0a93b48c86a 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -1,11 +1,13 @@ // $Id$ -#ifndef TAO_OBJREF_VAROUT_T_CPP -#define TAO_OBJREF_VAROUT_T_CPP +#ifndef TAO_OBJREF_VAROUT_T_C +#define TAO_OBJREF_VAROUT_T_C #include "tao/Objref_VarOut_T.h" #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Objref_VarOut_T, + "$Id$") template <typename T> TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void) @@ -200,6 +202,4 @@ TAO_Objref_Out_T<T>::operator-> (void) return this->ptr_; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_OBJREF_VAROUT_T_CPP */ +#endif /* TAO_OBJREF_VAROUT_T_C */ diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 55f876160a0..f3fc6ac260f 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -24,8 +24,6 @@ #include "tao/Basic_Types.h" #include "tao/varbase.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_OutputCDR; namespace TAO @@ -127,8 +125,6 @@ private: T *& ptr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Objref_VarOut_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index c788364a799..c59ead52d2b 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:288 -#include "tao/OctetSeqC.h" +#include "OctetSeqC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -190,5 +188,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index 341cc5ad84f..5fa4471699b 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -57,8 +57,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -167,8 +165,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp deleted file mode 100644 index eda71934918..00000000000 --- a/TAO/tao/PI/ClientRequestDetails.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "tao/PI/ClientRequestDetails.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#if !defined (__ACE_INLINE__) -#include "tao/PI/ClientRequestDetails.inl" -#endif /* defined INLINE */ - -ACE_RCSID (PI, - ClientRequestDetails, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - void - ClientRequestDetails::apply_policies ( - const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) - { - // Flag to check for duplicate ProcessingModePolicy objects in the list. - bool processing_mode_applied = false; - - const CORBA::ULong plen = policies.length (); - - for (CORBA::ULong i = 0; i < plen; ++i) - { - CORBA::Policy_var policy = policies[i]; - - if (CORBA::is_nil (policy.in ())) - { - // Just ignore nil policies... - continue; - } - - // Obtain the PolicyType from the current Policy object. - const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) - { - if (processing_mode_applied) - { - // This is the second time we have run into this policy type, - // and that is not allowed. - ACE_THROW (CORBA::INV_POLICY ()); - } - - // Flip the flag to true in order to trap any dupes. - processing_mode_applied = true; - - // Narrow the Policy to the ProcessingModePolicy interface. - PortableInterceptor::ProcessingModePolicy_var pm_policy = - PortableInterceptor::ProcessingModePolicy::_narrow ( - policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Save the value of the ProcessingModePolicy in our data member. - this->processing_mode_ = - pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } - else - { - // We don't support the current policy type. - ACE_THROW (CORBA::INV_POLICY ()); - } - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h deleted file mode 100644 index ec4666ae047..00000000000 --- a/TAO/tao/PI/ClientRequestDetails.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ClientRequestDetails.h - * - * $Id$ - * - * This file declares a class that manages the details - * about a registered client request interceptor. Policies can be - * used when interceptors are registered, and the policy values - * will be processed and used to modify the values of the - * ClientRequestDetails object associated with the registered - * client request interceptor. - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_CLIENT_REQUEST_DETAILS_H -#define TAO_CLIENT_REQUEST_DETAILS_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/ProcessingModePolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - /** - * @class ClientRequestDetails - * - * @brief The policy-driven details for a registered client request - * interceptor - * - * Each time a client request interceptor is registered with an ORB, - * a ClientRequestDetails object will be created and associated with - * the registered client request interceptor. If the interceptor is - * registered with policies, the policies will be used to adjust the - * values in the ClientRequestDetails appropriately. - */ - class ClientRequestDetails - { - public: - - ClientRequestDetails (void); - - void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - - /// Returns true if the ProcessingMode setting permits the "firing" - /// of the associated client request interceptor based upon the - /// remote vs. collocated nature of the current servant request - /// that is being dispatched. - bool should_be_processed (bool is_remote_request) const; - - private: - - /// The ProcessingMode setting that can be adjusted via the - /// PortableInterceptor::ProcessingModePolicy. - PortableInterceptor::ProcessingMode processing_mode_; - }; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "tao/PI/ClientRequestDetails.inl" -#endif /* __ACE_INLINE__ */ - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_CLIENT_REQUEST_DETAILS_H */ diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl deleted file mode 100644 index f568bb9fafb..00000000000 --- a/TAO/tao/PI/ClientRequestDetails.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - ACE_INLINE - ClientRequestDetails::ClientRequestDetails (void) - : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) - { - } - - ACE_INLINE - bool - ClientRequestDetails::should_be_processed (bool is_remote_request) const - { - return ((this->processing_mode_ == PortableInterceptor::LOCAL_AND_REMOTE) || - ((this->processing_mode_ == PortableInterceptor::REMOTE_ONLY) && - (is_remote_request)) || - ((this->processing_mode_ == PortableInterceptor::LOCAL_ONLY) && - (!is_remote_request))); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index 9a0baa762bf..544a2694509 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "tao/PI/ClientRequestInfo.h" +#include "ClientRequestInfo.h" #if TAO_HAS_INTERCEPTORS == 1 -ACE_RCSID (PI, +ACE_RCSID (tao, ClientRequestInfo, "$Id$") -#include "tao/PI/PICurrent.h" -#include "tao/PI/RequestInfo_Util.h" +#include "PICurrent.h" +#include "RequestInfo_Util.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/ExceptionA.h" @@ -24,8 +24,6 @@ ACE_RCSID (PI, #include "tao/Service_Context.h" #include "tao/Exception_Data.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv) : invocation_ (inv), rs_pi_current_ (), @@ -603,10 +601,8 @@ TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL) bool TAO_ClientRequestInfo::result (CORBA::Any *any) { - // Result is always first element in TAO::Argument array. - TAO::Argument * const r = this->invocation_->operation_details ().args ()[0]; - - r->interceptor_value (any); + for (CORBA::ULong i = 0; i != this->invocation_->operation_details ().args_num (); ++i) + (*this->invocation_->operation_details ().args ()[i]).interceptor_value (any); return true; } @@ -726,30 +722,4 @@ TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) CORBA::COMPLETED_NO)); } -void -TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time) -{ - this->invocation_->operation_details ().ft_expiration_time (time); -} - -TimeBase::TimeT -TAO_ClientRequestInfo::tao_ft_expiration_time (void) const -{ - return this->invocation_->operation_details ().ft_expiration_time (); -} - -void -TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id) -{ - this->invocation_->operation_details ().ft_retention_id (request_id) ; -} - -CORBA::Long -TAO_ClientRequestInfo::tao_ft_retention_id (void) const -{ - return this->invocation_->operation_details ().ft_retention_id (); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 9c5f732c549..4a47e23de92 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -32,16 +32,14 @@ #endif /* _MSC_VER */ #include "tao/CORBA_methods.h" -#include "tao/PI/ClientRequestInfoC.h" -#include "tao/PI/PIForwardRequestC.h" -#include "tao/PI/PICurrent_Impl.h" -#include "tao/PI/PICurrent_Copy_Callback.h" +#include "ClientRequestInfoC.h" +#include "PIForwardRequestC.h" +#include "PICurrent_Impl.h" +#include "PICurrent_Copy_Callback.h" #include "tao/ORB_Constants.h" #include "tao/LocalObject.h" #include "tao/Invocation_Utils.h" -#include "tao/TimeBaseC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Service_Context; @@ -69,7 +67,7 @@ namespace Messaging * @brief Implementation of the PortableInterceptor::ClientRequestInfo * interface. */ -class TAO_PI_Export TAO_ClientRequestInfo +class TAO_ClientRequestInfo : public virtual PortableInterceptor::ClientRequestInfo, public virtual TAO_Local_RefCounted_Object { @@ -222,27 +220,6 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - /* - * Proprietary accessor methods for the FT retention ID and - * request expiration time. - */ - - /// Set the absolute FT expiration time for this request. - void tao_ft_expiration_time (TimeBase::TimeT time); - - /// Get the absolute FT expiration time for this request - TimeBase::TimeT tao_ft_expiration_time (void) const; - - /// Set the FT request retention ID for this request. - void tao_ft_retention_id (CORBA::Long request_id); - - /// Get the FT request retention ID for this request. - CORBA::Long tao_ft_retention_id (void) const; - - /* - * End proprietary FT methods. - */ - private: bool parameter_list (Dynamic::ParameterList ¶m_list); @@ -291,8 +268,6 @@ private: TAO::PICurrent_Copy_Callback copy_callback_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ClientRequestInfo.pidl b/TAO/tao/PI/ClientRequestInfo.pidl index 1a5baca1d14..3ee07e65af4 100644 --- a/TAO/tao/PI/ClientRequestInfo.pidl +++ b/TAO/tao/PI/ClientRequestInfo.pidl @@ -23,8 +23,8 @@ #define _CLIENT_REQUESTINFO_PIDL_ #include "tao/PI/RequestInfo.pidl" -#include "tao/orb_types.pidl" -#include "tao/Policy_Forward.pidl" +#include <orb_types.pidl> +#include <Policy_Forward.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp index aa30e9882c7..f6840ced1f9 100644 --- a/TAO/tao/PI/ClientRequestInfoA.cpp +++ b/TAO/tao/PI/ClientRequestInfoA.cpp @@ -25,29 +25,26 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/ClientRequestInfoA.h" +#include "ClientRequestInfoC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ClientRequestInfo ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0", "ClientRequestInfo"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo = @@ -55,4 +52,78 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ClientRequestInfo>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ClientRequestInfo_ptr _tao_elem + ) +{ + PortableInterceptor::ClientRequestInfo_ptr _tao_objptr = + PortableInterceptor::ClientRequestInfo::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ClientRequestInfo_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::insert ( + _tao_any, + PortableInterceptor::ClientRequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_ClientRequestInfo, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ClientRequestInfo_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::extract ( + _tao_any, + PortableInterceptor::ClientRequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_ClientRequestInfo, + _tao_elem + ); +} diff --git a/TAO/tao/PI/ClientRequestInfoA.h b/TAO/tao/PI/ClientRequestInfoA.h deleted file mode 100644 index 54fc23da5bd..00000000000 --- a/TAO/tao/PI/ClientRequestInfoA.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_CLIENTREQUESTINFOA_H_ -#define _TAO_IDL_CLIENTREQUESTINFOA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/ClientRequestInfoC.h" -#include "tao/PI/RequestInfoA.h" -#include "tao/AnyTypeCode/orb_typesA.h" -#include "tao/AnyTypeCode/Policy_ForwardA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/ClientRequestInfoC.cpp b/TAO/tao/PI/ClientRequestInfoC.cpp index 007536ecfe1..b818e7383c8 100644 --- a/TAO/tao/PI/ClientRequestInfoC.cpp +++ b/TAO/tao/PI/ClientRequestInfoC.cpp @@ -26,18 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI/ClientRequestInfoC.h" +#include "ClientRequestInfoC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void) return PortableInterceptor::ClientRequestInfo::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal ( PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void) @@ -86,9 +88,17 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void) PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void) {} +void +PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer) +{ + ClientRequestInfo *_tao_tmp_pointer = + static_cast<ClientRequestInfo *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -99,7 +109,7 @@ PortableInterceptor::ClientRequestInfo::_narrow ( PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -125,7 +135,7 @@ PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ClientRequestInfo::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -163,10 +173,8 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInfoC.h b/TAO/tao/PI/ClientRequestInfoC.h index 2a13b7eb472..59f9dab7f1e 100644 --- a/TAO/tao/PI/ClientRequestInfoC.h +++ b/TAO/tao/PI/ClientRequestInfoC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_CLIENTREQUESTINFOC_H_ -#define _TAO_IDL_CLIENTREQUESTINFOC_H_ +#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_ +#define _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_ #include /**/ "ace/pre.h" @@ -41,13 +41,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/Objref_VarOut_T.h" #include "tao/PI/RequestInfoC.h" @@ -59,29 +59,36 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_ - + class ClientRequestInfo; typedef ClientRequestInfo *ClientRequestInfo_ptr; - + typedef TAO_Objref_Var_T< ClientRequestInfo > ClientRequestInfo_var; - + typedef TAO_Objref_Out_T< ClientRequestInfo @@ -89,165 +96,170 @@ namespace PortableInterceptor ClientRequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_ - + class TAO_PI_Export ClientRequestInfo : public virtual ::PortableInterceptor::RequestInfo { public: typedef ClientRequestInfo_ptr _ptr_type; typedef ClientRequestInfo_var _var_type; - + // The static operations. static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj); - + static void _tao_release (ClientRequestInfo_ptr obj); - + static ClientRequestInfo_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInfo_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInfo_ptr _nil (void) { return static_cast<ClientRequestInfo_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Object_ptr target ( + + virtual CORBA::Object_ptr target ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Object_ptr effective_target ( + + virtual CORBA::Object_ptr effective_target ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::TaggedProfile * effective_profile ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * received_exception ( + + virtual CORBA::Any * received_exception ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * received_exception_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::TaggedComponent * get_effective_component ( ::IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::TaggedComponentSeq * get_effective_components ( ::IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_request_policy ( ::CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_request_service_context ( const ::IOP::ServiceContext & service_context, ::CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. ClientRequestInfo (void); - + virtual ~ClientRequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. ClientRequestInfo (const ClientRequestInfo &); - + void operator= (const ClientRequestInfo &); }; #endif /* end #if !defined */ + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo; + // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -258,9 +270,9 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo> { @@ -271,7 +283,7 @@ namespace TAO ::PortableInterceptor::ClientRequestInfo_ptr ); static ::PortableInterceptor::ClientRequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -281,9 +293,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInfo_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp index b3c99cc3579..7a1f1aca023 100644 --- a/TAO/tao/PI/ClientRequestInterceptorA.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp @@ -25,18 +25,16 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/ClientRequestInterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ClientRequestInterceptorC.h" +#include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -44,10 +42,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ClientRequestInterceptor ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0", "ClientRequestInterceptor"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor = @@ -55,4 +53,78 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ClientRequestInterceptor_ptr _tao_elem + ) +{ + PortableInterceptor::ClientRequestInterceptor_ptr _tao_objptr = + PortableInterceptor::ClientRequestInterceptor::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ClientRequestInterceptor_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::insert ( + _tao_any, + PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor, + PortableInterceptor::_tc_ClientRequestInterceptor, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ClientRequestInterceptor_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::extract ( + _tao_any, + PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor, + PortableInterceptor::_tc_ClientRequestInterceptor, + _tao_elem + ); +} diff --git a/TAO/tao/PI/ClientRequestInterceptorA.h b/TAO/tao/PI/ClientRequestInterceptorA.h deleted file mode 100644 index 3f99475e2fe..00000000000 --- a/TAO/tao/PI/ClientRequestInterceptorA.h +++ /dev/null @@ -1,64 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_CLIENTREQUESTINTERCEPTORA_H_ -#define _TAO_IDL_CLIENTREQUESTINTERCEPTORA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/ClientRequestInterceptorC.h" -#include "tao/PI/InterceptorA.h" -#include "tao/PI/PIForwardRequestA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/ClientRequestInterceptorC.cpp b/TAO/tao/PI/ClientRequestInterceptorC.cpp index 970c1ea6d1b..8e2bf9e81f6 100644 --- a/TAO/tao/PI/ClientRequestInterceptorC.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorC.cpp @@ -26,18 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI/ClientRequestInterceptorC.h" +#include "ClientRequestInterceptorC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void) return PortableInterceptor::ClientRequestInterceptor::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void) @@ -86,9 +88,17 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void) PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void) {} +void +PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer) +{ + ClientRequestInterceptor *_tao_tmp_pointer = + static_cast<ClientRequestInterceptor *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -99,7 +109,7 @@ PortableInterceptor::ClientRequestInterceptor::_narrow ( PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -125,7 +135,7 @@ PortableInterceptor::ClientRequestInterceptor::_tao_release (ClientRequestInterc CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ClientRequestInterceptor::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -163,10 +173,8 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInterceptorC.h b/TAO/tao/PI/ClientRequestInterceptorC.h index 840948b8b5a..4c9bd3efb85 100644 --- a/TAO/tao/PI/ClientRequestInterceptorC.h +++ b/TAO/tao/PI/ClientRequestInterceptorC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_CLIENTREQUESTINTERCEPTORC_H_ -#define _TAO_IDL_CLIENTREQUESTINTERCEPTORC_H_ +#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_ +#define _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_ #include /**/ "ace/pre.h" @@ -55,29 +55,36 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_ - + class ClientRequestInfo; typedef ClientRequestInfo *ClientRequestInfo_ptr; - + typedef TAO_Objref_Var_T< ClientRequestInfo > ClientRequestInfo_var; - + typedef TAO_Objref_Out_T< ClientRequestInfo @@ -85,22 +92,22 @@ namespace PortableInterceptor ClientRequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_ - + class ClientRequestInterceptor; typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr; - + typedef TAO_Objref_Var_T< ClientRequestInterceptor > ClientRequestInterceptor_var; - + typedef TAO_Objref_Out_T< ClientRequestInterceptor @@ -108,88 +115,88 @@ namespace PortableInterceptor ClientRequestInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_ - + class TAO_PI_Export ClientRequestInterceptor : public virtual ::PortableInterceptor::Interceptor { public: typedef ClientRequestInterceptor_ptr _ptr_type; typedef ClientRequestInterceptor_var _var_type; - + // The static operations. static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj); - + static void _tao_release (ClientRequestInterceptor_ptr obj); - + static ClientRequestInterceptor_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInterceptor_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientRequestInterceptor_ptr _nil (void) { return static_cast<ClientRequestInterceptor_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_request ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_poll ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_reply ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_exception ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -198,20 +205,20 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. @@ -227,9 +234,14 @@ namespace PortableInterceptor }; #endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -240,8 +252,8 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_ template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo> @@ -253,7 +265,7 @@ namespace TAO ::PortableInterceptor::ClientRequestInfo_ptr ); static ::PortableInterceptor::ClientRequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -261,8 +273,8 @@ namespace TAO #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_ template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor> @@ -274,7 +286,7 @@ namespace TAO ::PortableInterceptor::ClientRequestInterceptor_ptr ); static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -284,10 +296,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ClientRequestInterceptor_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 741d185e2b9..574fc987085 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -1,12 +1,12 @@ -#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h" +#include "ClientRequestInterceptor_Adapter_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 #if !defined (__ACE_INLINE__) -#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl" +#include "ClientRequestInterceptor_Adapter_Impl.inl" #endif /* defined INLINE */ -#include "tao/PI/ClientRequestInfo.h" +#include "ClientRequestInfo.h" #include "tao/Invocation_Base.h" #include "tao/ORB_Core.h" @@ -17,8 +17,6 @@ ACE_RCSID (PI, ClientRequestInterceptorAdapter_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { void @@ -28,25 +26,16 @@ namespace TAO { // This method implements one of the "starting" client side // interception point. - - bool is_remote_request = invocation.is_remote_request(); - ACE_TRY { TAO_ClientRequestInfo ri (&invocation); for (size_t i = 0 ; i < this->interceptor_list_.size (); ++i) { - ClientRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_request (&ri - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor (i)-> + send_request (&ri + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; // The starting interception point completed successfully. // Push the interceptor on to the flow stack. @@ -72,8 +61,6 @@ namespace TAO // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. - bool is_remote_request = invocation.is_remote_request(); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" // interception point. @@ -90,18 +77,11 @@ namespace TAO // invoked in another "ending" interception point. --invocation.stack_size (); - ClientRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - invocation.stack_size ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_reply ( - &ri - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + this->interceptor_list_.interceptor (invocation.stack_size ())-> + receive_reply ( + &ri + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } // The receive_reply() interception point does not raise a @@ -117,8 +97,6 @@ namespace TAO // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. - bool is_remote_request = invocation.is_remote_request(); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" // interception point. @@ -136,18 +114,11 @@ namespace TAO // being invoked in another "ending" interception point. --invocation.stack_size (); - ClientRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - invocation.stack_size ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_exception ( - &ri - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor (invocation.stack_size ())-> + receive_exception ( + &ri + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) @@ -196,8 +167,6 @@ namespace TAO // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. - bool is_remote_request = invocation.is_remote_request(); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" // interception point. @@ -216,18 +185,11 @@ namespace TAO // being invoked in another "ending" interception point. --invocation.stack_size (); - ClientRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - invocation.stack_size ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_other ( - &ri - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor (invocation.stack_size ())-> + receive_other ( + &ri + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) @@ -265,18 +227,6 @@ namespace TAO } void - ClientRequestInterceptor_Adapter_Impl::add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) - { - this->interceptor_list_.add_interceptor (interceptor, - policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - void ClientRequestInterceptor_Adapter_Impl::destroy_interceptors ( ACE_ENV_SINGLE_ARG_DECL) { @@ -316,6 +266,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index 4b1a7ebc70c..2ec52a987aa 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -30,17 +30,14 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/Interceptor_List_T.h" -#include "tao/PI/ClientRequestInterceptorC.h" -#include "tao/PI/ClientRequestDetails.h" +#include "Interceptor_List_T.h" +#include "ClientRequestInterceptorC.h" #include "tao/ClientRequestInterceptor_Adapter.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor, - ClientRequestDetails> + typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor> ClientRequestInterceptor_List; } @@ -102,12 +99,6 @@ namespace TAO PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL); - /// Register an interceptor with policies. - virtual void add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); virtual PortableInterceptor::ReplyStatus reply_status ( @@ -129,10 +120,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl" +#include "ClientRequestInterceptor_Adapter_Impl.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl index c1c7835148d..e234f5d02ac 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE @@ -11,5 +9,3 @@ namespace TAO { } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index e4ff27b2c9b..890ce995534 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ // ================================================================= /** @@ -11,11 +11,11 @@ */ // ================================================================= -#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h" +#include "ClientRequestInterceptor_Factory_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h" +#include "ClientRequestInterceptor_Adapter_Impl.h" #include "tao/ORB.h" #include "tao/debug.h" @@ -24,8 +24,6 @@ ACE_RCSID (PI, ClientRequestInterceptor_Factory_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ClientRequestInterceptor_Adapter* TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) { @@ -36,8 +34,6 @@ TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl, ACE_TEXT ("ClientRequestInterceptor_Adapter_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index f63b6ca3407..c3b959f156f 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -16,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,10 +27,8 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/ClientRequestInterceptor_Adapter_Factory.h" #include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/ClientRequestInterceptor_Adapter_Factory.h" namespace TAO { @@ -43,8 +42,6 @@ public: virtual TAO::ClientRequestInterceptor_Adapter *create (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_PI, TAO_ClientRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp index 20c37dc8d94..39a0f627a03 100644 --- a/TAO/tao/PI/InterceptorA.cpp +++ b/TAO/tao/PI/InterceptorA.cpp @@ -25,18 +25,16 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/InterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" +#include "InterceptorC.h" +#include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -44,14 +42,89 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_Interceptor ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/Interceptor:1.0", "Interceptor"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_Interceptor = &_tao_tc_PortableInterceptor_Interceptor; } -TAO_END_VERSIONED_NAMESPACE_DECL + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::Interceptor>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::Interceptor_ptr _tao_elem + ) +{ + PortableInterceptor::Interceptor_ptr _tao_objptr = + PortableInterceptor::Interceptor::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::Interceptor_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::Interceptor>::insert ( + _tao_any, + PortableInterceptor::Interceptor::_tao_any_destructor, + PortableInterceptor::_tc_Interceptor, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::Interceptor_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::Interceptor>::extract ( + _tao_any, + PortableInterceptor::Interceptor::_tao_any_destructor, + PortableInterceptor::_tc_Interceptor, + _tao_elem + ); +} diff --git a/TAO/tao/PI/InterceptorA.h b/TAO/tao/PI/InterceptorA.h deleted file mode 100644 index f749d91e8a1..00000000000 --- a/TAO/tao/PI/InterceptorA.h +++ /dev/null @@ -1,62 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_INTERCEPTORA_H_ -#define _TAO_IDL_INTERCEPTORA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/InterceptorC.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_Interceptor; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/InterceptorC.cpp b/TAO/tao/PI/InterceptorC.cpp index d7f673c3dfb..cc1c0e0b458 100644 --- a/TAO/tao/PI/InterceptorC.cpp +++ b/TAO/tao/PI/InterceptorC.cpp @@ -26,18 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI/InterceptorC.h" +#include "InterceptorC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void) return PortableInterceptor::Interceptor::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal ( PortableInterceptor::Interceptor_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::Interceptor::Interceptor (void) @@ -86,9 +88,17 @@ PortableInterceptor::Interceptor::Interceptor (void) PortableInterceptor::Interceptor::~Interceptor (void) {} +void +PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer) +{ + Interceptor *_tao_tmp_pointer = + static_cast<Interceptor *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -99,7 +109,7 @@ PortableInterceptor::Interceptor::_narrow ( PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -125,7 +135,7 @@ PortableInterceptor::Interceptor::_tao_release (Interceptor_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::Interceptor::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -159,10 +169,8 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co return "IDL:omg.org/PortableInterceptor/Interceptor:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InterceptorC.h b/TAO/tao/PI/InterceptorC.h index 55841315bfe..750a1698595 100644 --- a/TAO/tao/PI/InterceptorC.h +++ b/TAO/tao/PI/InterceptorC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_INTERCEPTORC_H_ -#define _TAO_IDL_INTERCEPTORC_H_ +#ifndef _TAO_IDL_ORIG_INTERCEPTORC_H_ +#define _TAO_IDL_ORIG_INTERCEPTORC_H_ #include /**/ "ace/pre.h" @@ -52,16 +52,23 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_ @@ -90,7 +97,7 @@ namespace PortableInterceptor #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_ class TAO_PI_Export Interceptor - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef Interceptor_ptr _ptr_type; @@ -102,12 +109,12 @@ namespace PortableInterceptor static void _tao_release (Interceptor_ptr obj); static Interceptor_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Interceptor_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -116,7 +123,7 @@ namespace PortableInterceptor return static_cast<Interceptor_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -125,7 +132,7 @@ namespace PortableInterceptor ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -135,19 +142,19 @@ namespace PortableInterceptor ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. @@ -163,9 +170,14 @@ namespace PortableInterceptor }; #endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_Interceptor; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -176,8 +188,8 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_ template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::Interceptor> @@ -189,7 +201,7 @@ namespace TAO ::PortableInterceptor::Interceptor_ptr ); static ::PortableInterceptor::Interceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::Interceptor_ptr p, TAO_OutputCDR & cdr ); @@ -199,9 +211,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Interceptor_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Interceptor_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 657f69213ad..5f3b6e74581 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/PI/ORBInitInfoC.h" -#include "tao/PI/InterceptorC.h" +#include "ORBInitInfoC.h" +#include "InterceptorC.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "tao/debug.h" @@ -10,40 +10,30 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { - template <typename InterceptorType, typename DetailsType> - Interceptor_List<InterceptorType,DetailsType>::Interceptor_List (void) + template <typename InterceptorType> + Interceptor_List<InterceptorType>::Interceptor_List (void) { } - template <typename InterceptorType, typename DetailsType> - typename Interceptor_List<InterceptorType,DetailsType>::RegisteredInterceptor& - Interceptor_List<InterceptorType,DetailsType>::registered_interceptor ( - size_t index) + template <typename InterceptorType> + typename Interceptor_List<InterceptorType>::InterceptorType_ptr_type + Interceptor_List<InterceptorType>::interceptor (size_t index) { - return this->interceptors_[index]; + return this->interceptors_[index].in (); } - template <typename InterceptorType, typename DetailsType> - typename Interceptor_List<InterceptorType,DetailsType>::InterceptorType_ptr_type - Interceptor_List<InterceptorType,DetailsType>::interceptor (size_t index) - { - return this->interceptors_[index].interceptor_.in (); - } - - template <typename InterceptorType, typename DetailsType> + template <typename InterceptorType> size_t - Interceptor_List<InterceptorType,DetailsType>::size (void) + Interceptor_List<InterceptorType>::size (void) { return this->interceptors_.size (); } - template <typename InterceptorType, typename DetailsType> + template <typename InterceptorType> void - Interceptor_List<InterceptorType,DetailsType>::add_interceptor ( + Interceptor_List<InterceptorType>::add_interceptor ( InterceptorType_ptr_type interceptor ACE_ENV_ARG_DECL) { @@ -98,91 +88,7 @@ namespace TAO this->interceptors_.size (new_len); // Add the interceptor - this->interceptors_[old_len].interceptor_ = - InterceptorType::_duplicate (interceptor); - } - else - { - ACE_THROW ( - CORBA::INV_OBJREF ( - CORBA::SystemException::_tao_minor_code ( - 0, - EINVAL - ), - CORBA::COMPLETED_NO - ) - ); - } - } - - template <typename InterceptorType, typename DetailsType> - void - Interceptor_List<InterceptorType,DetailsType>::add_interceptor ( - InterceptorType_ptr_type interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) - { - if (!CORBA::is_nil (interceptor)) - { - const size_t old_len = this->interceptors_.size (); - - // Don't bother checking the name for duplicates if no - // interceptors have been registered. This saves an - // allocation. - if (old_len > 0) - { - /// If the Interceptor is not anonymous, make sure an - /// Interceptor with the same isn't already registered. - CORBA::String_var name = - interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (ACE_OS::strlen (name.in ()) != 0) - { - // @@ This simple search algorithm isn't the greatest - // thing in the world, but since we only register - // interceptors when bootstrapping an ORB, there will - // be no runtime penalty. - // - // Another source of inefficiency is that - // Interceptors duplicate their name each time the - // name() accessor is called! This can slow down - // bootstrap time noticeably when registering a huge - // number of interceptors. We could cache the names - // somewhere, but since this is only a bootstrapping - // issue there's no rush to implement such a scheme. - - // Prevent interceptors with the same name from being - // registered. Anonymous interceptors are okay. - for (size_t i = 0; i < old_len; ++i) - { - CORBA::String_var existing_name = - this->interceptor (i)->name (); - - if (ACE_OS::strcmp (existing_name.in (), - name.in ()) == 0) - { - ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ()); - } - } - } - } - - // Create a DetailsType object, and attempt to apply the policies. - DetailsType details; - details.apply_policies(policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - /// Increase the length of the Interceptor sequence by one. - const size_t new_len = old_len + 1; - this->interceptors_.size (new_len); - - // Add the interceptor - this->interceptors_[old_len].interceptor_ = - InterceptorType::_duplicate (interceptor); - - // Set the details - this->interceptors_[old_len].details_ = details; + this->interceptors_[old_len] = InterceptorType::_duplicate (interceptor); } else { @@ -198,9 +104,9 @@ namespace TAO } } - template <typename InterceptorType, typename DetailsType> + template <typename InterceptorType> void - Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors ( + Interceptor_List<InterceptorType>::destroy_interceptors ( ACE_ENV_SINGLE_ARG_DECL) { const size_t len = this->interceptors_.size (); @@ -241,5 +147,3 @@ namespace TAO ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 5160ec03377..bb3a29db0a8 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -24,19 +24,12 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { class Interceptor; typedef Interceptor *Interceptor_ptr; } -namespace CORBA -{ - class PolicyList; -} - namespace TAO { /** @@ -47,19 +40,14 @@ namespace TAO * Template for the various portable interceptor lists used * internally by TAO. */ - template <typename InterceptorType, typename DetailsType> + template <typename InterceptorType> class Interceptor_List { public: /// Define the traits for the underlying portable interceptor array. typedef typename InterceptorType::_var_type InterceptorType_var_type; typedef typename InterceptorType::_ptr_type InterceptorType_ptr_type; - - struct RegisteredInterceptor - { - InterceptorType_var_type interceptor_; - DetailsType details_; - }; + typedef ACE_Array_Base<InterceptorType_var_type> TYPE; /// Constructor. Interceptor_List (void); @@ -68,35 +56,22 @@ namespace TAO InterceptorType_ptr_type i ACE_ENV_ARG_DECL); - /// Register an interceptor with policies. - void add_interceptor (InterceptorType_ptr_type i, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); - /// Return the registered interceptor in sequence element @a index. - RegisteredInterceptor& registered_interceptor ( - size_t index); - /// Return the interceptor in sequence element @a index. InterceptorType_ptr_type interceptor (size_t index); size_t size (void); private: - - typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray; - /// Dynamic array of registered interceptors. - RegisteredArray interceptors_; + TYPE interceptors_; + }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/PI/Interceptor_List_T.cpp" +#include "Interceptor_List_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/PI/InvalidSlotA.cpp b/TAO/tao/PI/InvalidSlotA.cpp index 1c099df47c0..638e24ea2f2 100644 --- a/TAO/tao/PI/InvalidSlotA.cpp +++ b/TAO/tao/PI/InvalidSlotA.cpp @@ -33,12 +33,10 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -#include "tao/PI/InvalidSlotA.h" +#include "InvalidSlotA.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 @@ -149,5 +147,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InvalidSlotA.h b/TAO/tao/PI/InvalidSlotA.h index 323675bc790..bd02e893965 100644 --- a/TAO/tao/PI/InvalidSlotA.h +++ b/TAO/tao/PI/InvalidSlotA.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { // TAO_IDL - Generated from @@ -93,8 +91,6 @@ TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInte // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp index e70f2b68fb2..441c13306f4 100644 --- a/TAO/tao/PI/InvalidSlotC.cpp +++ b/TAO/tao/PI/InvalidSlotC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/PI/InvalidSlotA.h" +#include "InvalidSlotA.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -173,5 +171,3 @@ CORBA::Boolean operator>> ( { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/InvalidSlotC.h b/TAO/tao/PI/InvalidSlotC.h index cefb3fb9adb..47acd600e79 100644 --- a/TAO/tao/PI/InvalidSlotC.h +++ b/TAO/tao/PI/InvalidSlotC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -133,8 +131,6 @@ TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::In // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 0677994dc3e..658f11d6238 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PI/ORBInitInfo.h" +#include "ORBInitInfo.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -11,7 +11,7 @@ #include "ace/Service_Config.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/PICurrent.h" +#include "PICurrent.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ ACE_RCSID (TAO, @@ -19,13 +19,11 @@ ACE_RCSID (TAO, "$Id$") #if !defined (__ACE_INLINE__) -#include "tao/PI/ORBInitInfo.inl" +#include "ORBInitInfo.inl" #endif /* defined INLINE */ #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations for TAO_ORBInitInfo. TAO_ORBInitInfo_ptr @@ -140,11 +138,11 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL) if (loader != 0) { - CORBA::Object_var cf = + CORBA::Object_ptr cf = loader->create_object (this->orb_core_->orb (), 0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (IOP::CodecFactory::_nil ()); - this->codec_factory_ = IOP::CodecFactory::_narrow (cf.in ()); + this->codec_factory_ = IOP::CodecFactory::_narrow (cf); } } @@ -260,86 +258,6 @@ TAO_ORBInitInfo::add_ior_interceptor ( ACE_ENV_ARG_PARAMETER); } -void -TAO_ORBInitInfo::add_client_request_interceptor_with_policy ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)) -{ -# if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - this->orb_core_->add_interceptor (interceptor, - policies - ACE_ENV_ARG_PARAMETER); -#else - ACE_UNUSED_ARG (interceptor); - ACE_UNUSED_ARG (policies); - ACE_THROW (CORBA::NO_IMPLEMENT ( - CORBA::SystemException::_tao_minor_code ( - 0, - ENOTSUP), - CORBA::COMPLETED_NO)); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ -} - -void -TAO_ORBInitInfo::add_server_request_interceptor_with_policy ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)) -{ -# if TAO_HAS_INTERCEPTORS == 1 - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - this->orb_core_->add_interceptor (interceptor, - policies - ACE_ENV_ARG_PARAMETER); - -#else - ACE_UNUSED_ARG (interceptor); - ACE_UNUSED_ARG (policies); - ACE_THROW (CORBA::NO_IMPLEMENT ( - CORBA::SystemException::_tao_minor_code ( - 0, - ENOTSUP), - CORBA::COMPLETED_NO)); -#endif /* TAO_HAS_INTERCEPTORS == 1 */ -} - -void -TAO_ORBInitInfo::add_ior_interceptor_with_policy ( - PortableInterceptor::IORInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)) -{ - this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // Since there are currently no PI Policies that pertain to - // IOR Interceptors, we will always raise the NO_IMPLEMENT - // CORBA System Exception here to indicate that this method - // is currently not implemented/supported. - ACE_UNUSED_ARG (interceptor); - ACE_UNUSED_ARG (policies); - ACE_THROW (CORBA::NO_IMPLEMENT ( - CORBA::SystemException::_tao_minor_code ( - 0, - ENOTSUP), - CORBA::COMPLETED_NO)); -} - PortableInterceptor::SlotId TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -465,4 +383,3 @@ const char* TAO_ORBInitInfo::_interface_repository_id (void) const return "IDL:TAO_ORBInitInfo:1.0"; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 63c78095104..f83238f0305 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/ORBInitInfoC.h" +#include "ORBInitInfoC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -35,8 +35,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_ORBInitInfo; typedef TAO_ORBInitInfo *TAO_ORBInitInfo_ptr; @@ -50,14 +48,14 @@ typedef TAO_Objref_Out_T<TAO_ORBInitInfo> /** * @class TAO_ORBInitInfo * - * @brief An implementation of the PortableInterceptor::ORBInitInfo_3_1 + * @brief An implementation of the PortableInterceptor::ORBInitInfo * interface. * * This class encapsulates the data passed to ORBInitializers during * ORB initialization. */ class TAO_PI_Export TAO_ORBInitInfo - : public virtual PortableInterceptor::ORBInitInfo_3_1, + : public virtual PortableInterceptor::ORBInitInfo, public virtual TAO_Local_RefCounted_Object { public: @@ -142,36 +140,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ORBInitInfo::DuplicateName)); - /// Register a client request interceptor with the ORB currently - /// being initialized, along with a list of policies. - virtual void add_client_request_interceptor_with_policy ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)); - - /// Register a server request interceptor with the ORB currently - /// being initialized, along with a list of policies. - virtual void add_server_request_interceptor_with_policy ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)); - - /// Register an IOR interceptor with the ORB currently being - /// initialized, along with a list of policies. - virtual void add_ior_interceptor_with_policy ( - PortableInterceptor::IORInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ORBInitInfo::DuplicateName, - CORBA::PolicyError)); - /// Reserve a slot in table found within the /// PortableInterceptor::Current object. virtual PortableInterceptor::SlotId allocate_slot_id ( @@ -325,10 +293,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/PI/ORBInitInfo.inl" +#include "ORBInitInfo.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl index f151fd2711d..bb8d32ed135 100644 --- a/TAO/tao/PI/ORBInitInfo.inl +++ b/TAO/tao/PI/ORBInitInfo.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ORB_Core * TAO_ORBInitInfo::orb_core (void) const { @@ -22,5 +20,3 @@ TAO_ORBInitInfo::slot_count (void) const { return this->slot_count_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitInfo.pidl b/TAO/tao/PI/ORBInitInfo.pidl index 052b05c0372..cade887bc03 100644 --- a/TAO/tao/PI/ORBInitInfo.pidl +++ b/TAO/tao/PI/ORBInitInfo.pidl @@ -11,7 +11,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci + * -o orig -Gp -Gd -Ge 1 -GA -Sc -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" @@ -22,10 +22,10 @@ #ifndef _ORBINITINFO_PIDL_ #define _ORBINITINFO_PIDL_ -#include "tao/StringSeq.pidl" +#include <StringSeq.pidl> #include "tao/CodecFactory/IOP_Codec_include.pidl" -#include "tao/PI_Forward.pidl" -#include "tao/Policy.pidl" +#include <PI_Forward.pidl> +#include <Policy.pidl> module PortableInterceptor { @@ -68,23 +68,6 @@ module PortableInterceptor { in CORBA::PolicyType type, in PolicyFactory policy_factory); }; - - local interface ORBInitInfo_3_1 : ORBInitInfo - { - void add_client_request_interceptor_with_policy( - in ClientRequestInterceptor interceptor, - in CORBA::PolicyList policies) - raises (DuplicateName, CORBA::PolicyError); - void add_server_request_interceptor_with_policy( - in ServerRequestInterceptor interceptor, - in CORBA::PolicyList policies) - raises (DuplicateName, CORBA::PolicyError); - void add_ior_interceptor_with_policy( - in IORInterceptor interceptor, - in CORBA::PolicyList policies) - raises (DuplicateName, CORBA::PolicyError); - }; - }; #endif /* _ORBINITINFO_PIDL_ */ diff --git a/TAO/tao/PI/ORBInitInfoA.cpp b/TAO/tao/PI/ORBInitInfoA.cpp new file mode 100644 index 00000000000..86c49b8a9e6 --- /dev/null +++ b/TAO/tao/PI/ORBInitInfoA.cpp @@ -0,0 +1,337 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "ORBInitInfoC.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "tao/AnyTypeCode/String_TypeCode_Static.h" +#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" +#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Impl_T.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:50 + +static TAO::TypeCode::Alias<char const *, + CORBA::TypeCode_ptr const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId ( + CORBA::tk_alias, + "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0", + "ObjectId", + &CORBA::_tc_string); + +::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId = + &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] = + { + { "name", &CORBA::_tc_string } + + }; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName ( + CORBA::tk_except, + "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", + "DuplicateName", + _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName, + 1); + +::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName = + &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName ( + CORBA::tk_except, + "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0", + "InvalidName", + _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName, + 0); + +::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName = + &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/objref_typecode.cpp:76 + +static TAO::TypeCode::Objref<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ORBInitInfo ( + CORBA::tk_local_interface, + "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0", + "ORBInitInfo"); + +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr const _tc_ORBInitInfo = + &_tao_tc_PortableInterceptor_ORBInitInfo; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo_ptr _tao_elem + ) +{ + PortableInterceptor::ORBInitInfo_ptr _tao_objptr = + PortableInterceptor::ORBInitInfo::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::insert ( + _tao_any, + PortableInterceptor::ORBInitInfo::_tao_any_destructor, + PortableInterceptor::_tc_ORBInitInfo, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::extract ( + _tao_any, + PortableInterceptor::ORBInitInfo::_tao_any_destructor, + PortableInterceptor::_tc_ORBInitInfo, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const PortableInterceptor::ORBInitInfo::DuplicateName &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert_copy ( + _tao_any, + PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor, + PortableInterceptor::ORBInitInfo::_tc_DuplicateName, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo::DuplicateName *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::insert ( + _tao_any, + PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor, + PortableInterceptor::ORBInitInfo::_tc_DuplicateName, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const PortableInterceptor::ORBInitInfo::DuplicateName *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const PortableInterceptor::ORBInitInfo::DuplicateName *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::extract ( + _tao_any, + PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor, + PortableInterceptor::ORBInitInfo::_tc_DuplicateName, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const PortableInterceptor::ORBInitInfo::InvalidName &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert_copy ( + _tao_any, + PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor, + PortableInterceptor::ORBInitInfo::_tc_InvalidName, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo::InvalidName *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::insert ( + _tao_any, + PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor, + PortableInterceptor::ORBInitInfo::_tc_InvalidName, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const PortableInterceptor::ORBInitInfo::InvalidName *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const PortableInterceptor::ORBInitInfo::InvalidName *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::extract ( + _tao_any, + PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor, + PortableInterceptor::ORBInitInfo::_tc_InvalidName, + _tao_elem + ); +} diff --git a/TAO/tao/PI/ORBInitInfoC.cpp b/TAO/tao/PI/ORBInitInfoC.cpp index 6fee3193261..33580f1f439 100644 --- a/TAO/tao/PI/ORBInitInfoC.cpp +++ b/TAO/tao/PI/ORBInitInfoC.cpp @@ -26,29 +26,19 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:292 +// be\be_codegen.cpp:291 -#include "tao/PI/ORBInitInfoC.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "ORBInitInfoC.h" #include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:70 +// be\be_visitor_arg_traits.cpp:70 // Arg traits specializations. namespace TAO @@ -57,7 +47,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for PortableInterceptor::ORBInitInfo. @@ -83,35 +73,20 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void) return PortableInterceptor::ORBInitInfo::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal ( - const PortableInterceptor::ORBInitInfo_ptr p, + PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ORBInitInfo_ObjectId ( - ::CORBA::tk_alias, - "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0", - "ObjectId", - &CORBA::_tc_string); - -::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId = - &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId; - -// TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// TAO_IDL - Generated from +// be\be_visitor_exception/exception_cs.cpp:63 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", "DuplicateName" ) @@ -123,19 +98,19 @@ PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void) } PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) { - this->name = ::CORBA::string_dup (_tao_excp.name.in ()); + this->name = CORBA::string_dup (_tao_excp.name.in ()); } PortableInterceptor::ORBInitInfo::DuplicateName& PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); - this->name = ::CORBA::string_dup (_tao_excp.name.in ()); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->name = CORBA::string_dup (_tao_excp.name.in ()); return *this; } @@ -147,28 +122,28 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void } PortableInterceptor::ORBInitInfo::DuplicateName * -PortableInterceptor::ORBInitInfo::DuplicateName::_downcast ( ::CORBA::Exception *_tao_excp) +PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<DuplicateName *> (_tao_excp); } const PortableInterceptor::ORBInitInfo::DuplicateName * -PortableInterceptor::ORBInitInfo::DuplicateName::_downcast ( ::CORBA::Exception const *_tao_excp) +PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const DuplicateName *> (_tao_excp); } -::CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void) +CORBA::Exception *PortableInterceptor::ORBInitInfo::DuplicateName::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::DuplicateName, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * PortableInterceptor::ORBInitInfo::DuplicateName::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::ORBInitInfo::DuplicateName (*this), @@ -187,7 +162,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode ( @@ -195,58 +170,36 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_ctor.cpp:66 +// be\be_visitor_exception/exception_ctor.cpp:66 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName ( const char * _tao_name ) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", "DuplicateName" ) { - this->name = ::CORBA::string_dup (_tao_name); + this->name = CORBA::string_dup (_tao_name); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const +CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const { return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName; } -// TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] = - { - { "name", &CORBA::_tc_string } - - }; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName ( - ::CORBA::tk_except, - "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", - "DuplicateName", - _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName, - 1); - -::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName = - &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName; - -// TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// TAO_IDL - Generated from +// be\be_visitor_exception/exception_cs.cpp:63 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0", "InvalidName" ) @@ -258,7 +211,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void) } PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -268,7 +221,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInte PortableInterceptor::ORBInitInfo::InvalidName& PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -280,28 +233,28 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_ } PortableInterceptor::ORBInitInfo::InvalidName * -PortableInterceptor::ORBInitInfo::InvalidName::_downcast ( ::CORBA::Exception *_tao_excp) +PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<InvalidName *> (_tao_excp); } const PortableInterceptor::ORBInitInfo::InvalidName * -PortableInterceptor::ORBInitInfo::InvalidName::_downcast ( ::CORBA::Exception const *_tao_excp) +PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const InvalidName *> (_tao_excp); } -::CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void) +CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::PortableInterceptor::ORBInitInfo::InvalidName, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * PortableInterceptor::ORBInitInfo::InvalidName::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::ORBInitInfo::InvalidName (*this), @@ -320,7 +273,7 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode ( @@ -328,42 +281,32 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const +CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const { return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName; } -// TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ORBInitInfo_InvalidName ( - ::CORBA::tk_except, - "IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0", - "InvalidName", - _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName, - 0); - -::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName = - &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName; - PortableInterceptor::ORBInitInfo::ORBInitInfo (void) {} PortableInterceptor::ORBInitInfo::~ORBInitInfo (void) {} +void +PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer) +{ + ORBInitInfo *_tao_tmp_pointer = + static_cast<ORBInitInfo *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -374,7 +317,7 @@ PortableInterceptor::ORBInitInfo::_narrow ( PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -390,7 +333,7 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -400,7 +343,7 @@ PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ORBInitInfo::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -434,174 +377,8 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) { return false; } - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ORBInitInfo ( - ::CORBA::tk_local_interface, - "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0", - "ORBInitInfo"); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr const _tc_ORBInitInfo = - &_tao_tc_PortableInterceptor_ORBInitInfo; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for PortableInterceptor::ORBInitInfo_3_1. - -PortableInterceptor::ORBInitInfo_3_1_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::duplicate ( - PortableInterceptor::ORBInitInfo_3_1_ptr p - ) -{ - return PortableInterceptor::ORBInitInfo_3_1::_duplicate (p); -} - -void -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::release ( - PortableInterceptor::ORBInitInfo_3_1_ptr p - ) -{ - CORBA::release (p); -} - -PortableInterceptor::ORBInitInfo_3_1_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::nil (void) -{ - return PortableInterceptor::ORBInitInfo_3_1::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo_3_1>::marshal ( - const PortableInterceptor::ORBInitInfo_3_1_ptr p, - TAO_OutputCDR & cdr - ) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -PortableInterceptor::ORBInitInfo_3_1::ORBInitInfo_3_1 (void) -{} - -PortableInterceptor::ORBInitInfo_3_1::~ORBInitInfo_3_1 (void) -{} - -PortableInterceptor::ORBInitInfo_3_1_ptr -PortableInterceptor::ORBInitInfo_3_1::_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return ORBInitInfo_3_1::_duplicate ( - dynamic_cast<ORBInitInfo_3_1_ptr> (_tao_objref) - ); -} - -PortableInterceptor::ORBInitInfo_3_1_ptr -PortableInterceptor::ORBInitInfo_3_1::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return ORBInitInfo_3_1::_duplicate ( - dynamic_cast<ORBInitInfo_3_1_ptr> (_tao_objref) - ); -} - -PortableInterceptor::ORBInitInfo_3_1_ptr -PortableInterceptor::ORBInitInfo_3_1::_duplicate (ORBInitInfo_3_1_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -PortableInterceptor::ORBInitInfo_3_1::_tao_release (ORBInitInfo_3_1_ptr obj) -{ - CORBA::release (obj); -} - -::CORBA::Boolean -PortableInterceptor::ORBInitInfo_3_1::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/PortableInterceptor/ORBInitInfo_3_1:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return false; - } -} - -const char* PortableInterceptor::ORBInitInfo_3_1::_interface_repository_id (void) const -{ - return "IDL:omg.org/PortableInterceptor/ORBInitInfo_3_1:1.0"; -} - -::CORBA::Boolean -PortableInterceptor::ORBInitInfo_3_1::marshal (TAO_OutputCDR &) -{ - return false; -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ORBInitInfo_3_1 ( - ::CORBA::tk_local_interface, - "IDL:omg.org/PortableInterceptor/ORBInitInfo_3_1:1.0", - "ORBInitInfo_3_1"); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr const _tc_ORBInitInfo_3_1 = - &_tao_tc_PortableInterceptor_ORBInitInfo_3_1; -} - - - - -TAO_END_VERSIONED_NAMESPACE_DECL - - diff --git a/TAO/tao/PI/ORBInitInfoC.h b/TAO/tao/PI/ORBInitInfoC.h index 7ba6d29d08a..9b75a535ae2 100644 --- a/TAO/tao/PI/ORBInitInfoC.h +++ b/TAO/tao/PI/ORBInitInfoC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:164 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_ORBINITINFOC_H_ #define _TAO_IDL_ORIG_ORBINITINFOC_H_ @@ -41,21 +41,14 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/CodecFactory/IOP_Codec_includeC.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/Managed_Types.h" -#include "tao/AnyTypeCode/StringSeqA.h" -#include "tao/CodecFactory/IOP_Codec_includeA.h" -#include "tao/AnyTypeCode/PI_ForwardA.h" -#include "tao/AnyTypeCode/PolicyA.h" #include "tao/Objref_VarOut_T.h" -#include "tao/Versioned_Namespace.h" #include "tao/StringSeqC.h" -#include "tao/CodecFactory/IOP_Codec_includeC.h" #include "tao/PI_ForwardC.h" #include "tao/PolicyC.h" @@ -64,31 +57,36 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:49 +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be/be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_ - + class ClientRequestInterceptor; typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr; - + typedef TAO_Objref_Var_T< ClientRequestInterceptor > ClientRequestInterceptor_var; - + typedef TAO_Objref_Out_T< ClientRequestInterceptor @@ -96,22 +94,22 @@ namespace PortableInterceptor ClientRequestInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_ - + class ServerRequestInterceptor; typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr; - + typedef TAO_Objref_Var_T< ServerRequestInterceptor > ServerRequestInterceptor_var; - + typedef TAO_Objref_Out_T< ServerRequestInterceptor @@ -119,22 +117,22 @@ namespace PortableInterceptor ServerRequestInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_ - + class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; - + typedef TAO_Objref_Var_T< IORInterceptor > IORInterceptor_var; - + typedef TAO_Objref_Out_T< IORInterceptor @@ -142,22 +140,22 @@ namespace PortableInterceptor IORInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_ - + class PolicyFactory; typedef PolicyFactory *PolicyFactory_ptr; - + typedef TAO_Objref_Var_T< PolicyFactory > PolicyFactory_var; - + typedef TAO_Objref_Out_T< PolicyFactory @@ -165,22 +163,22 @@ namespace PortableInterceptor PolicyFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_ - + class ORBInitInfo; typedef ORBInitInfo *ORBInitInfo_ptr; - + typedef TAO_Objref_Var_T< ORBInitInfo > ORBInitInfo_var; - + typedef TAO_Objref_Out_T< ORBInitInfo @@ -188,79 +186,79 @@ namespace PortableInterceptor ORBInitInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_ - + class TAO_PI_Export ORBInitInfo - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef ORBInitInfo_ptr _ptr_type; typedef ORBInitInfo_var _var_type; - + // The static operations. static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj); - + static void _tao_release (ORBInitInfo_ptr obj); - + static ORBInitInfo_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitInfo_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ORBInitInfo_ptr _nil (void) { return static_cast<ORBInitInfo_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:413 - + // be\be_visitor_typedef/typedef_ch.cpp:413 + typedef char * ObjectId; - typedef ::CORBA::String_var ObjectId_var; - typedef ::CORBA::String_out ObjectId_out; - + typedef CORBA::String_var ObjectId_var; + typedef CORBA::String_out ObjectId_out; + // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr const _tc_ObjectId; - + // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:53 + // be\be_visitor_exception/exception_ch.cpp:53 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_ - - class TAO_PI_Export DuplicateName : public ::CORBA::UserException + + class TAO_PI_Export DuplicateName : public CORBA::UserException { public: - + TAO_String_Manager name; DuplicateName (void); DuplicateName (const DuplicateName &); ~DuplicateName (void); DuplicateName &operator= (const DuplicateName &); - + static void _tao_any_destructor (void *); - - static DuplicateName *_downcast ( ::CORBA::Exception *); - static const DuplicateName *_downcast ( ::CORBA::Exception const *); - - static ::CORBA::Exception *_alloc (void); - - virtual ::CORBA::Exception *_tao_duplicate (void) const; + + static DuplicateName *_downcast (CORBA::Exception *); + static const DuplicateName *_downcast (CORBA::Exception const *); + + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -268,53 +266,56 @@ namespace PortableInterceptor 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 - + // be\be_visitor_exception/exception_ctor.cpp:66 + DuplicateName ( const char * _tao_name ); - - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:129 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr const _tc_DuplicateName; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:53 + // be\be_visitor_exception/exception_ch.cpp:53 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_ - - class TAO_PI_Export InvalidName : public ::CORBA::UserException + + class TAO_PI_Export InvalidName : public CORBA::UserException { public: - + InvalidName (void); InvalidName (const InvalidName &); ~InvalidName (void); InvalidName &operator= (const InvalidName &); - + static void _tao_any_destructor (void *); - - static InvalidName *_downcast ( ::CORBA::Exception *); - static const InvalidName *_downcast ( ::CORBA::Exception const *); - - static ::CORBA::Exception *_alloc (void); - - virtual ::CORBA::Exception *_tao_duplicate (void) const; + + static InvalidName *_downcast (CORBA::Exception *); + static const InvalidName *_downcast (CORBA::Exception const *); + + static CORBA::Exception *_alloc (void); + + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -322,312 +323,184 @@ namespace PortableInterceptor TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:129 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr const _tc_InvalidName; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual ::CORBA::StringSeq * arguments ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual ::IOP::CodecFactory_ptr codec_factory ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void register_initial_reference ( const char * id, ::CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ORBInitInfo::InvalidName )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Object_ptr resolve_initial_references ( + // be\be_visitor_operation/operation_ch.cpp:46 + + virtual CORBA::Object_ptr resolve_initial_references ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ORBInitInfo::InvalidName )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void add_client_request_interceptor ( ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void add_server_request_interceptor ( ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void add_ior_interceptor ( ::PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ORBInitInfo::DuplicateName )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableInterceptor::SlotId allocate_slot_id ( + // be\be_visitor_operation/operation_ch.cpp:46 + + virtual PortableInterceptor::SlotId allocate_slot_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - + // be\be_visitor_operation/operation_ch.cpp:46 + virtual void register_policy_factory ( ::CORBA::PolicyType type, ::PortableInterceptor::PolicyFactory_ptr policy_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + // be\be_visitor_interface/interface_ch.cpp:210 + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. ORBInitInfo (void); - + virtual ~ORBInitInfo (void); - + private: // Private and unimplemented for concrete interfaces. ORBInitInfo (const ORBInitInfo &); - + void operator= (const ORBInitInfo &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - + // be\be_visitor_typecode/typecode_decl.cpp:44 + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo; - // TAO_IDL - Generated from - // be/be_interface.cpp:646 - -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1__VAR_OUT_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1__VAR_OUT_CH_ - - class ORBInitInfo_3_1; - typedef ORBInitInfo_3_1 *ORBInitInfo_3_1_ptr; - - typedef - TAO_Objref_Var_T< - ORBInitInfo_3_1 - > - ORBInitInfo_3_1_var; - - typedef - TAO_Objref_Out_T< - ORBInitInfo_3_1 - > - ORBInitInfo_3_1_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1_CH_ - - class TAO_PI_Export ORBInitInfo_3_1 - : public virtual ::PortableInterceptor::ORBInitInfo - { - public: - typedef ORBInitInfo_3_1_ptr _ptr_type; - typedef ORBInitInfo_3_1_var _var_type; - - // The static operations. - static ORBInitInfo_3_1_ptr _duplicate (ORBInitInfo_3_1_ptr obj); - - static void _tao_release (ORBInitInfo_3_1_ptr obj); - - static ORBInitInfo_3_1_ptr _narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static ORBInitInfo_3_1_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static ORBInitInfo_3_1_ptr _nil (void) - { - return static_cast<ORBInitInfo_3_1_ptr> (0); - } - - - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void add_client_request_interceptor_with_policy ( - ::PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - const ::CORBA::PolicyList & policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ORBInitInfo::DuplicateName, - ::CORBA::PolicyError - )) = 0; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void add_server_request_interceptor_with_policy ( - ::PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const ::CORBA::PolicyList & policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ORBInitInfo::DuplicateName, - ::CORBA::PolicyError - )) = 0; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void add_ior_interceptor_with_policy ( - ::PortableInterceptor::IORInterceptor_ptr interceptor, - const ::CORBA::PolicyList & policies - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableInterceptor::ORBInitInfo::DuplicateName, - ::CORBA::PolicyError - )) = 0; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 - - 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. - ORBInitInfo_3_1 (void); - - virtual ~ORBInitInfo_3_1 (void); - - private: - // Private and unimplemented for concrete interfaces. - ORBInitInfo_3_1 (const ORBInitInfo_3_1 &); - - void operator= (const ORBInitInfo_3_1 &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo_3_1; - // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_traits.cpp:62 +// be\be_visitor_traits.cpp:61 // Traits specializations. namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor> { @@ -638,17 +511,17 @@ namespace TAO ::PortableInterceptor::ClientRequestInterceptor_ptr ); static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::ClientRequestInterceptor_ptr p, + static CORBA::Boolean marshal ( + ::PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); }; #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor> { @@ -659,17 +532,17 @@ namespace TAO ::PortableInterceptor::ServerRequestInterceptor_ptr ); static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::ServerRequestInterceptor_ptr p, + static CORBA::Boolean marshal ( + ::PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); }; #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::IORInterceptor> { @@ -680,17 +553,17 @@ namespace TAO ::PortableInterceptor::IORInterceptor_ptr ); static ::PortableInterceptor::IORInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::IORInterceptor_ptr p, + static CORBA::Boolean marshal ( + ::PortableInterceptor::IORInterceptor_ptr p, TAO_OutputCDR & cdr ); }; #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_) -#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory> { @@ -701,17 +574,17 @@ namespace TAO ::PortableInterceptor::PolicyFactory_ptr ); static ::PortableInterceptor::PolicyFactory_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::PolicyFactory_ptr p, + static CORBA::Boolean marshal ( + ::PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ); }; #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo> { @@ -722,40 +595,48 @@ namespace TAO ::PortableInterceptor::ORBInitInfo_ptr ); static ::PortableInterceptor::ORBInitInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::ORBInitInfo_ptr p, + static CORBA::Boolean marshal ( + ::PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ); }; #endif /* end #if !defined */ +} -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1__TRAITS_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1__TRAITS_ +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_ch.cpp:52 - template<> - struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo_3_1> - { - static ::PortableInterceptor::ORBInitInfo_3_1_ptr duplicate ( - ::PortableInterceptor::ORBInitInfo_3_1_ptr - ); - static void release ( - ::PortableInterceptor::ORBInitInfo_3_1_ptr - ); - static ::PortableInterceptor::ORBInitInfo_3_1_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::ORBInitInfo_3_1_ptr p, - TAO_OutputCDR & cdr - ); - }; +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo_ptr &); -#endif /* end #if !defined */ -} +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName &); // copying version +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName*); // noncopying version +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::DuplicateName *&); // deprecated +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::DuplicateName *&); + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName &); // copying version +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName*); // noncopying version +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitInfo::InvalidName *&); // deprecated +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ORBInitInfo::InvalidName *&); // TAO_IDL - Generated from -// be/be_codegen.cpp:1101 +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp index 14a39962574..8c9660f49c3 100644 --- a/TAO/tao/PI/ORBInitializerA.cpp +++ b/TAO/tao/PI/ORBInitializerA.cpp @@ -25,17 +25,15 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/ORBInitializerA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ORBInitializerC.h" +#include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -43,14 +41,89 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ORBInitializer ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0", "ORBInitializer"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ORBInitializer = &_tao_tc_PortableInterceptor_ORBInitializer; } -TAO_END_VERSIONED_NAMESPACE_DECL + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ORBInitializer>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ORBInitializer_ptr _tao_elem + ) +{ + PortableInterceptor::ORBInitializer_ptr _tao_objptr = + PortableInterceptor::ORBInitializer::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ORBInitializer_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::insert ( + _tao_any, + PortableInterceptor::ORBInitializer::_tao_any_destructor, + PortableInterceptor::_tc_ORBInitializer, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ORBInitializer_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::extract ( + _tao_any, + PortableInterceptor::ORBInitializer::_tao_any_destructor, + PortableInterceptor::_tc_ORBInitializer, + _tao_elem + ); +} diff --git a/TAO/tao/PI/ORBInitializerA.h b/TAO/tao/PI/ORBInitializerA.h deleted file mode 100644 index fa6f6273d1e..00000000000 --- a/TAO/tao/PI/ORBInitializerA.h +++ /dev/null @@ -1,62 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_ORBINITIALIZERA_H_ -#define _TAO_IDL_ORBINITIALIZERA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/ORBInitializerC.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/ORBInitializerC.cpp b/TAO/tao/PI/ORBInitializerC.cpp index 28476830769..5703c44af1b 100644 --- a/TAO/tao/PI/ORBInitializerC.cpp +++ b/TAO/tao/PI/ORBInitializerC.cpp @@ -26,18 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI/ORBInitializerC.h" +#include "ORBInitializerC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void) return PortableInterceptor::ORBInitializer::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal ( PortableInterceptor::ORBInitializer_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ORBInitializer::ORBInitializer (void) @@ -86,9 +88,17 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void) PortableInterceptor::ORBInitializer::~ORBInitializer (void) {} +void +PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer) +{ + ORBInitializer *_tao_tmp_pointer = + static_cast<ORBInitializer *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -99,7 +109,7 @@ PortableInterceptor::ORBInitializer::_narrow ( PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -125,7 +135,7 @@ PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ORBInitializer::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -159,10 +169,8 @@ const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ORBInitializerC.h b/TAO/tao/PI/ORBInitializerC.h index 95080c13aca..dcea0ec082f 100644 --- a/TAO/tao/PI/ORBInitializerC.h +++ b/TAO/tao/PI/ORBInitializerC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_ORBINITIALIZERC_H_ -#define _TAO_IDL_ORBINITIALIZERC_H_ +#ifndef _TAO_IDL_ORIG_ORBINITIALIZERC_H_ +#define _TAO_IDL_ORIG_ORBINITIALIZERC_H_ #include /**/ "ace/pre.h" @@ -52,16 +52,23 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_ @@ -84,7 +91,7 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_ @@ -113,7 +120,7 @@ namespace PortableInterceptor #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_ class TAO_PI_Export ORBInitializer - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef ORBInitializer_ptr _ptr_type; @@ -125,12 +132,12 @@ namespace PortableInterceptor static void _tao_release (ORBInitializer_ptr obj); static ORBInitializer_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ORBInitializer_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -139,7 +146,7 @@ namespace PortableInterceptor return static_cast<ORBInitializer_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -149,7 +156,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from @@ -160,19 +167,19 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. @@ -188,9 +195,14 @@ namespace PortableInterceptor }; #endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -201,8 +213,8 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_ template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo> @@ -214,7 +226,7 @@ namespace TAO ::PortableInterceptor::ORBInitInfo_ptr ); static ::PortableInterceptor::ORBInitInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ); @@ -222,8 +234,8 @@ namespace TAO #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_) -#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_ template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitializer> @@ -235,7 +247,7 @@ namespace TAO ::PortableInterceptor::ORBInitializer_ptr ); static ::PortableInterceptor::ORBInitializer_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ORBInitializer_ptr p, TAO_OutputCDR & cdr ); @@ -245,9 +257,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ORBInitializer_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ORBInitializer_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 919abb2706e..55efc3a28a9 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -1,6 +1,6 @@ -#include "tao/PI/ORBInitializer_Registry_Impl.h" -#include "tao/PI/ORBInitInfo.h" -#include "tao/PI/PICurrent.h" +#include "ORBInitializer_Registry_Impl.h" +#include "ORBInitInfo.h" +#include "PICurrent.h" #include "tao/ORB_Core.h" #include "tao/ORB_Constants.h" @@ -14,9 +14,6 @@ ACE_RCSID (PI, ORBInitializer_Registry, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ORBInitializer_Registry::ORBInitializer_Registry (void) : lock_ (), initializers_ () @@ -161,15 +158,6 @@ TAO::ORBInitializer_Registry::post_init ( #if TAO_HAS_INTERCEPTORS == 1 CORBA::Object_ptr picurrent_ptr = orb_core->pi_current (); - PortableInterceptor::SlotId slot_count = orb_init_info_->slot_count (); - - if (CORBA::is_nil (picurrent_ptr) && slot_count != 0) - { - // Force instantiation of the PICurrent object. If we do not do it - // now, the slot count will be lost. - CORBA::Object_var tmp = orb_core->resolve_picurrent (); - picurrent_ptr = orb_core->pi_current (); - } if (!CORBA::is_nil (picurrent_ptr)) { @@ -177,7 +165,7 @@ TAO::ORBInitializer_Registry::post_init ( if (pi) { - pi->initialize (slot_count ACE_ENV_ARG_PARAMETER); + pi->initialize (orb_init_info_->slot_count () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -190,8 +178,6 @@ TAO::ORBInitializer_Registry::post_init ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (ORBInitializer_Registry, ACE_TEXT ("ORBInitializer_Registry"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index edb5a2bfc26..66464bf77d8 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/PI.h" +#include "PI.h" #include "tao/CORBA_methods.h" #include "tao/Objref_VarOut_T.h" @@ -31,8 +31,6 @@ #include "ace/Service_Config.h" #include "ace/Recursive_Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -41,7 +39,7 @@ namespace TAO * @brief Global list that contains all portable interceptor ORB * initializers. */ - class ORBInitializer_Registry + class TAO_PI_Export ORBInitializer_Registry : public ORBInitializer_Registry_Adapter { public: @@ -89,8 +87,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (ORBInitializer_Registry) ACE_FACTORY_DECLARE (TAO_PI, ORBInitializer_Registry) diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 3e18928cf8c..3088ad074b6 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -1,18 +1,13 @@ -#include "tao/PI/PI.h" -#include "tao/PI/ORBInitializer_Registry_Impl.h" -#include "tao/PI/PolicyFactory_Loader.h" -#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h" -#include "tao/PI/PICurrent_Loader.h" -#include "tao/PI/PI_ORBInitializer.h" -#include "tao/ORBInitializer_Registry.h" -#include "tao/ORB_Constants.h" +#include "PI.h" +#include "ORBInitializer_Registry_Impl.h" +#include "PolicyFactory_Loader.h" +#include "ClientRequestInterceptor_Factory_Impl.h" +#include "PICurrent_Loader.h" ACE_RCSID (PI, PI, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_PI_Init::Initializer (void) { @@ -22,46 +17,6 @@ TAO_PI_Init::Initializer (void) ACE_Service_Config::process_directive (ace_svc_desc_TAO_PICurrent_Loader); #endif /* TAO_HAS_INTERCEPTORS == 1 */ - int status = ACE_Service_Config::process_directive ( - ace_svc_desc_ORBInitializer_Registry); -#if TAO_HAS_INTERCEPTORS == 1 - PortableInterceptor::ORBInitializer_ptr temp_orb_initializer = - PortableInterceptor::ORBInitializer::_nil (); - - PortableInterceptor::ORBInitializer_var orb_initializer; - - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY - { - /// Register the PI ORBInitializer. - - ACE_NEW_THROW_EX (temp_orb_initializer, - TAO_PI_ORBInitializer, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_TRY_CHECK; - - orb_initializer = temp_orb_initializer; - - PortableInterceptor::register_orb_initializer (orb_initializer.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - if (TAO_debug_level > 0) - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "(%P | %t) Caught exception:"); - } - return -1; - } - ACE_ENDTRY; -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - return status; + return ACE_Service_Config::process_directive (ace_svc_desc_ORBInitializer_Registry); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index da45315f182..d1849e3c781 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PI_Init * @@ -41,18 +37,16 @@ static int TAO_Requires_PI_Initializer = TAO_PI_Init::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #define TAO_PI_SAFE_INCLUDE -#include "tao/PI/ORBInitInfoC.h" -#include "tao/PI/PolicyFactoryC.h" -#include "tao/PI/ORBInitializerC.h" -#include "tao/PI/InterceptorC.h" -#include "tao/PI/ClientRequestInfoC.h" -#include "tao/PI/ClientRequestInterceptorC.h" -#include "tao/PI/PICurrentC.h" +#include "ORBInitInfoC.h" +#include "PolicyFactoryC.h" +#include "ORBInitializerC.h" +#include "InterceptorC.h" +#include "ClientRequestInfoC.h" +#include "ClientRequestInterceptorC.h" +#include "PICurrentC.h" #undef TAO_PI_SAFE_INCLUDE #endif /* TAO_PI_H */ diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 1212598ae47..dc3bf53884a 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -1,4 +1,4 @@ -#include "tao/PI/PICurrent.h" +#include "PICurrent.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,17 +8,16 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "tao/PI/PICurrent.inl" +# include "PICurrent.inl" #endif /* __ACE_INLINE__ */ -#include "tao/PI/PICurrent_Impl.h" +#include "PICurrent_Impl.h" #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" #include "tao/TAO_Server_Request.h" #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core) : orb_core_ (orb_core), @@ -121,6 +120,5 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index 1425f5eec74..3c52b628bae 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/PICurrentC.h" +#include "PICurrentC.h" #include "tao/LocalObject.h" #include "ace/Array_Base.h" @@ -35,8 +35,6 @@ # pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_ORB_Core; @@ -136,10 +134,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PI/PICurrent.inl" +# include "PICurrent.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl index aca42f2786c..7fd7fc77b1b 100644 --- a/TAO/tao/PI/PICurrent.inl +++ b/TAO/tao/PI/PICurrent.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableInterceptor::SlotId TAO::PICurrent::slot_count (void) const @@ -10,4 +9,3 @@ TAO::PICurrent::slot_count (void) const return this->slot_count_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl index 0ce4b8a7014..f60324effc1 100644 --- a/TAO/tao/PI/PICurrent.pidl +++ b/TAO/tao/PI/PICurrent.pidl @@ -20,9 +20,9 @@ #ifndef _PI_CURRENT_IDL_ #define _PI_CURRENT_IDL_ -#include "tao/PI/InvalidSlot.pidl" -#include "tao/PI_Forward.pidl" -#include "tao/Current.pidl" +#include <InvalidSlot.pidl> +#include <PI_Forward.pidl> +#include <Current.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp index bd234b398fd..27411a28fcb 100644 --- a/TAO/tao/PI/PICurrentA.cpp +++ b/TAO/tao/PI/PICurrentA.cpp @@ -32,11 +32,9 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -#include "tao/PI/PICurrentA.h" +#include "PICurrentA.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -129,5 +127,3 @@ operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrentA.h b/TAO/tao/PI/PICurrentA.h index f9096ff2667..092901e4ad4 100644 --- a/TAO/tao/PI/PICurrentA.h +++ b/TAO/tao/PI/PICurrentA.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/pi_export.h" +#include "pi_export.h" #include "tao/PI/PICurrentC.h" #if defined (TAO_EXPORT_MACRO) @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { // TAO_IDL - Generated from @@ -84,8 +82,6 @@ TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercepto // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/PICurrentC.cpp b/TAO/tao/PI/PICurrentC.cpp index 79c119255e9..197b87f3c07 100644 --- a/TAO/tao/PI/PICurrentC.cpp +++ b/TAO/tao/PI/PICurrentC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/PI/PICurrentC.h" +#include "PICurrentC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -180,5 +178,3 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrentC.h b/TAO/tao/PI/PICurrentC.h index 92e2360bbbb..242cd2d0ca5 100644 --- a/TAO/tao/PI/PICurrentC.h +++ b/TAO/tao/PI/PICurrentC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/pi_export.h" +#include "pi_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -68,8 +68,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -219,8 +217,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp index 9332b9c986a..7ad09ada95b 100644 --- a/TAO/tao/PI/PICurrent_Copy_Callback.cpp +++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp @@ -1,16 +1,14 @@ -#include "tao/PI/PICurrent_Copy_Callback.h" +#include "PICurrent_Copy_Callback.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/PICurrent_Impl.h" +#include "PICurrent_Impl.h" ACE_RCSID (tao, PICurrent_Copy_Callback, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::PICurrent_Copy_Callback::PICurrent_Copy_Callback (void) : src_ (0), dst_ (0) @@ -26,32 +24,28 @@ TAO::PICurrent_Copy_Callback::~PICurrent_Copy_Callback (void) this->src_->copy_callback (0); } -void +int TAO::PICurrent_Copy_Callback::execute (void) { if (this->src_ != 0 && this->dst_ != 0 && this->src_ != this->dst_) { - // Only do a copy when the destination still refers to the table - // of the src - if (this->dst_->lc_slot_table () != 0) - { - const PICurrent_Impl::Table & s = this->src_->current_slot_table (); + const PICurrent_Impl::Table & s = this->src_->current_slot_table (); - // Disable use of the logically copied slot table before - // performing the deep copy. - this->dst_->lc_slot_table (0); + // Disable use of the logically copied slot table before + // performing the deep copy. + this->dst_->lc_slot_table (0); - PICurrent_Impl::Table & d = this->dst_->slot_table (); + PICurrent_Impl::Table & d = this->dst_->slot_table (); - d = s; - } + d = s; // Prevent subsequent deep copies, effectively disabling this // callback. this->src_->copy_callback (0); - this->src_->destruction_callback (0); } + + return 0; } void @@ -62,6 +56,4 @@ TAO::PICurrent_Copy_Callback::src_and_dst (PICurrent_Impl * src, this->dst_ = dst; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h index 76f550e652f..5b5f17d4505 100644 --- a/TAO/tao/PI/PICurrent_Copy_Callback.h +++ b/TAO/tao/PI/PICurrent_Copy_Callback.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,9 +25,6 @@ #if TAO_HAS_INTERCEPTORS == 1 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class PICurrent_Impl; @@ -52,15 +49,12 @@ namespace TAO ~PICurrent_Copy_Callback (void); /// Perform the copy. - void execute (void); + int execute (void); /// Set the source and destination PICurrent_Impl objects. void src_and_dst (PICurrent_Impl * src, PICurrent_Impl * dst); private: - /// Disallow copying and assignment. - PICurrent_Copy_Callback (const PICurrent_Copy_Callback &); - PICurrent_Copy_Callback &operator= (const PICurrent_Copy_Callback &); /// Source PICurrent from which copies will be made. PICurrent_Impl * src_; @@ -71,8 +65,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index 4aa071e258c..ecbccc90274 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -1,4 +1,4 @@ -#include "tao/PI/PICurrent_Impl.h" +#include "PICurrent_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,17 +8,14 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "tao/PI/PICurrent_Impl.inl" +# include "PICurrent_Impl.inl" #endif /* __ACE_INLINE__ */ -#include "tao/PI/PICurrent_Copy_Callback.h" +#include "PICurrent_Copy_Callback.h" #include "tao/TAO_Server_Request.h" #include "tao/SystemException.h" #include "ace/Log_Msg.h" -#include "tao/debug.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PICurrent_Impl::PICurrent_Impl (void) : slot_table_ (), @@ -47,16 +44,9 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier // No need to check validity of SlotId. It is validated before this // method is invoked. - // Get the slot table that is currently active PICurrent_Impl::Table & table = this->current_slot_table (); - // The active slot table should never be a lazy copy of itself! - if (this->lc_slot_table_ == &this->slot_table_) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l"))); - ACE_THROW (CORBA::INTERNAL ()); - } + ACE_ASSERT (this->lc_slot_table_ != &this->slot_table_); CORBA::Any * any = 0; @@ -100,20 +90,10 @@ TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier, // method is invoked. // Perform deep copy of the logically copied slot table, if - // necessary, before modifying our own slot table. This is a setup - // where another PICurrent refers to our slot table, so we force the - // the other PICurrent does copy our table before making changes to - // our table. - if (this->copy_callback_ != 0) - this->copy_callback_->execute (); - - // If we have a logical copied slot table we refer to, just make a - // copy of that table first before making changes to our table. - if (this->lc_slot_table_ != 0) - { - this->slot_table_ = *this->lc_slot_table_; - this->lc_slot_table_ = 0; - } + // necessary, before modifying our own slot table. + if (this->copy_callback_ != 0 + && this->copy_callback_->execute () != 0) + ACE_THROW (CORBA::INTERNAL ()); // If the slot table array isn't large enough, then increase its // size. We're guaranteed not to exceed the number of allocated @@ -129,15 +109,7 @@ void TAO::PICurrent_Impl::execute_destruction_callback ( TAO::PICurrent_Impl::Table * old_lc_slot_table) { - // we are being asked to lc another table, if this - // is null, make sure we take a physical copy of the - // existing table we had lc before it disappears. - if ((0 == old_lc_slot_table) && (0 != this->lc_slot_table_)) - this->slot_table_ = *this->lc_slot_table_; - this->lc_slot_table_ = old_lc_slot_table; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index b7d624a4c9b..d374f174e4b 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,13 +25,11 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/PICurrentC.h" +#include "PICurrentC.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Array_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_ORB_Core; @@ -85,7 +83,6 @@ namespace TAO /// notified of this object's destruction. void destruction_callback (PICurrent_Impl *p); - /// Execute the destruction callback object void execute_destruction_callback (Table *old_lc_slot_table); /// Return a reference to the underlying slot table. @@ -100,8 +97,7 @@ namespace TAO Table & current_slot_table (void); /// Logically (shallow) copy the given slot table. - // returns true if copied, false if it would be self-referencing. - bool lc_slot_table (PICurrent_Impl *p); + void lc_slot_table (PICurrent_Impl *p); /// Return pointer to the logically copied slot table. /** @@ -113,7 +109,7 @@ namespace TAO private: /// Prevent copying through the copy constructor and the assignment - /// operator. + //operator. //@{ PICurrent_Impl (const PICurrent_Impl &); void operator= (const PICurrent_Impl &); @@ -129,25 +125,18 @@ namespace TAO Table *lc_slot_table_; /// Callback object responsible for performing deep copies of a - /// PICurrent's slot table. This is the PICurrent that has our slot_table_ - /// referred as lc_slot_table_. This copy is there to make sure that when - /// we want to modify our table, that we can first copy our table to - /// the PICurrent that refers to our table so that it has an unique copy - /// of the data. + /// PICurrent's slot table. PICurrent_Copy_Callback *copy_callback_; /// PICurrent_Impl object that will be notified of this object's - /// destruction. This is the PICurrent that has our slot_table_ as - /// lc_slot_table_. + /// destruction. PICurrent_Impl *destruction_callback_; }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PI/PICurrent_Impl.inl" +# include "PICurrent_Impl.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl index 78c5e33cac6..8b708ec7f5a 100644 --- a/TAO/tao/PI/PICurrent_Impl.inl +++ b/TAO/tao/PI/PICurrent_Impl.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO::PICurrent_Impl::copy_callback (TAO::PICurrent_Copy_Callback *cb) { @@ -29,36 +27,25 @@ TAO::PICurrent_Impl::current_slot_table (void) this->lc_slot_table_ == 0 ? this->slot_table_ : *this->lc_slot_table_; } -ACE_INLINE bool +ACE_INLINE void TAO::PICurrent_Impl::lc_slot_table (TAO::PICurrent_Impl *p) { - // Being told to lazy copy some other table? if (p != 0) { - // Which actual table are we supposed to lazy copy? Table * t = &p->current_slot_table (); - // Only if we have not already lazy copied this table if (t != this->lc_slot_table_) { - // Whould this be a lazy copy of ourselves? - if (t == &this->slot_table_) - this->lc_slot_table_ = 0; // Already ourself! - else - { - this->lc_slot_table_ = t; + this->lc_slot_table_ = t; - // Ensure remote table will tell us if it is - // going to change or destroy itself. - if (this != p) - p->destruction_callback (this); - } + if (this != p) + p->destruction_callback (this); } + else + this->lc_slot_table_ = 0; } else this->lc_slot_table_ = 0; - - return (0 != this->lc_slot_table_); } ACE_INLINE TAO::PICurrent_Impl::Table * @@ -66,5 +53,3 @@ TAO::PICurrent_Impl::lc_slot_table (void) const { return this->lc_slot_table_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index 639ad627d58..1423cd7c663 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -11,11 +11,11 @@ */ // ================================================================= -#include "tao/PI/PICurrent_Loader.h" +#include "PICurrent_Loader.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI/PICurrent.h" +#include "PICurrent.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" @@ -25,8 +25,6 @@ ACE_RCSID (PI, PICurrent_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Object_ptr TAO_PICurrent_Loader::create_object ( CORBA::ORB_ptr orb, @@ -42,8 +40,6 @@ TAO_PICurrent_Loader::create_object ( return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader, ACE_TEXT ("PICurrent_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index a1b4e48cfa9..931d2216082 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +31,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PI_Export TAO_PICurrent_Loader : public TAO_Object_Loader { @@ -45,8 +43,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader) ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader) diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp index 4553d880091..b2eab47619a 100644 --- a/TAO/tao/PI/PIForwardRequestA.cpp +++ b/TAO/tao/PI/PIForwardRequestA.cpp @@ -25,43 +25,37 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/PIForwardRequestA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PIForwardRequestC.h" +#include "tao/CDR.h" -// TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const -{ - return ::PortableInterceptor::_tc_ForwardRequest; -} // TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 +// be\be_visitor_typecode/struct_typecode.cpp:87 -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] = +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] = { { "forward", &CORBA::_tc_Object } - + }; static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ForwardRequest ( - ::CORBA::tk_except, + CORBA::tk_except, "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", "ForwardRequest", _tao_fields_PortableInterceptor_ForwardRequest, 1); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ForwardRequest = @@ -70,24 +64,24 @@ namespace PortableInterceptor -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 namespace TAO { template<> - ::CORBA::Boolean + CORBA::Boolean Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value ( TAO_InputCDR & cdr ) { - ::CORBA::String_var id; - + CORBA::String_var id; + if (!(cdr >> id.out ())) { return false; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -98,14 +92,14 @@ namespace TAO return false; } ACE_ENDTRY; - + return true; } } // Copying insertion. void operator<<= ( - ::CORBA::Any &_tao_any, + CORBA::Any &_tao_any, const PortableInterceptor::ForwardRequest &_tao_elem ) { @@ -119,7 +113,7 @@ void operator<<= ( // Non-copying insertion. void operator<<= ( - ::CORBA::Any &_tao_any, + CORBA::Any &_tao_any, PortableInterceptor::ForwardRequest *_tao_elem ) { @@ -132,8 +126,8 @@ void operator<<= ( } // Extraction to non-const pointer (deprecated). -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, PortableInterceptor::ForwardRequest *&_tao_elem ) { @@ -144,8 +138,8 @@ void operator<<= ( } // Extraction to const pointer. -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, const PortableInterceptor::ForwardRequest *&_tao_elem ) { @@ -157,5 +151,3 @@ void operator<<= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PIForwardRequestA.h b/TAO/tao/PI/PIForwardRequestA.h deleted file mode 100644 index 56ccfdaa1ba..00000000000 --- a/TAO/tao/PI/PIForwardRequestA.h +++ /dev/null @@ -1,70 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_PIFORWARDREQUESTA_H_ -#define _TAO_IDL_PIFORWARDREQUESTA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/PIForwardRequestC.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -// TAO_IDL - Generated from -// be\be_visitor_exception/any_op_ch.cpp:53 - -TAO_PI_Export void operator<<= (::CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version -TAO_PI_Export void operator<<= (::CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version -TAO_PI_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated -TAO_PI_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const PortableInterceptor::ForwardRequest *&); - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp index 4ed08fabe20..7ecc261b227 100644 --- a/TAO/tao/PI/PIForwardRequestC.cpp +++ b/TAO/tao/PI/PIForwardRequestC.cpp @@ -26,19 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI/PIForwardRequestC.h" +#include "PIForwardRequestC.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -49,7 +51,7 @@ namespace TAO // be\be_visitor_exception/exception_cs.cpp:63 PortableInterceptor::ForwardRequest::ForwardRequest (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", "ForwardRequest" ) @@ -61,7 +63,7 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void) } PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -72,7 +74,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor PortableInterceptor::ForwardRequest& PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ()); return *this; } @@ -85,28 +87,28 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p } PortableInterceptor::ForwardRequest * -PortableInterceptor::ForwardRequest::_downcast ( ::CORBA::Exception *_tao_excp) +PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<ForwardRequest *> (_tao_excp); } const PortableInterceptor::ForwardRequest * -PortableInterceptor::ForwardRequest::_downcast ( ::CORBA::Exception const *_tao_excp) +PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const ForwardRequest *> (_tao_excp); } -::CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void) +CORBA::Exception *PortableInterceptor::ForwardRequest::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::PortableInterceptor::ForwardRequest, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * PortableInterceptor::ForwardRequest::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableInterceptor::ForwardRequest (*this), @@ -130,7 +132,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode ( return; } - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void PortableInterceptor::ForwardRequest::_tao_decode ( @@ -143,7 +145,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode ( return; } - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } @@ -152,9 +154,9 @@ void PortableInterceptor::ForwardRequest::_tao_decode ( // be\be_visitor_exception/exception_ctor.cpp:66 PortableInterceptor::ForwardRequest::ForwardRequest ( - const ::CORBA::Object_ptr _tao_forward + const CORBA::Object_ptr _tao_forward ) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", "ForwardRequest" ) @@ -162,12 +164,16 @@ PortableInterceptor::ForwardRequest::ForwardRequest ( this->forward = CORBA::Object::_duplicate (_tao_forward); } - +// TAO extension - the virtual _type method. +CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const +{ + return ::PortableInterceptor::_tc_ForwardRequest; +} // TAO_IDL - Generated from // be\be_visitor_exception/cdr_op_cs.cpp:60 -::CORBA::Boolean operator<< ( +CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const PortableInterceptor::ForwardRequest &_tao_aggregate ) @@ -186,7 +192,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest ( } } -::CORBA::Boolean operator>> ( +CORBA::Boolean operator>> ( TAO_InputCDR &strm, PortableInterceptor::ForwardRequest &_tao_aggregate ) @@ -196,5 +202,3 @@ PortableInterceptor::ForwardRequest::ForwardRequest ( (strm >> _tao_aggregate.forward.out ()) ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PIForwardRequestC.h b/TAO/tao/PI/PIForwardRequestC.h index 73de9b859a6..f26359f8365 100644 --- a/TAO/tao/PI/PIForwardRequestC.h +++ b/TAO/tao/PI/PIForwardRequestC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_PIFORWARDREQUESTC_H_ -#define _TAO_IDL_PIFORWARDREQUESTC_H_ +#ifndef _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_ +#define _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_ #include /**/ "ace/pre.h" @@ -50,10 +50,17 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { @@ -64,11 +71,11 @@ namespace PortableInterceptor #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_) #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_ - class TAO_PI_Export ForwardRequest : public ::CORBA::UserException + class TAO_PI_Export ForwardRequest : public CORBA::UserException { public: - ::CORBA::Object_var forward; + CORBA::Object_var forward; ForwardRequest (void); ForwardRequest (const ForwardRequest &); ~ForwardRequest (void); @@ -77,12 +84,12 @@ namespace PortableInterceptor static void _tao_any_destructor (void *); - static ForwardRequest *_downcast ( ::CORBA::Exception *); - static const ForwardRequest *_downcast ( ::CORBA::Exception const *); + static ForwardRequest *_downcast (CORBA::Exception *); + static const ForwardRequest *_downcast (CORBA::Exception const *); - static ::CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (void); - virtual ::CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -100,16 +107,24 @@ namespace PortableInterceptor // be\be_visitor_exception/exception_ctor.cpp:66 ForwardRequest ( - const ::CORBA::Object_ptr _tao_forward + const CORBA::Object_ptr _tao_forward ); - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:129 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest; #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -122,15 +137,29 @@ namespace TAO } // TAO_IDL - Generated from +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ForwardRequest *&); + +// TAO_IDL - Generated from // be\be_visitor_exception/cdr_op_ch.cpp:52 -TAO_PI_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &); -TAO_PI_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &); +TAO_PI_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ForwardRequest &); +TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ForwardRequest &); // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp deleted file mode 100644 index c138481d1ee..00000000000 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ /dev/null @@ -1,107 +0,0 @@ -// -*- C++ -*- - -#include "tao/PI/PI_ORBInitializer.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/PI_PolicyFactory.h" -#include "tao/PI/ProcessingModePolicyC.h" -#include "tao/ORB_Core.h" -#include "tao/PI/ORBInitInfoC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_RCSID (tao, - PI_ORBInitializer, - "$Id$") - -void -TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - ACE_UNUSED_ARG (info); -} - - -void -TAO_PI_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // The PI policy factory is stateless and reentrant, so share a - // single instance between all ORBs. - if (CORBA::is_nil (this->policy_factory_.in ())) - { - PortableInterceptor::PolicyFactory_ptr policy_factory; - ACE_NEW_THROW_EX (policy_factory, - TAO_PI_PolicyFactory, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO::VMCID, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK; - - this->policy_factory_ = policy_factory; - } - - - this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - - -void -TAO_PI_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) -{ - // Register the PI policy factory. - - // Bind the same policy factory to all PortableInterceptor related policy - // types since a single policy factory is used to create each of the - // different types of PortableInterceptor policies. - CORBA::PolicyType type[] = { - PortableInterceptor::PROCESSING_MODE_POLICY_TYPE - }; - - const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); - - for (CORBA::PolicyType *i = type; i != end; ++i) - { - ACE_TRY - { - info->register_policy_factory (*i, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCH (CORBA::BAD_INV_ORDER, ex) - { - if (ex.minor () == (CORBA::OMGVMCID | 16)) - { - // The factory is already there, it happens because the - // magic initializer in PI_Initializer.cpp registers - // with the ORB multiple times. This is an indication - // that we should do no more work in this - // ORBInitializer. - return; - } - ACE_RE_THROW; - } - ACE_CATCHANY - { - // Rethrow any other exceptions... - ACE_RE_THROW; - } - ACE_ENDTRY; - ACE_CHECK; - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h deleted file mode 100644 index 92d62abfef6..00000000000 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ /dev/null @@ -1,84 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file PI_ORBInitializer.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_PI_ORB_INITIALIZER_H -#define TAO_PI_ORB_INITIALIZER_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/pi_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "tao/PI/ORBInitializerC.h" -#include "tao/PI/PolicyFactoryC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/// Forward Declarations -class TAO_PI_PolicyFactory; - -/// PortableServer ORB initializer. -class TAO_PI_Export TAO_PI_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object -{ -public: - - /** - * @name PortableInterceptor::ORBInitializer methods - * - * The following methods are required by the - * PortableInterceptor::ORBInitializer interface. - */ - //@{ - - void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - //@} - - -private: - - /// Register PortableInterceptor policy factories. - void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); - - - /// Instance of the PI policy factory. - /** - * The PI policy factory is stateless and reentrant, so share - * a single instance between all ORBs. - */ - PortableInterceptor::PolicyFactory_var policy_factory_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_PI_ORB_INITIALIZER_H */ diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp deleted file mode 100644 index 3f82ffff341..00000000000 --- a/TAO/tao/PI/PI_PolicyFactory.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "tao/PI/PI_PolicyFactory.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/ProcessingModePolicy.h" -#include "tao/ORB_Constants.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_RCSID (tao, - PI_PolicyFactory, - "$Id$") - -CORBA::Policy_ptr -TAO_PI_PolicyFactory::create_policy ( - CORBA::PolicyType type, - const CORBA::Any &value - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) -{ - if (type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) - { - TAO_ProcessingModePolicy *processing_mode_policy = 0; - PortableInterceptor::ProcessingMode policy_value; - - if ((value >>= policy_value) == 0) - { - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), - CORBA::Policy::_nil ()); - } - - ACE_NEW_THROW_EX (processing_mode_policy, - TAO_ProcessingModePolicy (policy_value), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return processing_mode_policy; - } - - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), - CORBA::Policy::_nil ()); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h deleted file mode 100644 index eb7e4968015..00000000000 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ /dev/null @@ -1,52 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file PI_PolicyFactory.h - * - * $Id$ - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_PI_POLICY_FACTORY_H -#define TAO_PI_POLICY_FACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/pi_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "tao/PI/PolicyFactoryC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/// Policy factory for all PortableInterceptor related policies. -class TAO_PI_Export TAO_PI_PolicyFactory - : public virtual PortableInterceptor::PolicyFactory, - public virtual TAO_Local_RefCounted_Object -{ -public: - CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_PI_POLICY_FACTORY_H */ diff --git a/TAO/tao/PI/PolicyFactory.pidl b/TAO/tao/PI/PolicyFactory.pidl index f2ee6020c5a..57a5366b279 100644 --- a/TAO/tao/PI/PolicyFactory.pidl +++ b/TAO/tao/PI/PolicyFactory.pidl @@ -20,7 +20,7 @@ #ifndef _POLICYFACTORY_PIDL_ #define _POLICYFACTORY_PIDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp index ba611cec358..eba4bd3ab6a 100644 --- a/TAO/tao/PI/PolicyFactoryA.cpp +++ b/TAO/tao/PI/PolicyFactoryA.cpp @@ -25,32 +25,104 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/PolicyFactoryA.h" +#include "PolicyFactoryC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_PolicyFactory ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0", "PolicyFactory"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_PolicyFactory = &_tao_tc_PortableInterceptor_PolicyFactory; } -TAO_END_VERSIONED_NAMESPACE_DECL + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::PolicyFactory_ptr _tao_elem + ) +{ + PortableInterceptor::PolicyFactory_ptr _tao_objptr = + PortableInterceptor::PolicyFactory::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::PolicyFactory_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::insert ( + _tao_any, + PortableInterceptor::PolicyFactory::_tao_any_destructor, + PortableInterceptor::_tc_PolicyFactory, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::PolicyFactory_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::extract ( + _tao_any, + PortableInterceptor::PolicyFactory::_tao_any_destructor, + PortableInterceptor::_tc_PolicyFactory, + _tao_elem + ); +} diff --git a/TAO/tao/PI/PolicyFactoryA.h b/TAO/tao/PI/PolicyFactoryA.h deleted file mode 100644 index 2bbd578a36e..00000000000 --- a/TAO/tao/PI/PolicyFactoryA.h +++ /dev/null @@ -1,62 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_POLICYFACTORYA_H_ -#define _TAO_IDL_POLICYFACTORYA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/PolicyFactoryC.h" -#include "tao/AnyTypeCode/PolicyA.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index 49c458fd6be..9e58888ac22 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -26,17 +26,19 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// .\be\be_codegen.cpp:291 -#include "tao/PI/PolicyFactoryC.h" +#include "PolicyFactoryC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" -// TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:70 +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// .\be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -45,7 +47,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_interface/interface_cs.cpp:60 +// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for PortableInterceptor::PolicyFactory. @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) return PortableInterceptor::PolicyFactory::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::PolicyFactory::PolicyFactory (void) @@ -86,26 +88,46 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void) PortableInterceptor::PolicyFactory::~PolicyFactory (void) {} +void +PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer) +{ + PolicyFactory *_tao_tmp_pointer = + static_cast<PolicyFactory *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - return PolicyFactory::_duplicate ( - dynamic_cast<PolicyFactory_ptr> (_tao_objref) - ); + if (CORBA::is_nil (_tao_objref)) + { + return PolicyFactory::_nil (); + } + + PolicyFactory_ptr proxy = + dynamic_cast<PolicyFactory_ptr> (_tao_objref); + + return PolicyFactory::_duplicate (proxy); } PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - return PolicyFactory::_duplicate ( - dynamic_cast<PolicyFactory_ptr> (_tao_objref) - ); + if (CORBA::is_nil (_tao_objref)) + { + return PolicyFactory::_nil (); + } + + PolicyFactory_ptr proxy = + dynamic_cast<PolicyFactory_ptr> (_tao_objref); + + return PolicyFactory::_duplicate (proxy); } PortableInterceptor::PolicyFactory_ptr @@ -115,7 +137,7 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -125,7 +147,7 @@ PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::PolicyFactory::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -159,7 +181,7 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) { return false; @@ -176,5 +198,3 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 9737af6be89..aeccc94cc27 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// .\be\be_codegen.cpp:153 -#ifndef _TAO_IDL_POLICYFACTORYC_H_ -#define _TAO_IDL_POLICYFACTORYC_H_ +#ifndef _TAO_IDL_ORIG_POLICYFACTORYC_H_ +#define _TAO_IDL_ORIG_POLICYFACTORYC_H_ #include /**/ "ace/pre.h" @@ -41,13 +41,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/Objref_VarOut_T.h" #include "tao/PolicyC.h" @@ -57,16 +57,23 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // .\be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_ @@ -89,13 +96,13 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:54 + // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_ class TAO_PI_Export PolicyFactory - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef PolicyFactory_ptr _ptr_type; @@ -107,12 +114,12 @@ namespace PortableInterceptor static void _tao_release (PolicyFactory_ptr obj); static PolicyFactory_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static PolicyFactory_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -121,10 +128,10 @@ namespace PortableInterceptor return static_cast<PolicyFactory_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 + // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr create_policy ( ::CORBA::PolicyType type, @@ -132,7 +139,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::CORBA::PolicyError )) = 0; @@ -147,15 +154,15 @@ namespace PortableInterceptor )); // TAO_IDL - Generated from - // be\be_visitor_interface/interface_ch.cpp:210 + // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. @@ -172,8 +179,13 @@ namespace PortableInterceptor #endif /* end #if !defined */ + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory; + // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -184,8 +196,8 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_) -#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_ +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_ template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory> @@ -197,7 +209,7 @@ namespace TAO ::PortableInterceptor::PolicyFactory_ptr ); static ::PortableInterceptor::PolicyFactory_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ); @@ -207,9 +219,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index 3b8e49f062c..bea75ef3a0f 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -11,8 +11,8 @@ */ // ================================================================= -#include "tao/PI/PolicyFactory_Loader.h" -#include "tao/PI/PolicyFactory_Registry.h" +#include "PolicyFactory_Loader.h" +#include "PolicyFactory_Registry.h" #include "tao/ORB.h" #include "tao/debug.h" @@ -21,8 +21,6 @@ ACE_RCSID (PI, PolicyFactory_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::PolicyFactory_Registry_Adapter* TAO_PolicyFactory_Loader::create (void) { @@ -39,8 +37,6 @@ TAO_PolicyFactory_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_PolicyFactory_Loader, ACE_TEXT ("PolicyFactory_Loader"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index a25c378676e..10b0280f4d9 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI/pi_export.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "tao/PolicyFactory_Registry_Factory.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PI_Export TAO_PolicyFactory_Loader : public TAO_PolicyFactory_Registry_Factory { @@ -39,14 +37,12 @@ public: static int Initializer (void); }; -static int -TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader) ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader) +static int +TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer (); + #include /**/ "ace/post.h" #endif /* TAO_POLICYFACTORY_LOADER_H */ diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index e97382928c8..7999bbecc3c 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -1,5 +1,5 @@ -#include "tao/PI/PolicyFactory_Registry.h" -#include "tao/PI/PolicyFactoryC.h" +#include "PolicyFactory_Registry.h" +#include "PolicyFactoryC.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" #include "tao/PolicyC.h" @@ -11,8 +11,6 @@ ACE_RCSID (PI, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void) : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE) { @@ -119,5 +117,3 @@ TAO_PolicyFactory_Registry::factory_exists (CORBA::PolicyType & type) const return (this->factories_.find (type) == 0); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index 882f386c70c..05a5747d112 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -16,19 +16,17 @@ #include /**/ "ace/pre.h" -#include "tao/Basic_Types.h" +#include "pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" -#include "tao/PolicyFactory_Registry_Adapter.h" #include "ace/Map_Manager.h" #include "ace/Null_Mutex.h" #include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Basic_Types.h" +#include "tao/PolicyFactory_Registry_Adapter.h" /** * @class TAO_PolicyFactory_Registry @@ -38,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * ORB-specific registry that contains all portable interceptor * policy factories. */ -class TAO_PolicyFactory_Registry +class TAO_PI_Export TAO_PolicyFactory_Registry : public TAO::PolicyFactory_Registry_Adapter { public: @@ -95,8 +93,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_POLICY_FACTORY_REGISTRY_H */ diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp deleted file mode 100644 index 9f2feccfe82..00000000000 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#include "tao/PI/ProcessingModePolicy.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PortableInterceptorC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_RCSID (tao, - ProcessingModePolicy, - "$Id$") - -// Should this all be wrapped in #if (TAO_HAS_MINIMUM_POA == 0)? - -TAO_ProcessingModePolicy::TAO_ProcessingModePolicy - (PortableInterceptor::ProcessingMode mode) - : processing_mode_ (mode) -{ -} - -CORBA::Policy_ptr -TAO_ProcessingModePolicy::copy (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - TAO_ProcessingModePolicy *copy = 0; - ACE_NEW_THROW_EX (copy, - TAO_ProcessingModePolicy (this->processing_mode_), - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); - - return copy; -} - -void -TAO_ProcessingModePolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ -} - -PortableInterceptor::ProcessingMode -TAO_ProcessingModePolicy::processing_mode (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return processing_mode_; -} - -CORBA::PolicyType -TAO_ProcessingModePolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h deleted file mode 100644 index fe2c82462bf..00000000000 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file ProcessingModePolicy.h - * - * $Id$ - * - * @author Tim Bradley (bradley_t@ociweb.com) - */ -//============================================================================= - -#ifndef TAO_PROCESSING_MODE_POLICY_H -#define TAO_PROCESSING_MODE_POLICY_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/pi_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" -#include "tao/PI/ProcessingModePolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_ProcessingModePolicy - * - * @brief Implementation class for Portable Interceptor ProcessingModePolicy. - * - * This policy is used to specify which kinds of requests (collocated vs. - * remote) should (or should not) cause a Portable Interceptor to be used. - */ - -class TAO_PI_Export TAO_ProcessingModePolicy - : public PortableInterceptor::ProcessingModePolicy, - public TAO_Local_RefCounted_Object -{ -public: - /// Constructor. - TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode); - - virtual PortableInterceptor::ProcessingMode processing_mode - (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) - ACE_THROW_SPEC ((CORBA::SystemException)); - -private: - /// The attribute - PortableInterceptor::ProcessingMode processing_mode_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" -#endif /* TAO_PROCESSING_MODE_POLICY_H */ diff --git a/TAO/tao/PI/ProcessingModePolicy.pidl b/TAO/tao/PI/ProcessingModePolicy.pidl deleted file mode 100644 index 4b8a6bac91e..00000000000 --- a/TAO/tao/PI/ProcessingModePolicy.pidl +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @file ProcessingModePolicy.pidl - * - * $Id$ - * - * @brief Pre-compiled IDL source for the ProcessingModePolicy within - * the PortableInterceptor module. - * - * tao_idl \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA \ - * -Wb,export_include="tao/TAO_Export.h" \ - * -Wb,export_macro=TAO_Export \ - * -Wb,pre_include="ace/pre.h" \ - * -Wb,post_include="ace/post.h" \ - * ProcessingModePolicy.pidl - */ - -#ifndef _PROCESSING_MODE_POLICY_PIDL_ -#define _PROCESSING_MODE_POLICY_PIDL_ - -#include "tao/Policy.pidl" - -module PortableInterceptor -{ - - // ProcessingMode Policy (default = LOCAL_AND_REMOTE) - typedef short ProcessingMode; - const ProcessingMode LOCAL_AND_REMOTE = 0; - const ProcessingMode REMOTE_ONLY = 1; - const ProcessingMode LOCAL_ONLY = 2; - - /// @todo - Need to get the proper Policy Type code from OMG - const CORBA::PolicyType PROCESSING_MODE_POLICY_TYPE = 100; - - local interface ProcessingModePolicy : CORBA::Policy - { - readonly attribute ProcessingMode processing_mode; - }; - -}; - -#endif /* _PROCESSING_MODE_POLICY_PIDL_ */ diff --git a/TAO/tao/PI/ProcessingModePolicyC.cpp b/TAO/tao/PI/ProcessingModePolicyC.cpp deleted file mode 100644 index 56768cef58d..00000000000 --- a/TAO/tao/PI/ProcessingModePolicyC.cpp +++ /dev/null @@ -1,221 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:292 - - -#include "tao/PI/ProcessingModePolicyC.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" -#include "ace/OS_NS_string.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:70 - -// Arg traits specializations. -namespace TAO -{ -} - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ProcessingMode ( - ::CORBA::tk_alias, - "IDL:PortableInterceptor/ProcessingMode:1.0", - "ProcessingMode", - &CORBA::_tc_short); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr const _tc_ProcessingMode = - &_tao_tc_PortableInterceptor_ProcessingMode; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for PortableInterceptor::ProcessingModePolicy. - -PortableInterceptor::ProcessingModePolicy_ptr -TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::duplicate ( - PortableInterceptor::ProcessingModePolicy_ptr p - ) -{ - return PortableInterceptor::ProcessingModePolicy::_duplicate (p); -} - -void -TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::release ( - PortableInterceptor::ProcessingModePolicy_ptr p - ) -{ - CORBA::release (p); -} - -PortableInterceptor::ProcessingModePolicy_ptr -TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::nil (void) -{ - return PortableInterceptor::ProcessingModePolicy::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::marshal ( - const PortableInterceptor::ProcessingModePolicy_ptr p, - TAO_OutputCDR & cdr - ) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -PortableInterceptor::ProcessingModePolicy::ProcessingModePolicy (void) -{} - -PortableInterceptor::ProcessingModePolicy::~ProcessingModePolicy (void) -{} - -PortableInterceptor::ProcessingModePolicy_ptr -PortableInterceptor::ProcessingModePolicy::_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return ProcessingModePolicy::_duplicate ( - dynamic_cast<ProcessingModePolicy_ptr> (_tao_objref) - ); -} - -PortableInterceptor::ProcessingModePolicy_ptr -PortableInterceptor::ProcessingModePolicy::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return ProcessingModePolicy::_duplicate ( - dynamic_cast<ProcessingModePolicy_ptr> (_tao_objref) - ); -} - -PortableInterceptor::ProcessingModePolicy_ptr -PortableInterceptor::ProcessingModePolicy::_duplicate (ProcessingModePolicy_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -PortableInterceptor::ProcessingModePolicy::_tao_release (ProcessingModePolicy_ptr obj) -{ - CORBA::release (obj); -} - -::CORBA::Boolean -PortableInterceptor::ProcessingModePolicy::_is_a ( - const char *value - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Policy:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:PortableInterceptor/ProcessingModePolicy:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/LocalObject:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return false; - } -} - -const char* PortableInterceptor::ProcessingModePolicy::_interface_repository_id (void) const -{ - return "IDL:PortableInterceptor/ProcessingModePolicy:1.0"; -} - -::CORBA::Boolean -PortableInterceptor::ProcessingModePolicy::marshal (TAO_OutputCDR &) -{ - return false; -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableInterceptor_ProcessingModePolicy ( - ::CORBA::tk_local_interface, - "IDL:PortableInterceptor/ProcessingModePolicy:1.0", - "ProcessingModePolicy"); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr const _tc_ProcessingModePolicy = - &_tao_tc_PortableInterceptor_ProcessingModePolicy; -} - - - - -TAO_END_VERSIONED_NAMESPACE_DECL - - diff --git a/TAO/tao/PI/ProcessingModePolicyC.h b/TAO/tao/PI/ProcessingModePolicyC.h deleted file mode 100644 index 88662f3f7f2..00000000000 --- a/TAO/tao/PI/ProcessingModePolicyC.h +++ /dev/null @@ -1,263 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:164 - -#ifndef _TAO_IDL_ORIG_PROCESSINGMODEPOLICYC_H_ -#define _TAO_IDL_ORIG_PROCESSINGMODEPOLICYC_H_ - -#include /**/ "ace/pre.h" - - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PI/pi_export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/Object.h" -#include "tao/AnyTypeCode/PolicyA.h" -#include "tao/Objref_VarOut_T.h" -#include "tao/Versioned_Namespace.h" - -#include "tao/PolicyC.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_PI_Export - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:49 - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:379 - - typedef CORBA::Short ProcessingMode; - typedef CORBA::Short_out ProcessingMode_out; - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ProcessingMode; - - // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::ProcessingMode LOCAL_AND_REMOTE = 0; - - // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::ProcessingMode REMOTE_ONLY = 1; - - // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - - const PortableInterceptor::ProcessingMode LOCAL_ONLY = 2; - - // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - - const CORBA::PolicyType PROCESSING_MODE_POLICY_TYPE = 100U; - - // TAO_IDL - Generated from - // be/be_interface.cpp:646 - -#if !defined (_PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__VAR_OUT_CH_) -#define _PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__VAR_OUT_CH_ - - class ProcessingModePolicy; - typedef ProcessingModePolicy *ProcessingModePolicy_ptr; - - typedef - TAO_Objref_Var_T< - ProcessingModePolicy - > - ProcessingModePolicy_var; - - typedef - TAO_Objref_Out_T< - ProcessingModePolicy - > - ProcessingModePolicy_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY_CH_) -#define _PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY_CH_ - - class TAO_PI_Export ProcessingModePolicy - : public virtual ::CORBA::Policy - { - public: - typedef ProcessingModePolicy_ptr _ptr_type; - typedef ProcessingModePolicy_var _var_type; - - // The static operations. - static ProcessingModePolicy_ptr _duplicate (ProcessingModePolicy_ptr obj); - - static void _tao_release (ProcessingModePolicy_ptr obj); - - static ProcessingModePolicy_ptr _narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static ProcessingModePolicy_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - - static ProcessingModePolicy_ptr _nil (void) - { - return static_cast<ProcessingModePolicy_ptr> (0); - } - - - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableInterceptor::ProcessingMode processing_mode ( - 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 ::CORBA::Policy_ptr copy ( - 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 void destroy ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 - - 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. - ProcessingModePolicy (void); - - virtual ~ProcessingModePolicy (void); - - private: - // Private and unimplemented for concrete interfaces. - ProcessingModePolicy (const ProcessingModePolicy &); - - void operator= (const ProcessingModePolicy &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ProcessingModePolicy; - -// TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:78 - -} // module PortableInterceptor - -// TAO_IDL - Generated from -// be/be_visitor_traits.cpp:62 - -// Traits specializations. -namespace TAO -{ - -#if !defined (_PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__TRAITS_) -#define _PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__TRAITS_ - - template<> - struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ProcessingModePolicy> - { - static ::PortableInterceptor::ProcessingModePolicy_ptr duplicate ( - ::PortableInterceptor::ProcessingModePolicy_ptr - ); - static void release ( - ::PortableInterceptor::ProcessingModePolicy_ptr - ); - static ::PortableInterceptor::ProcessingModePolicy_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::PortableInterceptor::ProcessingModePolicy_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ -} - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1101 - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/TAO/tao/PI/ProcessingModePolicyS.h b/TAO/tao/PI/ProcessingModePolicyS.h deleted file mode 100644 index 17b1360599e..00000000000 --- a/TAO/tao/PI/ProcessingModePolicyS.h +++ /dev/null @@ -1,28 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl index 42830e28672..e832e45d2ca 100644 --- a/TAO/tao/PI/RequestInfo.pidl +++ b/TAO/tao/PI/RequestInfo.pidl @@ -22,11 +22,11 @@ #ifndef _REQUESTINFO_PIDL_ #define _REQUESTINFO_PIDL_ -#include "tao/PI_Forward.pidl" +#include <PI_Forward.pidl> #include "tao/AnyTypeCode/Dynamic.pidl" -#include "tao/Messaging_SyncScope.pidl" +#include <Messaging_SyncScope.pidl> #include "tao/PI/InvalidSlot.pidl" -#include "tao/IOP_IOR.pidl" +#include <IOP_IOR.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp index 4d0a1ec8626..79d1beb30cc 100644 --- a/TAO/tao/PI/RequestInfoA.cpp +++ b/TAO/tao/PI/RequestInfoA.cpp @@ -25,33 +25,105 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI/RequestInfoA.h" +#include "RequestInfoC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_RequestInfo ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/RequestInfo:1.0", "RequestInfo"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_RequestInfo = &_tao_tc_PortableInterceptor_RequestInfo; } -TAO_END_VERSIONED_NAMESPACE_DECL + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::RequestInfo>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::RequestInfo_ptr _tao_elem + ) +{ + PortableInterceptor::RequestInfo_ptr _tao_objptr = + PortableInterceptor::RequestInfo::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::RequestInfo_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::insert ( + _tao_any, + PortableInterceptor::RequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_RequestInfo, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::RequestInfo_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::extract ( + _tao_any, + PortableInterceptor::RequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_RequestInfo, + _tao_elem + ); +} diff --git a/TAO/tao/PI/RequestInfoA.h b/TAO/tao/PI/RequestInfoA.h deleted file mode 100644 index e1290cb2124..00000000000 --- a/TAO/tao/PI/RequestInfoA.h +++ /dev/null @@ -1,67 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_REQUESTINFOA_H_ -#define _TAO_IDL_REQUESTINFOA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI/pi_export.h" -#include "tao/PI/RequestInfoC.h" -#include "tao/AnyTypeCode/PI_ForwardA.h" -#include "tao/AnyTypeCode/DynamicA.h" -#include "tao/AnyTypeCode/Messaging_SyncScopeA.h" -#include "tao/PI/InvalidSlotA.h" -#include "tao/AnyTypeCode/IOP_IORA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI/RequestInfoC.cpp b/TAO/tao/PI/RequestInfoC.cpp index 5a921808a7c..c6d7e2d7cbd 100644 --- a/TAO/tao/PI/RequestInfoC.cpp +++ b/TAO/tao/PI/RequestInfoC.cpp @@ -26,18 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI/RequestInfoC.h" +#include "RequestInfoC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -71,13 +73,13 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void) return PortableInterceptor::RequestInfo::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal ( PortableInterceptor::RequestInfo_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::RequestInfo::RequestInfo (void) @@ -86,9 +88,17 @@ PortableInterceptor::RequestInfo::RequestInfo (void) PortableInterceptor::RequestInfo::~RequestInfo (void) {} +void +PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer) +{ + RequestInfo *_tao_tmp_pointer = + static_cast<RequestInfo *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -99,7 +109,7 @@ PortableInterceptor::RequestInfo::_narrow ( PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -125,7 +135,7 @@ PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::RequestInfo::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -159,10 +169,8 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/RequestInfoC.h b/TAO/tao/PI/RequestInfoC.h index 7c9b60ae17f..361b95d1be3 100644 --- a/TAO/tao/PI/RequestInfoC.h +++ b/TAO/tao/PI/RequestInfoC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_REQUESTINFOC_H_ -#define _TAO_IDL_REQUESTINFOC_H_ +#ifndef _TAO_IDL_ORIG_REQUESTINFOC_H_ +#define _TAO_IDL_ORIG_REQUESTINFOC_H_ #include /**/ "ace/pre.h" @@ -41,13 +41,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/Objref_VarOut_T.h" #include "tao/PI_ForwardC.h" @@ -61,29 +61,36 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_ - + class RequestInfo; typedef RequestInfo *RequestInfo_ptr; - + typedef TAO_Objref_Var_T< RequestInfo > RequestInfo_var; - + typedef TAO_Objref_Out_T< RequestInfo @@ -91,214 +98,219 @@ namespace PortableInterceptor RequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_ - + class TAO_PI_Export RequestInfo - : public virtual ::CORBA::Object + : public virtual CORBA::Object { public: typedef RequestInfo_ptr _ptr_type; typedef RequestInfo_var _var_type; - + // The static operations. static RequestInfo_ptr _duplicate (RequestInfo_ptr obj); - + static void _tao_release (RequestInfo_ptr obj); - + static RequestInfo_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestInfo_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RequestInfo_ptr _nil (void) { return static_cast<RequestInfo_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::ULong request_id ( + + virtual CORBA::ULong request_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * operation ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::ParameterList * arguments ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::ExceptionList * exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::ContextList * contexts ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::Dynamic::RequestContext * operation_context ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * result ( + + virtual CORBA::Any * result ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Boolean response_expected ( + + virtual CORBA::Boolean response_expected ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::Messaging::SyncScope sync_scope ( + + virtual Messaging::SyncScope sync_scope ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::PortableInterceptor::ReplyStatus reply_status ( + + virtual PortableInterceptor::ReplyStatus reply_status ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Object_ptr forward_reference ( + + virtual CORBA::Object_ptr forward_reference ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * get_slot ( + + virtual CORBA::Any * get_slot ( ::PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::ServiceContext * get_request_service_context ( ::IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::ServiceContext * get_reply_service_context ( ::IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. RequestInfo (void); - + virtual ~RequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. RequestInfo (const RequestInfo &); - + void operator= (const RequestInfo &); }; #endif /* end #if !defined */ + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo; + // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -309,9 +321,9 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_ + template<> struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::RequestInfo> { @@ -322,7 +334,7 @@ namespace TAO ::PortableInterceptor::RequestInfo_ptr ); static ::PortableInterceptor::RequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::RequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -332,9 +344,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr); // copying +TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::RequestInfo_ptr *); // non-copying +TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::RequestInfo_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index 65d42175dd2..191a30e51c4 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -2,7 +2,7 @@ // // $Id$ -#include "tao/PI/RequestInfo_Util.h" +#include "RequestInfo_Util.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -16,7 +16,6 @@ ACE_RCSID (tao, RequestInfo_Util, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL Dynamic::ParameterList * TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) @@ -98,16 +97,15 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any 0, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (any); if (tk_void_any) { any->_tao_set_typecode (CORBA::_tc_void); } + // No need to do an ACE_CHECK_RETURN. The caller should do that. + return any; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index 4d18f4d2309..f32b1d8dc2f 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -26,9 +26,7 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "ace/CORBA_macros.h" -#include "tao/PI/pi_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "pi_export.h" namespace CORBA { @@ -82,8 +80,6 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl index f704658e38c..e7428115760 100644 --- a/TAO/tao/PI_Forward.pidl +++ b/TAO/tao/PI_Forward.pidl @@ -32,8 +32,8 @@ #ifndef _PI_FORWARD_IDL_ #define _PI_FORWARD_IDL_ -#include "tao/OctetSeq.pidl" -#include "tao/StringSeq.pidl" +#include <OctetSeq.pidl> +#include <StringSeq.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index a182b17775d..a077461b82b 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/PI_ForwardC.h" +#include "PI_ForwardC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" @@ -40,12 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h index d8672822375..9738014449c 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { @@ -137,8 +135,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 23ed31147d2..9aff070ca96 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -1,4 +1,4 @@ -#include "tao/PI_Server/PICurrent_Guard.h" +#include "PICurrent_Guard.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -14,8 +14,6 @@ ACE_RCSID (PortableServer, #include "tao/PI/PICurrent.h" #include "tao/PI/PICurrent_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, bool tsc_to_rsc) : src_ (0), @@ -64,9 +62,11 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, TAO::PICurrent_Guard::~PICurrent_Guard (void) { if (this->src_ != 0 && this->dest_ != 0 - && this->src_ != this->dest_ - && this->dest_->lc_slot_table (this->src_)) + && this->src_ != this->dest_) { + // This copy better be exception-safe! + this->dest_->lc_slot_table (this->src_); + // PICurrent will potentially have to call back on the request // scope current so that it can deep copy the contents of the // thread scope current if the contents of the thread scope @@ -76,12 +76,10 @@ TAO::PICurrent_Guard::~PICurrent_Guard (void) // necessary, if the thread scope current is modified after its // contents have been *logically* copied to the request scope // current. The same goes for the reverse, i.e. RSC to TSC. - this->copy_callback_->src_and_dst (this->src_, this->dest_); this->src_->copy_callback (this->copy_callback_); } } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 364ec199d29..6bbda8f3ec4 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if TAO_HAS_INTERCEPTORS == 1 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations. class TAO_ServerRequest; @@ -48,7 +46,7 @@ namespace TAO * * @note This Guard class is only used on the server side. */ - class PICurrent_Guard + class TAO_PI_Server_Export PICurrent_Guard { public: @@ -101,8 +99,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index 1511cfb1472..9217b032970 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -1,14 +1,11 @@ -#include "tao/PI_Server/PI_Server.h" -#include "tao/PI_Server/PI_Server_Loader.h" -#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h" +#include "PI_Server.h" +#include "PI_Server_Loader.h" +#include "ServerRequestInterceptor_Factory_Impl.h" ACE_RCSID (PI_Server, PI_Server, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_PI_Server_Init::Initializer (void) { @@ -19,4 +16,3 @@ TAO_PI_Server_Init::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PI_Server_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index eed7d6cc8eb..e130e064684 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PI_Server_Init * @@ -41,11 +37,9 @@ static int TAO_Requires_PI_Server_Initializer = TAO_PI_Server_Init::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_PI_SERVER_SAFE_INCLUDE -#include "tao/PI_Server/ServerRequestInterceptorC.h" -#include "tao/PI_Server/ServerRequestInfoC.h" +#include "ServerRequestInterceptorC.h" +#include "ServerRequestInfoC.h" #undef TAO_PI_SERVER_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index abc2da4613c..e3dacc74cfb 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PI_Server/PI_Server_Loader.h" -#include "tao/PI_Server/PortableServer_ORBInitializer.h" +#include "PI_Server_Loader.h" +#include "PortableServer_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -12,8 +12,6 @@ ACE_RCSID (PI_Server, PI_Server_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) { } @@ -29,13 +27,13 @@ TAO_PI_Server_Loader::init (int, { ACE_TRACE ("TAO_PI_Server_Loader::init"); - static bool initialized = false; + static int initialized = 0; // Only allow initialization once. if (initialized) return 0; - initialized = true; + initialized = 1; // Register the ORB initializer. ACE_DECLARE_NEW_CORBA_ENV; @@ -64,17 +62,14 @@ TAO_PI_Server_Loader::init (int, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + "(%P | %t) Caught exception:"); return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index b80753436b9..02228437152 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -1,10 +1,15 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file PI_Server_Loader.h * * $Id$ + * + * Header file for Loading RTScheduler. + * + * + * @author Yamuna Krishnamurthy <yamuna@oomworks.com> */ //============================================================================= @@ -12,18 +17,15 @@ #define TAO_PI_SERVER_LOADER_H #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object { public: @@ -38,8 +40,6 @@ public: ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PI_Server, TAO_PI_Server_Loader) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_PI_Server_Loader) diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl index ad7b82138bf..0b86cdf7238 100644 --- a/TAO/tao/PI_Server/PI_Server_include.pidl +++ b/TAO/tao/PI_Server/PI_Server_include.pidl @@ -10,6 +10,6 @@ #define _PORTABLESERVER_INCLUDE_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/PI_Server/ServerRequestInterceptor.pidl" +#include <tao/PI_Server/ServerRequestInterceptor.pidl> #endif /* _PORTABLESERVER_INCLUDE_IDL_ */ diff --git a/TAO/tao/PI_Server/PI_Server_includeC.h b/TAO/tao/PI_Server/PI_Server_includeC.h index cca4fe783bd..2f941a52b2e 100644 --- a/TAO/tao/PI_Server/PI_Server_includeC.h +++ b/TAO/tao/PI_Server/PI_Server_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #include "tao/PI_Server/ServerRequestInterceptorC.h" diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h index 6b4784fb607..42a5f422d4f 100644 --- a/TAO/tao/PI_Server/Policy_Creator_T.h +++ b/TAO/tao/PI_Server/Policy_Creator_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,13 +21,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - template <class POLICYTYPE, typename POLICYVALUE> + template <class POLICYTYPE, class POLICYVALUE> void create_policy ( POLICYTYPE *& policy, POLICYVALUE &value, @@ -46,8 +44,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_POLICY_CREATOR_T_H */ diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 67a496a2d58..8f891627c1b 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- -#include "tao/PI_Server/PortableServer_ORBInitializer.h" -#include "tao/PI_Server/PortableServer_PolicyFactory.h" +#include "PortableServer_ORBInitializer.h" +#include "PortableServer_PolicyFactory.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PortableServer/PortableServer.h" @@ -12,21 +12,16 @@ ACE_RCSID (PI_Server, PortableServer_ORBInitializer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void -TAO_PortableServer_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) +TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -TAO_PortableServer_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info @@ -35,9 +30,8 @@ TAO_PortableServer_ORBInitializer::post_init ( } void -TAO_PortableServer_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info + ACE_ENV_ARG_DECL) { // Register the PortableServer policy factories. PortableInterceptor::PolicyFactory_ptr tmp; @@ -55,7 +49,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( // Bind the same policy factory to all PortableServer related policy // types since a single policy factory is used to create each of the // different types of PortableServer policies. - static CORBA::PolicyType const type[] = { + CORBA::PolicyType type[] = { #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::THREAD_POLICY_ID, PortableServer::IMPLICIT_ACTIVATION_POLICY_ID, @@ -67,10 +61,10 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( PortableServer::ID_ASSIGNMENT_POLICY_ID }; - CORBA::PolicyType const * end = + const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); - for (CORBA::PolicyType const *i = type; + for (CORBA::PolicyType *i = type; i != end; ++i) { @@ -103,5 +97,3 @@ TAO_PortableServer_ORBInitializer::register_policy_factories ( ACE_CHECK; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index 8aba0600ea2..903e5adc5f9 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -15,19 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PI/PI.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PI/PI.h" #include "tao/LocalObject.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// PortableServer ORB initializer. -class TAO_PortableServer_ORBInitializer +class TAO_PI_Server_Export TAO_PortableServer_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual TAO_Local_RefCounted_Object { @@ -58,8 +56,6 @@ private: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_ORB_INITIALIZER_H */ diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index 484403b2b32..9171b7c7e33 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -1,5 +1,5 @@ -#include "tao/PI_Server/PortableServer_PolicyFactory.h" +#include "PortableServer_PolicyFactory.h" #include "tao/PortableServer/ThreadPolicy.h" #include "tao/PortableServer/LifespanPolicy.h" @@ -9,14 +9,12 @@ #include "tao/PortableServer/RequestProcessingPolicy.h" #include "tao/PortableServer/ServantRetentionPolicy.h" #include "tao/PortableServer/PortableServer.h" -#include "tao/PI_Server/Policy_Creator_T.h" +#include "Policy_Creator_T.h" ACE_RCSID (PortableServer, PortableServer_PolicyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO_PortableServer_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -113,5 +111,3 @@ TAO_PortableServer_PolicyFactory::create_policy ( ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h index 1a0c06ff21a..d24a1e001aa 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h @@ -15,18 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PI/PI.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PI/PI.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Policy factory for all PortableServer related policies. -class TAO_PortableServer_PolicyFactory +class TAO_PI_Server_Export TAO_PortableServer_PolicyFactory : public virtual PortableInterceptor::PolicyFactory, public virtual TAO_Local_RefCounted_Object { @@ -38,8 +37,6 @@ public: CORBA::PolicyError)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_POLICY_FACTORY_H */ diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index 4b004d89f7b..114ee17f0cf 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PI_Server/ServerInterceptorAdapter.h" +#include "ServerInterceptorAdapter.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,8 +8,8 @@ ACE_RCSID (PortableServer, ServerInterceptorAdapter, "$Id$") -#include "tao/PI_Server/ServerRequestInfo.h" -#include "tao/PI_Server/PICurrent_Guard.h" +#include "ServerRequestInfo.h" +#include "PICurrent_Guard.h" #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/TAO_Server_Request.h" @@ -19,8 +19,6 @@ ACE_RCSID (PortableServer, #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableInterceptor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void) { } @@ -42,38 +40,26 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( ACE_TRY { - oc = 0; + // Copy the request scope current (RSC) to the thread scope + // current (TSC) upon leaving this scope, i.e. just after the + // receive_request_service_contexts() completes. A "guard" is + // used to make the copy also occur if an exception is thrown. + TAO::PICurrent_Guard const pi_guard (ri->server_request (), + false /* Copy RSC to TSC */); - bool is_remote_request = !server_request.collocated (); - TAO::ServerRequestInfo request_info (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions); + oc = 0; for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - tao_ft_interception_point (&request_info, - oc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptors_[i]->tao_ft_interception_point ( + ri, + oc + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; if (oc != 0) { - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions + (void) this->send_other (ri ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -87,16 +73,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point ( } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - server_request.forward_location (exc.forward.in ()); - server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); + ri->forward_reference (exc); + this->send_other (ri + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + + this->location_forwarded_ = true; } ACE_ENDTRY; ACE_CHECK; @@ -114,8 +96,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( { // This method implements one of the "intermediate" server side // interception point. - - if (this->interceptor_list_.size() != server_request.interceptor_count ()) + if (this->interceptor_list_.size() != this->server_request.interceptor_count ()) { // This method (i.e. the receive_request() interception point) // should only be invoked if all of the interceptors registered @@ -134,43 +115,25 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( // current (TSC) upon leaving this scope, i.e. just after the // receive_request_service_contexts() completes. A "guard" is // used to make the copy also occur if an exception is thrown. - TAO::PICurrent_Guard const pi_guard (server_request, + TAO::PICurrent_Guard const pi_guard (ri->server_request (), false /* Copy RSC to TSC */); - bool is_remote_request = !server_request.collocated (); - TAO::ServerRequestInfo request_info (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions); - for (size_t i = 0 ; i < server_request.interceptor_count (); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_request_service_contexts (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptors_[i]->receive_request_service_contexts ( + ri + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) { - server_request.forward_location (exc.forward.in ()); - server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); + ri->forward_reference (exc); + this->send_other (ri + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + + this->location_forwarded_ = true; } ACE_ENDTRY; ACE_CHECK; @@ -191,11 +154,20 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( CORBA::ULong nexceptions ACE_ENV_ARG_DECL) { + // This method implements one of the "starting" server side // interception point if extended interceptors are not in place. + TAO::ServerRequestInfo request_info (server_request, + args, + nargs, + servant_upcall, + exceptions, + nexceptions); + ACE_TRY { + // Copy the request scope current (RSC) to the thread scope // current (TSC) upon leaving this scope, i.e. just after the // receive_request_service_contexts() completes. A "guard" is @@ -203,27 +175,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( TAO::PICurrent_Guard const pi_guard (server_request, false /* Copy RSC to TSC */); - bool is_remote_request = !server_request.collocated (); - - TAO::ServerRequestInfo request_info (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions); - for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_request_service_contexts (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor(i)-> + receive_request_service_contexts ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; // The starting interception point completed successfully. // Push the interceptor on to the flow stack. @@ -234,13 +192,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts ( { server_request.forward_location (exc.forward.in ()); server_request.reply_status (PortableInterceptor::LOCATION_FORWARD); - (void) this->send_other (server_request, - args, - nargs, - servant_upcall, - exceptions, - nexceptions - ACE_ENV_ARG_PARAMETER); + this->send_other (server_request, + args, + nargs, + servant_upcall, + exceptions, + nexceptions + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -283,22 +241,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request ( exceptions, nexceptions); + TAO::PICurrent_Guard pi_guard (server_request, + true /* Copy TSC to RSC */); + ACE_TRY { - bool is_remote_request = !server_request.collocated (); - for (size_t i = 0; i < server_request.interceptor_count (); ++i) { - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor (i); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - receive_request (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor(i)->receive_request ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; // Note that no interceptors are pushed on to or popped off // of the flow stack in this interception point since it is @@ -336,8 +289,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply ( // This is an "ending" interception point so we only process the // interceptors pushed on to the flow stack. - bool is_remote_request = !server_request.collocated (); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" // interception point. @@ -359,17 +310,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply ( // invoked in another "ending" interception point. --server_request.interceptor_count (); - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - server_request.interceptor_count ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_reply (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } + this->interceptor_list_.interceptor ( + server_request.interceptor_count ())->send_reply ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } // The send_reply() interception point does not raise a @@ -390,8 +335,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. - bool is_remote_request = !server_request.collocated (); - // Notice that the interceptors are processed in the opposite order // they were pushed onto the stack since this is an "ending" server // side interception point. @@ -415,17 +358,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception ( // being invoked in another "ending" interception point. --server_request.interceptor_count (); - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - server_request.interceptor_count ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_exception (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor ( + server_request.interceptor_count ())->send_exception ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) @@ -491,8 +428,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( // This is an "ending" server side interception point so we only // process the interceptors pushed on to the flow stack. - bool is_remote_request = !server_request.collocated (); - TAO::ServerRequestInfo request_info (server_request, args, nargs, @@ -516,17 +451,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( // being invoked in another "ending" interception point. --server_request.interceptor_count (); - ServerRequestInterceptor_List::RegisteredInterceptor& registered = - this->interceptor_list_.registered_interceptor ( - server_request.interceptor_count ()); - - if (registered.details_.should_be_processed (is_remote_request)) - { - registered.interceptor_-> - send_other (&request_info - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } + this->interceptor_list_.interceptor( + server_request.interceptor_count ())->send_other ( + &request_info + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } ACE_CATCH (PortableInterceptor::ForwardRequest, exc) @@ -546,6 +475,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other ( ACE_CHECK; } + void TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( PortableInterceptor::ServerRequestInterceptor_ptr interceptor @@ -555,17 +485,6 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( } void -TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) -{ - this->interceptor_list_.add_interceptor (interceptor, - policies - ACE_ENV_ARG_PARAMETER); -} - -void TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors ( ACE_ENV_SINGLE_ARG_DECL) { @@ -578,17 +497,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void) TAO::PICurrent_Impl *pi = 0; ACE_NEW_RETURN (pi, TAO::PICurrent_Impl, - pi); + 0); return pi; } TAO::PICurrent_Copy_Callback * TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current_callback (void) { - TAO::PICurrent_Copy_Callback * pi = 0; + TAO::PICurrent_Copy_Callback *pi = 0; ACE_NEW_RETURN (pi, TAO::PICurrent_Copy_Callback, - pi); + 0); return pi; } @@ -601,25 +520,24 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current ( void TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current_callback ( - TAO::PICurrent_Copy_Callback * callback) + TAO::PICurrent_Copy_Callback *callback) { delete callback; } void TAO::ServerRequestInterceptor_Adapter_Impl::execute_command ( - TAO_ServerRequest & server_request, - TAO::Upcall_Command & command + TAO_ServerRequest &server_request, + TAO::Upcall_Command &command ACE_ENV_ARG_DECL) { - TAO::PICurrent_Guard const pi_guard (server_request, - true /* Copy TSC to RSC */); + TAO::PICurrent_Guard pi_guard (server_request, + true /* Copy TSC to RSC */); // The actual upcall. command.execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index b9217c4ac50..6fa2e115b6c 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -20,37 +20,28 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/orbconf.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI_Server/ServerRequestInterceptorC.h" +#include "ServerRequestInterceptorC.h" #include "tao/PI/Interceptor_List_T.h" #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/Basic_Types.h" -#include "tao/PI_Server/ServerRequestDetails.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor, - ServerRequestDetails> + typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor> ServerRequestInterceptor_List; } -namespace CORBA -{ - class PolicyList; -} - class TAO_ServerRequest; namespace TAO @@ -65,8 +56,8 @@ namespace TAO * A convenient helper class to invoke registered server request * interceptor(s). */ - class ServerRequestInterceptor_Adapter_Impl - : public ServerRequestInterceptor_Adapter + class TAO_PI_Server_Export ServerRequestInterceptor_Adapter_Impl : + public ServerRequestInterceptor_Adapter { public: @@ -161,11 +152,6 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL); - virtual void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL); virtual TAO::PICurrent_Impl *allocate_pi_current (void); @@ -192,8 +178,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp deleted file mode 100644 index 3bc4852ec1a..00000000000 --- a/TAO/tao/PI_Server/ServerRequestDetails.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "tao/PI_Server/ServerRequestDetails.h" - -#if TAO_HAS_INTERCEPTORS == 1 - -#if !defined (__ACE_INLINE__) -#include "tao/PI_Server/ServerRequestDetails.inl" -#endif /* defined INLINE */ - -ACE_RCSID (PI_Server, - ServerRequestDetails, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - void - ServerRequestDetails::apply_policies ( - const CORBA::PolicyList &policies - ACE_ENV_ARG_DECL) - { - // Flag to check for duplicate ProcessingModePolicy objects in the list. - bool processing_mode_applied = false; - - const CORBA::ULong plen = policies.length (); - - for (CORBA::ULong i = 0; i < plen; ++i) - { - CORBA::Policy_var policy = policies[i]; - - if (CORBA::is_nil (policy.in ())) - { - // Just ignore nil policies... - continue; - } - - // Obtain the PolicyType from the current Policy object. - const CORBA::PolicyType policy_type = - policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE) - { - if (processing_mode_applied) - { - // This is the second time we have run into this policy type, - // and that is not allowed. - ACE_THROW (CORBA::INV_POLICY ()); - } - - // Flip the flag to true in order to trap any dupes. - processing_mode_applied = true; - - // Narrow the Policy to the ProcessingModePolicy interface. - PortableInterceptor::ProcessingModePolicy_var pm_policy = - PortableInterceptor::ProcessingModePolicy::_narrow ( - policy.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Save the value of the ProcessingModePolicy in our data member. - this->processing_mode_ = - pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - } - else - { - // We don't support the current policy type. - ACE_THROW (CORBA::INV_POLICY ()); - } - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h deleted file mode 100644 index fc34a6a66f5..00000000000 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file ServerRequestDetails.h - * - * $Id$ - * - * This file declares a class that manages the details - * about a registered server request interceptor. Policies can be - * used when interceptors are registered, and the policy values - * will be processed and used to modify the values of the - * ServerRequestDetails object associated with the registered - * server request interceptor. - * - * @author Tim Bradley <bradley_t@ociweb.com> - */ -//============================================================================= - -#ifndef TAO_SERVER_REQUEST_DETAILS_H -#define TAO_SERVER_REQUEST_DETAILS_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PI/ProcessingModePolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - /** - * @class ServerRequestDetails - * - * @brief The policy-driven details for a registered server request - * interceptor - * - * Each time a server request interceptor is registered with an ORB, - * a ServerRequestDetails object will be created and associated with - * the registered server request interceptor. If the interceptor is - * registered with policies, the policies will be used to adjust the - * values in the ServerRequestDetails appropriately. - */ - class ServerRequestDetails - { - public: - ServerRequestDetails (void); - - void apply_policies (const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL); - - /// Returns true if the ProcessingMode setting permits the "firing" - /// of the associated server request interceptor based upon the - /// remote vs. collocated nature of the current servant request - /// that is being dispatched. - bool should_be_processed (bool is_remote_request) const; - - private: - - /// The ProcessingMode setting that can be adjusted via the - /// PortableInterceptor::ProcessingModePolicy. - PortableInterceptor::ProcessingMode processing_mode_; - }; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "tao/PI_Server/ServerRequestDetails.inl" -#endif /* __ACE_INLINE__ */ - -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_SERVER_REQUEST_DETAILS_H */ diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl deleted file mode 100644 index f653264bdac..00000000000 --- a/TAO/tao/PI_Server/ServerRequestDetails.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - ACE_INLINE - ServerRequestDetails::ServerRequestDetails (void) - : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) - { - } - - ACE_INLINE - bool - ServerRequestDetails::should_be_processed (bool is_remote_request) const - { - return ((this->processing_mode_ == PortableInterceptor::LOCAL_AND_REMOTE) || - ((this->processing_mode_ == PortableInterceptor::REMOTE_ONLY) && - (is_remote_request)) || - ((this->processing_mode_ == PortableInterceptor::LOCAL_ONLY) && - (!is_remote_request))); - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index b0b50f027d2..2b613ec3738 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "tao/PI_Server/ServerRequestInfo.h" +#include "ServerRequestInfo.h" #if (TAO_HAS_INTERCEPTORS == 1) -ACE_RCSID (PI_Server, +ACE_RCSID (PortableServer, ServerRequestInfo, "$Id$") @@ -26,10 +26,9 @@ ACE_RCSID (PI_Server, #include "ace/OS_NS_string.h" # if !defined (__ACE_INLINE__) -# include "tao/PI_Server/ServerRequestInfo.inl" +# include "ServerRequestInfo.inl" # endif /* !__ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -587,6 +586,4 @@ TAO::ServerRequestInfo::add_reply_service_context ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index afce3a85690..7b79d9eed83 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -27,7 +27,8 @@ #if (TAO_HAS_INTERCEPTORS == 1) -#include "tao/PI_Server/ServerRequestInfoC.h" +#include "pi_server_export.h" +#include "ServerRequestInfoC.h" #include "tao/LocalObject.h" #include "tao/OctetSeqC.h" #include "tao/TAO_Server_Request.h" @@ -39,8 +40,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ServerRequest; class TAO_Service_Context; @@ -66,9 +65,9 @@ namespace TAO * @note This class is currently not meant to be reference counted * since it is instantiated on the stack. */ - class ServerRequestInfo - : public virtual PortableInterceptor::ServerRequestInfo - , public virtual CORBA::LocalObject + class TAO_PI_Server_Export ServerRequestInfo + : public virtual PortableInterceptor::ServerRequestInfo, + public virtual CORBA::LocalObject { public: @@ -299,10 +298,9 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL # if defined (__ACE_INLINE__) -# include "tao/PI_Server/ServerRequestInfo.inl" +# include "ServerRequestInfo.inl" # endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl index 09985532ba8..3ba06ed412b 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.inl +++ b/TAO/tao/PI_Server/ServerRequestInfo.inl @@ -5,8 +5,6 @@ #include "tao/PortableServer/Servant_Upcall.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::ServerRequestInfo::ServerRequestInfo ( TAO_ServerRequest & server_request, @@ -56,5 +54,3 @@ TAO::ServerRequestInfo::server_request (void) return this->server_request_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl index d8a4c52639d..9670dd42b02 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.pidl +++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl @@ -23,8 +23,8 @@ #define _SERVER_REQUESTINFO_PIDL_ #include "tao/PI/RequestInfo.pidl" -#include "tao/orb_types.pidl" -#include "tao/Policy_Forward.pidl" +#include <orb_types.pidl> +#include <Policy_Forward.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp index 94ad278401d..1dc8ac2a761 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp @@ -25,29 +25,26 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI_Server/ServerRequestInfoA.h" +#include "ServerRequestInfoC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ServerRequestInfo ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0", "ServerRequestInfo"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo = @@ -55,4 +52,78 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInfo_ptr _tao_elem + ) +{ + PortableInterceptor::ServerRequestInfo_ptr _tao_objptr = + PortableInterceptor::ServerRequestInfo::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInfo_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::insert ( + _tao_any, + PortableInterceptor::ServerRequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInfo, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInfo_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::extract ( + _tao_any, + PortableInterceptor::ServerRequestInfo::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInfo, + _tao_elem + ); +} diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.h b/TAO/tao/PI_Server/ServerRequestInfoA.h deleted file mode 100644 index 1766f29ea93..00000000000 --- a/TAO/tao/PI_Server/ServerRequestInfoA.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_SERVERREQUESTINFOA_H_ -#define _TAO_IDL_SERVERREQUESTINFOA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI_Server/pi_server_export.h" -#include "tao/PI_Server/ServerRequestInfoC.h" -#include "tao/PI/RequestInfoA.h" -#include "tao/AnyTypeCode/orb_typesA.h" -#include "tao/AnyTypeCode/Policy_ForwardA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp index 69fcd9ec298..eab818b9b7f 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp @@ -26,19 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI_Server/ServerRequestInfoC.h" +#include "ServerRequestInfoC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -72,13 +74,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void) return PortableInterceptor::ServerRequestInfo::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal ( PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) @@ -87,9 +89,17 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void) {} +void +PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer) +{ + ServerRequestInfo *_tao_tmp_pointer = + static_cast<ServerRequestInfo *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -100,7 +110,7 @@ PortableInterceptor::ServerRequestInfo::_narrow ( PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -126,7 +136,7 @@ PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInfo::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -164,10 +174,8 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h index bcefdc89906..6cbeedeb0dc 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.h +++ b/TAO/tao/PI_Server/ServerRequestInfoC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_SERVERREQUESTINFOC_H_ -#define _TAO_IDL_SERVERREQUESTINFOC_H_ +#ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_ +#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_ #include /**/ "ace/pre.h" @@ -41,13 +41,14 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/pi_server_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/Objref_VarOut_T.h" #include "tao/PI/RequestInfoC.h" @@ -59,29 +60,36 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Server_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ + +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_ - + class ServerRequestInfo; typedef ServerRequestInfo *ServerRequestInfo_ptr; - + typedef TAO_Objref_Var_T< ServerRequestInfo > ServerRequestInfo_var; - + typedef TAO_Objref_Out_T< ServerRequestInfo @@ -89,187 +97,192 @@ namespace PortableInterceptor ServerRequestInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_ - + class TAO_PI_Server_Export ServerRequestInfo : public virtual ::PortableInterceptor::RequestInfo { public: typedef ServerRequestInfo_ptr _ptr_type; typedef ServerRequestInfo_var _var_type; - + // The static operations. static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj); - + static void _tao_release (ServerRequestInfo_ptr obj); - + static ServerRequestInfo_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerRequestInfo_ptr _nil (void) { return static_cast<ServerRequestInfo_ptr> (0); } - - - + + static void _tao_any_destructor (void *); + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Any * sending_exception ( + + virtual CORBA::Any * sending_exception ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::ObjectId * object_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * adapter_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * target_most_derived_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_server_policy ( ::CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_slot ( ::PortableInterceptor::SlotId id, const ::CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::InvalidSlot )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Boolean target_is_a ( + + virtual CORBA::Boolean target_is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_reply_service_context ( const ::IOP::ServiceContext & service_context, ::CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. ServerRequestInfo (void); - + virtual ~ServerRequestInfo (void); - + private: // Private and unimplemented for concrete interfaces. ServerRequestInfo (const ServerRequestInfo &); - + void operator= (const ServerRequestInfo &); }; #endif /* end #if !defined */ + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; + // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -280,9 +293,9 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_ + template<> struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo> { @@ -293,7 +306,7 @@ namespace TAO ::PortableInterceptor::ServerRequestInfo_ptr ); static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -303,9 +316,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr); // copying +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr *); // non-copying +TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInfo_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl index 571b35e9c73..1235962e161 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl +++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl @@ -28,7 +28,7 @@ #include "tao/PI/Interceptor.pidl" #include "tao/PI/PIForwardRequest.pidl" -#include "tao/OctetSeq.pidl" +#include <OctetSeq.pidl> module PortableInterceptor { diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp index 8f5dfb63340..58a08ac8132 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp @@ -25,29 +25,26 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/PI_Server/ServerRequestInterceptorA.h" +#include "ServerRequestInterceptorC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy> _tao_tc_PortableInterceptor_ServerRequestInterceptor ( - ::CORBA::tk_local_interface, + CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0", "ServerRequestInterceptor"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor = @@ -55,4 +52,78 @@ namespace PortableInterceptor } -TAO_END_VERSIONED_NAMESPACE_DECL + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInterceptor_ptr _tao_elem + ) +{ + PortableInterceptor::ServerRequestInterceptor_ptr _tao_objptr = + PortableInterceptor::ServerRequestInterceptor::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInterceptor_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::insert ( + _tao_any, + PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInterceptor, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableInterceptor::ServerRequestInterceptor_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::extract ( + _tao_any, + PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor, + PortableInterceptor::_tc_ServerRequestInterceptor, + _tao_elem + ); +} diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h deleted file mode 100644 index 6ed94797f14..00000000000 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h +++ /dev/null @@ -1,65 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_ -#define _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PI_Server/pi_server_export.h" -#include "tao/PI_Server/ServerRequestInterceptorC.h" -#include "tao/PI/InterceptorA.h" -#include "tao/PI/PIForwardRequestA.h" -#include "tao/AnyTypeCode/OctetSeqA.h" - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace PortableInterceptor -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module PortableInterceptor - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index db1e8a5d4e2..82e30f3c415 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -26,19 +26,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PI_Server/ServerRequestInterceptorC.h" +#include "ServerRequestInterceptorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -72,13 +74,13 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) return PortableInterceptor::ServerRequestInterceptor::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) @@ -87,9 +89,17 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) {} +void +PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer) +{ + ServerRequestInterceptor *_tao_tmp_pointer = + static_cast<ServerRequestInterceptor *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -100,7 +110,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow ( PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -126,7 +136,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -164,10 +174,8 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"; } -::CORBA::Boolean +CORBA::Boolean PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index ec784b9d706..826741ec9e6 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_ -#define _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_ +#ifndef _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_ +#define _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_ #include /**/ "ace/pre.h" @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/pi_server_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -56,16 +57,23 @@ #endif #define TAO_EXPORT_MACRO TAO_PI_Server_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_ @@ -88,7 +96,7 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_ @@ -129,12 +137,12 @@ namespace PortableInterceptor static void _tao_release (ServerRequestInterceptor_ptr obj); static ServerRequestInterceptor_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static ServerRequestInterceptor_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -143,7 +151,7 @@ namespace PortableInterceptor return static_cast<ServerRequestInterceptor_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -156,7 +164,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) {} @@ -170,7 +178,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; @@ -182,7 +190,7 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; @@ -194,61 +202,66 @@ namespace PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException + CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_exception ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_other ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - - virtual ::CORBA::Boolean _is_a ( + + 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); - + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + protected: // Abstract or local interface only. ServerRequestInterceptor (void); - + virtual ~ServerRequestInterceptor (void); - + private: // Private and unimplemented for concrete interfaces. ServerRequestInterceptor (const ServerRequestInterceptor &); - + void operator= (const ServerRequestInterceptor &); }; #endif /* end #if !defined */ + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableInterceptor @@ -259,9 +272,9 @@ namespace PortableInterceptor namespace TAO { -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_ + template<> struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo> { @@ -272,7 +285,7 @@ namespace TAO ::PortableInterceptor::ServerRequestInfo_ptr ); static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -280,9 +293,9 @@ namespace TAO #endif /* end #if !defined */ -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_ - +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_ + template<> struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor> { @@ -293,7 +306,7 @@ namespace TAO ::PortableInterceptor::ServerRequestInterceptor_ptr ); static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -303,9 +316,22 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr); // copying +TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr *); // non-copying +TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ServerRequestInterceptor_ptr &); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index 37b51488606..f3d26ea86be 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -11,11 +11,11 @@ */ // ================================================================= -#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h" +#include "ServerRequestInterceptor_Factory_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PI_Server/ServerInterceptorAdapter.h" +#include "ServerInterceptorAdapter.h" #include "tao/ORB.h" #include "tao/debug.h" @@ -24,9 +24,6 @@ ACE_RCSID (PI_Server, PolicyFactory_Loader, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::ServerRequestInterceptor_Adapter* TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) { @@ -37,8 +34,6 @@ TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) return obj; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl, ACE_TEXT ("ServerRequestInterceptor_Adapter_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 9cd5e06128f..45e80d4c25e 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +/* -*- C++ -*- */ + //============================================================================= /** @@ -16,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PI_Server/pi_server_export.h" +#include "pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,8 +30,6 @@ #include "ace/Service_Config.h" #include "tao/ServerRequestInterceptor_Adapter_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class ServerRequestInterceptor_Adapter; @@ -43,8 +42,6 @@ public: virtual TAO::ServerRequestInterceptor_Adapter *create (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_ServerRequestInterceptor_Adapter_Factory_Impl) ACE_FACTORY_DECLARE (TAO_PI_Server, TAO_ServerRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp index 4ded86134fd..3040509bd76 100644 --- a/TAO/tao/ParameterModeC.cpp +++ b/TAO/tao/ParameterModeC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/ParameterModeC.h" +#include "ParameterModeC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -67,5 +65,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::ParameterMode & _tao_enum return _tao_success; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h index c4a0c7d670a..e2751ebf4e4 100644 --- a/TAO/tao/ParameterModeC.h +++ b/TAO/tao/ParameterModeC.h @@ -59,8 +59,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_InputCDR; class TAO_OutputCDR; @@ -101,9 +99,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp index 1d873b9ae12..b1d2432c89a 100644 --- a/TAO/tao/Parser_Registry.cpp +++ b/TAO/tao/Parser_Registry.cpp @@ -1,3 +1,4 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ #include "tao/Parser_Registry.h" @@ -14,8 +15,6 @@ ACE_RCSID (tao, Parser_Registry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Parser_Registry::TAO_Parser_Registry (void) : parsers_ (0), size_ (0) @@ -74,4 +73,3 @@ TAO_Parser_Registry::match_parser (const char *ior_string) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index ce997817d8c..13571c9bd2b 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -19,17 +19,12 @@ #include "tao/TAO_Export.h" +#include "ace/os_include/os_stddef.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/os_include/os_stddef.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_ORB_Core; class TAO_IOR_Parser; @@ -82,8 +77,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) #include "tao/Parser_Registry.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Parser_Registry.i b/TAO/tao/Parser_Registry.i index 5545cece0df..29aabd26ddc 100644 --- a/TAO/tao/Parser_Registry.i +++ b/TAO/tao/Parser_Registry.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Parser_Registry::Parser_Iterator TAO_Parser_Registry::begin (void) const { @@ -15,5 +11,3 @@ TAO_Parser_Registry::end (void) const { return this->parsers_ + this->size_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp index 5839334ca9f..c63880b3fa4 100644 --- a/TAO/tao/Pluggable_Messaging.cpp +++ b/TAO/tao/Pluggable_Messaging.cpp @@ -1,16 +1,12 @@ // $Id$ -#include "tao/Pluggable_Messaging.h" +#include "Pluggable_Messaging.h" ACE_RCSID (tao, Pluggable_Messaging, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Pluggable_Messaging::~TAO_Pluggable_Messaging (void) { -} -TAO_END_VERSIONED_NAMESPACE_DECL +} diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h index 89fce0721b5..86989c0865b 100644 --- a/TAO/tao/Pluggable_Messaging.h +++ b/TAO/tao/Pluggable_Messaging.h @@ -26,12 +26,6 @@ #include "tao/Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Exception; @@ -46,6 +40,8 @@ class TAO_Target_Specification; class TAO_OutputCDR; class TAO_Queued_Data; +class ACE_Time_Value; + // @@ The more I think I about this class, I feel that this class need // not be a ABC as it is now. Instead we have these options // (1) Parametrize this class with the "Messaging Object". Then the @@ -62,7 +58,7 @@ class TAO_Queued_Data; /** * @class TAO_Pluggable_Messaging * - * @brief Generic definitions Messaging class. + * @brief Generic definitions Messaging class. * * This interface tries to define generic methods that could be * different messaging protocols @@ -106,6 +102,15 @@ public: TAO_OutputCDR &cdr, TAO_Pluggable_Reply_Params_Base ¶ms) = 0; + /** + * This method reads the message on the connection. Returns 0 when + * there is short read on the connection. Returns 1 when the full + * message is read and handled. Returns -1 on errors. If @a block is + * 1, then reply is read in a blocking manner. + */ + virtual int read_message (TAO_Transport *transport, + int block = 0, + ACE_Time_Value *max_wait_time = 0) = 0; /// Format the message in the @a cdr. May not be needed in /// general. @@ -115,25 +120,24 @@ public: virtual void init (CORBA::Octet major, CORBA::Octet minor) = 0; - /// Parse the details of the next message from the @a incoming - /// and initializes attributes of @a qd. Returns 0 if the message - /// header could not be parsed completely, returns a 1 if the message - /// header could be parsed completely and returns -1 on error. As the - /// parsed data is stored directly in @a qd, no state must be stored - /// in instance of implementation. - virtual int parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, /* out */ - size_t &mesg_length) = 0; /* out */ - - /// Extract the details of the next message from the @a incoming - /// through @a qd. Returns 0 if the message header could not be - /// parsed completely, returns a 1 if the message header could be - /// parsed completely and returns -1 on error. + /// Parse the incoming messages.. + virtual int parse_incoming_messages (ACE_Message_Block &message_block) = 0; + + /// Calculate the amount of data that is missing in the @a incoming + /// message block. + virtual ssize_t missing_data (ACE_Message_Block &incoming) = 0; + + /// Get the details of the message parsed through the @a qd. + virtual void get_message_data (TAO_Queued_Data *qd) = 0; + + /* Extract the details of the next message from the @a incoming + * through @a qd. Returns 1 if there are more messages and returns a + * 0 if there are no more messages in @a incoming. + */ virtual int extract_next_message (ACE_Message_Block &incoming, TAO_Queued_Data *&qd) = 0; - /// Check whether the node @a qd needs consolidation from @a incoming, - /// @r 0 on success, -1 on error + /// Check whether the node @a qd needs consolidation from @a incoming virtual int consolidate_node (TAO_Queued_Data *qd, ACE_Message_Block &incoming) = 0; @@ -172,33 +176,8 @@ public: /// Accessor for the output CDR stream virtual TAO_OutputCDR &out_stream (void) = 0; - - /// Consolidate newly received fragment with previously arrived - /// associated fragments to achieve consolidated message. All - /// fragments having been received previously are being managed - /// within implementation. If reliable transport is used (like TCP) - /// this operation will be invoked with fragments being received - /// partially ordered, last fragment being received last. Otherwise - /// If un-reliable transport is used (like UDP) fragments may be - /// received dis-ordered, and must be ordered before consolidation - /// within implementation. @return 0 on success and @a con_msg - /// points to consolidated message, 1 if there are still fragmens - /// outstanding, in case of error -1 is being returned. The - /// implementation is responsible to release @a qd. - virtual int consolidate_fragmented_message (TAO_Queued_Data *qd, - TAO_Queued_Data *&con_msg) = 0; - - /// Discard all fragments associated to request-id encoded in - /// cancel_request. Transport implementaion guarantees that this - /// operation will never be invoked // concurrently by multiplpe - /// threads nor concurrently to consolidate_fragmented_message - /// @return -1 on failure, 0 on success, 1 no fragment on stack - /// relating to CancelRequest. - virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_PLUGGABLE_MESSAGING_H*/ diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp index 9e7956bd5a8..d7f79cecec5 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.cpp +++ b/TAO/tao/Pluggable_Messaging_Utils.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/Pluggable_Messaging_Utils.h" -#include "tao/ORB_Core.h" +#include "Pluggable_Messaging_Utils.h" +#include "ORB_Core.h" #if !defined (__ACE_INLINE__) #include "tao/Pluggable_Messaging_Utils.i" @@ -12,12 +12,10 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t) +TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params ( + TAO_Transport *t + ) : input_cdr_ (0) - , transport_ (t) + , transport_ (t) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h index ea31e8cd8ca..9a7b421ecbf 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.h +++ b/TAO/tao/Pluggable_Messaging_Utils.h @@ -24,7 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Transport; @@ -182,12 +181,10 @@ enum TAO_Pluggable_Message_Exception_Type TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Pluggable_Messaging_Utils.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" -#endif /* TAO_PLUGGABLE_MESSAGING_UTILS_H */ +#endif /*TAO_PLUGGABLE_MESSAGING_UTILS_H*/ diff --git a/TAO/tao/Pluggable_Messaging_Utils.i b/TAO/tao/Pluggable_Messaging_Utils.i index 7a10993036e..0aa88955e5d 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.i +++ b/TAO/tao/Pluggable_Messaging_Utils.i @@ -2,8 +2,6 @@ //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void) : svc_ctx_ (), @@ -29,5 +27,3 @@ TAO_Pluggable_Reply_Params_Base::service_context_notowned (void) { return *this->service_context_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl index 62dfc3e50bc..479d31708c3 100644 --- a/TAO/tao/Policy.pidl +++ b/TAO/tao/Policy.pidl @@ -44,9 +44,9 @@ #ifndef TAO_CORBA_POLICY_PIDL #define TAO_CORBA_POLICY_PIDL -#include "tao/UShortSeq.pidl" -#include "tao/Current.pidl" -#include "tao/Policy_Forward.pidl" +#include <UShortSeq.pidl> +#include <Current.pidl> +#include <Policy_Forward.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 0fdcb87dd8b..606c217d2bf 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/PolicyC.h" +#include "PolicyC.h" #include "tao/CDR.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" @@ -44,14 +44,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/PolicyC.inl" +#include "PolicyC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO specific stuff. namespace CORBA { @@ -1040,5 +1038,3 @@ CORBA::Boolean operator>> ( return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index a0cd05df25e..3346c12a828 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -65,8 +65,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 @@ -664,10 +662,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/PolicyC.inl" +#include "PolicyC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl index 3b97e162307..2bc9b36e2dc 100644 --- a/TAO/tao/PolicyC.inl +++ b/TAO/tao/PolicyC.inl @@ -29,8 +29,6 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_ci.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if !defined (_CORBA_POLICY___CI_) #define _CORBA_POLICY___CI_ @@ -63,5 +61,3 @@ CORBA::Policy::Policy ( } #endif /* end #if !defined */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp index c33f3a2710e..beec71d1266 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp +++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp @@ -1,6 +1,6 @@ -// $Id$ +//$Id$ -#include "tao/PolicyFactory_Registry_Adapter.h" +#include "PolicyFactory_Registry_Adapter.h" ACE_RCSID (tao, @@ -8,10 +8,9 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void) +namespace TAO { + PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void) + { + } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index 586555523c0..4cf50d7d7a9 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -21,12 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" - #include "ace/CORBA_macros.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Basic_Types.h" //-- Forward Declarations-- namespace CORBA @@ -87,8 +83,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_POLICY_FACTORY_REGISTRY_ADAPTER_H */ diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp index 76a51641ae7..9f817b31876 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.cpp +++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp @@ -1,15 +1,11 @@ //$Id$ -#include "tao/PolicyFactory_Registry_Factory.h" +#include "PolicyFactory_Registry_Factory.h" ACE_RCSID (tao, PolicyFactory_Registry_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PolicyFactory_Registry_Factory::~TAO_PolicyFactory_Registry_Factory (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h index 6da8fdda14a..5d7ac654eaa 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.h +++ b/TAO/tao/PolicyFactory_Registry_Factory.h @@ -19,11 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class PolicyFactory_Registry_Adapter; @@ -41,7 +38,5 @@ public: virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" -#endif /* TAO_POLICYFACTORY_REGISTRY_FACTORY_H */ +#endif /* TAO_OBJECT_LOADER_H */ diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp index 14cb7c89456..fc8cbb69227 100644 --- a/TAO/tao/Policy_Current.cpp +++ b/TAO/tao/Policy_Current.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Policy_Current.h" +#include "Policy_Current.h" #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -10,17 +10,16 @@ # include "tao/Policy_Current.inl" #endif /* ! __ACE_INLINE__ */ + ACE_RCSID (tao, Policy_Current, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Policy_Current_Impl & TAO_Policy_Current::implementation (TAO_Policy_Current_Impl ¤t) { - TAO_TSS_Resources * const tss = + TAO_TSS_Resources *tss = TAO_TSS_Resources::instance (); TAO_Policy_Current_Impl *old = tss->policy_current_; @@ -78,6 +77,4 @@ TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h index 889c1971d24..ad0d5da00e3 100644 --- a/TAO/tao/Policy_Current.h +++ b/TAO/tao/Policy_Current.h @@ -19,12 +19,14 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/orbconf.h" + #if (TAO_HAS_CORBA_MESSAGING == 1) #include "tao/PolicyC.h" @@ -35,13 +37,11 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Policy_Current_Impl; -class TAO_Policy_Current - : public CORBA::PolicyCurrent - , public TAO_Local_RefCounted_Object +class TAO_Export TAO_Policy_Current : + public CORBA::PolicyCurrent, + public TAO_Local_RefCounted_Object { public: /// Constructor @@ -77,8 +77,6 @@ public: TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl index 3605ebd5b7e..e9bdbec8bb8 100644 --- a/TAO/tao/Policy_Current.inl +++ b/TAO/tao/Policy_Current.inl @@ -1,12 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Policy_Current::TAO_Policy_Current (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp index 9600341a74f..6ebb543218d 100644 --- a/TAO/tao/Policy_Current_Impl.cpp +++ b/TAO/tao/Policy_Current_Impl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Policy_Current_Impl.h" +#include "Policy_Current_Impl.h" #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -13,8 +13,6 @@ ACE_RCSID (tao, Policy_Manager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_Policy_Current_Impl::set_policy_overrides ( const CORBA::PolicyList & policies, @@ -37,6 +35,4 @@ TAO_Policy_Current_Impl::get_policy_overrides ( ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index 270342fe234..300473723ac 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,9 +38,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Policy_Current_Impl +class TAO_Export TAO_Policy_Current_Impl { public: @@ -69,8 +67,6 @@ private: TAO_Policy_Set manager_impl_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl index c7cc06d9743..92838269eec 100644 --- a/TAO/tao/Policy_Current_Impl.inl +++ b/TAO/tao/Policy_Current_Impl.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void) : manager_impl_ (TAO_POLICY_THREAD_SCOPE) @@ -26,4 +22,3 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index b2e78c363e3..b056d46a8e3 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/Policy_ForwardC.h" +#include "Policy_ForwardC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -305,5 +303,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::SetOverrideType & _tao_en return _tao_success; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 3ad266dc05d..9d15b8a3cf2 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -56,8 +56,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -332,8 +330,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 5e7383c4cc8..383c7a44db9 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Policy_Manager.h" +#include "Policy_Manager.h" #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -13,7 +13,6 @@ ACE_RCSID (tao, Policy_Manager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::PolicyList * TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts @@ -35,6 +34,4 @@ TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies, this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 14c00ee8721..c61e90afdb9 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -36,11 +36,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_Policy_Manager - : public CORBA::PolicyManager - , public TAO_Local_RefCounted_Object +class TAO_Export TAO_Policy_Manager : + public CORBA::PolicyManager, + public TAO_Local_RefCounted_Object { public: /// constructor @@ -76,8 +75,6 @@ private: TAO_Policy_Set impl_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index b982fad4f14..32eb06bdff8 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Policy_Manager::TAO_Policy_Manager (void) : impl_ (TAO_POLICY_ORB_SCOPE) @@ -34,5 +32,3 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type return this->impl_.get_cached_policy (type ACE_ENV_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 4dfd0946f19..9739eabc2bc 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Policy_Set.h" -#include "tao/Environment.h" -#include "tao/SystemException.h" -#include "tao/debug.h" +#include "Policy_Set.h" +#include "Environment.h" +#include "SystemException.h" +#include "debug.h" #if !defined (__ACE_INLINE__) -# include "tao/Policy_Set.i" +# include "Policy_Set.i" #endif /* ! __ACE_INLINE__ */ @@ -15,15 +15,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) - : scope_ (scope) -{ - for (unsigned int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; ++i) - this->cached_policies_[i] = 0; -} - TAO_Policy_Set::~TAO_Policy_Set (void) { ACE_DECLARE_NEW_CORBA_ENV; @@ -376,5 +367,3 @@ TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type return CORBA::Policy::_nil (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index db5bc837520..0e3b8e6bc24 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -26,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Policy_Set * @@ -46,7 +44,6 @@ public: */ TAO_Policy_Set (TAO_Policy_Scope scope); - /// Copy constructor. TAO_Policy_Set (const TAO_Policy_Set &rhs); /// Destructor @@ -104,7 +101,7 @@ public: CORBA::ULong num_policies (void) const; private: - TAO_Policy_Set & operator= (const TAO_Policy_Set&); + ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&)) /// Remove and destroy all the policy objects owned by this policy /// manager. @@ -125,7 +122,6 @@ private: TAO_Policy_Scope scope_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Policy_Set.i" diff --git a/TAO/tao/Policy_Set.i b/TAO/tao/Policy_Set.i index a8767177029..11c35bfdaa8 100644 --- a/TAO/tao/Policy_Set.i +++ b/TAO/tao/Policy_Set.i @@ -1,15 +1,17 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_INLINE +TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope) + : scope_ (scope) +{ + for (int i = 0; i < TAO_CACHED_POLICY_MAX_CACHED; i++) + this->cached_policies_[i] = 0; +} ACE_INLINE CORBA::Boolean TAO_Policy_Set::compatible_scope (TAO_Policy_Scope policy_scope) const { - return - ((static_cast<unsigned int> (policy_scope) - & static_cast<unsigned int> (this->scope_)) > 0); + return (((unsigned int) policy_scope & (unsigned int) this->scope_) > 0); } ACE_INLINE CORBA::Policy * @@ -23,5 +25,3 @@ TAO_Policy_Set::num_policies (void) const { return this->policy_list_.length(); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index b9753bd0fc2..cd51a8a1426 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/Policy_Validator.h" -#include "tao/Environment.h" -#include "tao/debug.h" +#include "Policy_Validator.h" +#include "Environment.h" +#include "debug.h" #include "ace/Log_Msg.h" @@ -10,18 +10,19 @@ ACE_RCSID (tao, Policy_Validator, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Policy_Validator::TAO_Policy_Validator (TAO_ORB_Core &orb_core) : orb_core_ (orb_core), next_ (0) { + // No-Op. } TAO_Policy_Validator::~TAO_Policy_Validator (void) { - delete this->next_; + if (this->next_) + { + delete this->next_; + } } TAO_ORB_Core & @@ -86,7 +87,7 @@ TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (this->next_) + if (this->next_ != 0) { this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -100,5 +101,3 @@ TAO_Policy_Validator::legal_policy (CORBA::PolicyType type) || ((this->next_ != 0) && this->next_->legal_policy_impl (type))); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index 69d680d9e61..10defec9d00 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Policy_Validator.h @@ -27,8 +25,6 @@ #include "tao/TAO_Export.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. class TAO_Policy_Set; class TAO_ORB_Core; @@ -113,8 +109,6 @@ private: TAO_Policy_Validator *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" -#endif /* TAO_POLICY_VALIDATOR_H */ +#endif /* TAO_POLICY_VALIDATOR_H_ */ diff --git a/TAO/tao/PortableInterceptor.h b/TAO/tao/PortableInterceptor.h index 380ae32530e..63623152d5f 100644 --- a/TAO/tao/PortableInterceptor.h +++ b/TAO/tao/PortableInterceptor.h @@ -22,7 +22,7 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" +#include "orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl index fdf42e809ae..00e1a22675c 100644 --- a/TAO/tao/PortableInterceptor.pidl +++ b/TAO/tao/PortableInterceptor.pidl @@ -34,8 +34,8 @@ #ifndef _PORTABLE_INTERCEPTOR_IDL_ #define _PORTABLE_INTERCEPTOR_IDL_ -#include "tao/PI_Forward.pidl" -#include "tao/Messaging_SyncScope.pidl" +#include <PI_Forward.pidl> +#include <Messaging_SyncScope.pidl> module PortableInterceptor { diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index fd12ae4eb40..25d2f8334ff 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -29,18 +29,14 @@ // be\be_codegen.cpp:277 -#include "tao/PortableInterceptorC.h" +#include "PortableInterceptorC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index f9edc88992e..bf1b51c4d81 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -52,8 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -131,8 +129,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 5699755a01b..17361e7c94f 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/PortableServer/Active_Object_Map.h" -#include "tao/PortableServer/Active_Object_Map_Entry.h" +#include "Active_Object_Map.h" +#include "Active_Object_Map_Entry.h" #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Active_Object_Map.i" +# include "Active_Object_Map.i" #endif /* __ACE_INLINE__ */ #include "ace/Auto_Ptr.h" @@ -14,8 +14,6 @@ ACE_RCSID(PortableServer, Active_Object_Map, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* static */ size_t TAO_Active_Object_Map::system_id_size_ = 0; @@ -935,4 +933,3 @@ TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 65c614de389..9cc254b555a 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -16,17 +16,15 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/Key_Adapters.h" +#include "Key_Adapters.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Base.h" -#include "tao/Server_Strategy_Factory.h" #include "ace/Map_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Server_Strategy_Factory.h" +#include "Servant_Base.h" // Forward declarations. class TAO_Id_Uniqueness_Strategy; @@ -615,10 +613,8 @@ public: TAO_Active_Object_Map_Entry &entry); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Active_Object_Map.i" +# include "Active_Object_Map.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i index 31b3326b811..59824cf5063 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.i +++ b/TAO/tao/PortableServer/Active_Object_Map.i @@ -1,10 +1,6 @@ -// -*- C++ -*- -// // $Id$ -#include "tao/PortableServer/Active_Object_Map_Entry.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Active_Object_Map_Entry.h" ACE_INLINE int TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant, @@ -260,5 +256,3 @@ TAO_Active_Object_Map::system_id_size (void) { return TAO_Active_Object_Map::system_id_size_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp index fc29e9faec0..d7a1fa3fe64 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "tao/PortableServer/Active_Object_Map_Entry.h" +#include "Active_Object_Map_Entry.h" ACE_RCSID(PortableServer, Active_Object_Map_Entry, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void) : user_id_ (), system_id_ (), @@ -18,4 +16,3 @@ TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h index 75d2a3d2c40..1c072df4201 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -16,14 +16,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/PS_ForwardC.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PS_ForwardC.h" /** * @struct TAO_Active_Object_Map_Entry @@ -58,8 +57,6 @@ struct TAO_Active_Object_Map_Entry CORBA::Short priority_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ACTIVE_OBJECT_MAP_ENTRY_H */ diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index 33c267042ba..4183da3f356 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -1,64 +1,61 @@ -// $Id$ - -#include "tao/PortableServer/Active_Policy_Strategies.h" -#include "tao/PortableServer/POA_Cached_Policies.h" - -#include "tao/PortableServer/ThreadStrategy.h" -#include "tao/PortableServer/ThreadStrategyFactory.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyFactory.h" -#include "tao/PortableServer/IdAssignmentStrategy.h" -#include "tao/PortableServer/IdAssignmentStrategyFactory.h" -#include "tao/PortableServer/LifespanStrategy.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" -#include "tao/PortableServer/IdUniquenessStrategy.h" -#include "tao/PortableServer/IdUniquenessStrategyFactory.h" -#include "tao/PortableServer/ImplicitActivationStrategy.h" -#include "tao/PortableServer/ImplicitActivationStrategyFactory.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategyFactory.h" - -#include "tao/PortableServer/IdAssignmentPolicyC.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" -#include "tao/PortableServer/LifespanPolicyC.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" -#include "tao/PortableServer/ThreadPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" +// @(#) $Id$ + +#include "Active_Policy_Strategies.h" +#include "POA_Cached_Policies.h" + +#include "ThreadStrategy.h" +#include "ThreadStrategyFactory.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyFactory.h" +#include "IdAssignmentStrategy.h" +#include "IdAssignmentStrategyFactory.h" +#include "LifespanStrategy.h" +#include "LifespanStrategyFactory.h" +#include "IdUniquenessStrategy.h" +#include "IdUniquenessStrategyFactory.h" +#include "ImplicitActivationStrategy.h" +#include "ImplicitActivationStrategyFactory.h" +#include "ServantRetentionStrategy.h" +#include "ServantRetentionStrategyFactory.h" + +#include "IdAssignmentPolicyC.h" +#include "IdUniquenessPolicyC.h" +#include "ImplicitActivationPolicyC.h" +#include "LifespanPolicyC.h" +#include "RequestProcessingPolicyC.h" +#include "ServantRetentionPolicyC.h" +#include "ThreadPolicyC.h" +#include "ServantRetentionPolicyC.h" #include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Active_Policy_Strategies.inl" +# include "Active_Policy_Strategies.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(PortableServer, Active_Policy_Strategies, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - Active_Policy_Strategies::Active_Policy_Strategies (void) - : thread_strategy_ (0), - request_processing_strategy_ (0), - id_assignment_strategy_ (0), - lifespan_strategy_ (0), - id_uniqueness_strategy_ (0), - implicit_activation_strategy_ (0), - servant_retention_strategy_ (0), - thread_strategy_factory_ (0), - servant_retention_strategy_factory_ (0), - request_processing_strategy_factory_ (0), - lifespan_strategy_factory_ (0), - implicit_activation_strategy_factory_ (0), - id_uniqueness_strategy_factory_ (0), - id_assignment_strategy_factory_ (0) + Active_Policy_Strategies::Active_Policy_Strategies() : + thread_strategy_ (0), + request_processing_strategy_ (0), + id_assignment_strategy_ (0), + lifespan_strategy_ (0), + id_uniqueness_strategy_ (0), + implicit_activation_strategy_ (0), + servant_retention_strategy_ (0), + thread_strategy_factory_ (0), + servant_retention_strategy_factory_ (0), + request_processing_strategy_factory_ (0), + lifespan_strategy_factory_ (0), + implicit_activation_strategy_factory_ (0), + id_uniqueness_strategy_factory_ (0), + id_assignment_strategy_factory_ (0) { } @@ -67,110 +64,104 @@ namespace TAO ::TAO_Root_POA *poa ACE_ENV_ARG_DECL) { - this->thread_strategy_factory_ = + thread_strategy_factory_ = ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory"); - if (this->thread_strategy_factory_ != 0) - this->thread_strategy_ = - this->thread_strategy_factory_->create (policies.thread()); + if (thread_strategy_factory_ != 0) + thread_strategy_ = thread_strategy_factory_->create (policies.thread()); /**/ - this->id_assignment_strategy_factory_ = + id_assignment_strategy_factory_ = ACE_Dynamic_Service<IdAssignmentStrategyFactory>::instance ("IdAssignmentStrategyFactory"); - if (this->id_assignment_strategy_factory_ != 0) - this->id_assignment_strategy_ = - this->id_assignment_strategy_factory_->create (policies.id_assignment()); + if (id_assignment_strategy_factory_ != 0) + id_assignment_strategy_ = id_assignment_strategy_factory_->create (policies.id_assignment()); /**/ - this->id_uniqueness_strategy_factory_ = + id_uniqueness_strategy_factory_ = ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyFactory"); - if (this->id_uniqueness_strategy_factory_ != 0) - this->id_uniqueness_strategy_ = - this->id_uniqueness_strategy_factory_->create (policies.id_uniqueness()); + if (id_uniqueness_strategy_factory_ != 0) + id_uniqueness_strategy_ = id_uniqueness_strategy_factory_->create (policies.id_uniqueness()); /**/ - this->servant_retention_strategy_factory_ = + servant_retention_strategy_factory_ = ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyFactory"); - if (this->servant_retention_strategy_factory_ != 0) - this->servant_retention_strategy_ = - this->servant_retention_strategy_factory_->create (policies.servant_retention()); + if (servant_retention_strategy_factory_ != 0) + servant_retention_strategy_ = + servant_retention_strategy_factory_->create (policies.servant_retention()); /**/ - this->request_processing_strategy_factory_ = + request_processing_strategy_factory_ = ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyFactory"); - if (this->request_processing_strategy_factory_ != 0) - this->request_processing_strategy_ = - this->request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention()); + if (request_processing_strategy_factory_ != 0) + request_processing_strategy_ = request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention()); /**/ - this->lifespan_strategy_factory_ = + lifespan_strategy_factory_ = ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyFactory"); - if (this->lifespan_strategy_factory_ != 0) - this->lifespan_strategy_ = - this->lifespan_strategy_factory_->create (policies.lifespan()); + if (lifespan_strategy_factory_ != 0) + lifespan_strategy_ = lifespan_strategy_factory_->create (policies.lifespan()); /**/ - this->implicit_activation_strategy_factory_ = + implicit_activation_strategy_factory_ = ACE_Dynamic_Service<ImplicitActivationStrategyFactory>::instance ("ImplicitActivationStrategyFactory"); - if (this->implicit_activation_strategy_factory_ != 0) - this->implicit_activation_strategy_ = - this->implicit_activation_strategy_factory_->create (policies.implicit_activation()); + if (implicit_activation_strategy_factory_ != 0) + implicit_activation_strategy_ = implicit_activation_strategy_factory_->create (policies.implicit_activation()); /**/ // @todo, check if all pointers are != 0 - if (this->lifespan_strategy_ != 0) + if (lifespan_strategy_ != 0) { - this->lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (this->request_processing_strategy_ != 0) + if (request_processing_strategy_ != 0) { - this->request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER); + request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (this->id_uniqueness_strategy_ != 0) + if (id_uniqueness_strategy_ != 0) { - this->id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (this->implicit_activation_strategy_ != 0) + if (implicit_activation_strategy_ != 0) { - this->implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (this->thread_strategy_ != 0) + if (thread_strategy_ != 0) { - this->thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (this->servant_retention_strategy_ != 0) + if (servant_retention_strategy_ != 0) { - this->servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - if (this->id_assignment_strategy_ != 0) + if (id_assignment_strategy_ != 0) { - this->id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); + id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -179,63 +170,61 @@ namespace TAO Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL) { - if (this->lifespan_strategy_ != 0) + if (lifespan_strategy_ != 0) { - this->lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER); + lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->lifespan_strategy_ = 0; + lifespan_strategy_ = 0; } - if (this->request_processing_strategy_ != 0) + if (request_processing_strategy_ != 0) { - this->request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER); + request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->request_processing_strategy_ = 0; + request_processing_strategy_ = 0; } - if (this->id_uniqueness_strategy_ != 0) + if (id_uniqueness_strategy_ != 0) { - this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER); + id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->id_uniqueness_strategy_ = 0; + id_uniqueness_strategy_ = 0; } - if (this->implicit_activation_strategy_ != 0) + if (implicit_activation_strategy_ != 0) { - this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER); + implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->implicit_activation_strategy_ = 0; + implicit_activation_strategy_ = 0; } - if (this->thread_strategy_ != 0) + if (thread_strategy_ != 0) { - this->thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER); + thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->thread_strategy_ = 0; + thread_strategy_ = 0; } - if (this->servant_retention_strategy_ != 0) + if (servant_retention_strategy_ != 0) { - this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER); + servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->servant_retention_strategy_ = 0; + servant_retention_strategy_ = 0; } - if (this->id_assignment_strategy_ != 0) + if (id_assignment_strategy_ != 0) { - this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER); + id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->id_assignment_strategy_ = 0; + id_assignment_strategy_ = 0; } } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 685c6978c2b..aedab179e3f 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -12,18 +12,16 @@ #ifndef TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H #define TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H - #include /**/ "ace/pre.h" -#include "tao/Environment.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Environment.h" class TAO_Root_POA; @@ -51,10 +49,10 @@ namespace TAO /** * This class stores the active policy strategies used for a certain POA. */ - class Active_Policy_Strategies + class TAO_PortableServer_Export Active_Policy_Strategies { public: - Active_Policy_Strategies (void); + Active_Policy_Strategies(); void update (Cached_Policies &policies, TAO_Root_POA* poa @@ -96,12 +94,9 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Active_Policy_Strategies.inl" +# include "Active_Policy_Strategies.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" - #endif /* TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H */ diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index ab606b04b1a..ff04b364157 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -1,8 +1,4 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// @(#) $Id$ namespace TAO { @@ -12,51 +8,49 @@ namespace TAO ThreadStrategy* Active_Policy_Strategies::thread_strategy (void) const { - return this->thread_strategy_; + return thread_strategy_; } ACE_INLINE RequestProcessingStrategy* Active_Policy_Strategies::request_processing_strategy (void) const { - return this->request_processing_strategy_; + return request_processing_strategy_; } ACE_INLINE IdAssignmentStrategy * Active_Policy_Strategies::id_assignment_strategy (void) const { - return this->id_assignment_strategy_; + return id_assignment_strategy_; } ACE_INLINE IdUniquenessStrategy * Active_Policy_Strategies::id_uniqueness_strategy (void) const { - return this->id_uniqueness_strategy_; + return id_uniqueness_strategy_; } ACE_INLINE LifespanStrategy* Active_Policy_Strategies::lifespan_strategy (void) const { - return this->lifespan_strategy_; + return lifespan_strategy_; } ACE_INLINE ImplicitActivationStrategy* Active_Policy_Strategies::implicit_activation_strategy (void) const { - return this->implicit_activation_strategy_; + return implicit_activation_strategy_; } ACE_INLINE ServantRetentionStrategy* Active_Policy_Strategies::servant_retention_strategy (void) const { - return this->servant_retention_strategy_; + return servant_retention_strategy_; } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl index 81adf4c3039..0fa4dce9ee9 100644 --- a/TAO/tao/PortableServer/AdapterActivator.pidl +++ b/TAO/tao/PortableServer/AdapterActivator.pidl @@ -21,7 +21,7 @@ #define _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/PortableServer/PS_Forward.pidl" +#include <tao/PortableServer/PS_Forward.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index ebf6cd1285e..0e381b61957 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -30,15 +30,13 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/PortableServer/AdapterActivatorA.h" +#include "AdapterActivatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -55,6 +53,4 @@ namespace PortableServer &_tao_tc_PortableServer_AdapterActivator; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorA.h b/TAO/tao/PortableServer/AdapterActivatorA.h index fa84df9f34e..b67fd60fcae 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.h +++ b/TAO/tao/PortableServer/AdapterActivatorA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/AdapterActivatorC.h" +#include "portableserver_export.h" +#include "AdapterActivatorC.h" #include "tao/PortableServer/PS_ForwardA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -56,8 +54,6 @@ namespace PortableServer } // module PortableServer -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index 7eb482f2d99..14a2fbb7712 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/AdapterActivatorC.h" +#include "AdapterActivatorC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -167,6 +165,4 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) return false; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index ce0251e59d5..de4186e65c1 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -59,8 +59,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { // TAO_IDL - Generated from @@ -193,8 +191,6 @@ namespace TAO #endif /* end #if !defined */ } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp index a10948a20f0..4a8a0386ef1 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.cpp +++ b/TAO/tao/PortableServer/Adapter_Activator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Adapter_Activator.h" +#include "Adapter_Activator.h" ACE_RCSID (PortableServer, Adapter_Activator, @@ -8,11 +8,9 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -#include "tao/PortableServer/AdapterActivatorC.h" -#include "tao/PortableServer/POAManagerC.h" -#include "tao/PortableServer/PortableServer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "AdapterActivatorC.h" +#include "POAManagerC.h" +#include "PortableServer.h" namespace TAO { @@ -63,6 +61,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h index 65ecd7d9417..a3cd80dc34c 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.h +++ b/TAO/tao/PortableServer/Adapter_Activator.h @@ -1,10 +1,11 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file Adapter_Activator.h * * $Id$ + * */ //============================================================================= @@ -12,18 +13,16 @@ #define TAO_ADAPTER_ACTIVATOR_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/AdapterActivatorC.h" +#include "AdapterActivatorC.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { class POAManager; @@ -56,8 +55,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h index 21cdd6547cf..abb88199417 100644 --- a/TAO/tao/PortableServer/Any_SArg_Traits.h +++ b/TAO/tao/PortableServer/Any_SArg_Traits.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,8 +24,6 @@ #include "tao/PortableServer/Var_Size_SArgument_T.h" #include "tao/PortableServer/portableserver_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Any; @@ -48,8 +46,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ANY_ARG_TRAITS_H */ diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index f145439f8e7..1b9ae8f7adf 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -9,7 +9,6 @@ #include "tao/PortableServer/BD_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_var, @@ -157,6 +156,4 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_BD_STRING_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index fd24af1a112..e4cd49d1ab6 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -25,8 +25,6 @@ #include "tao/Argument.h" #include "tao/Any_Insert_Policy_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -195,8 +193,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/BD_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index 57bfd4f3299..c8727fb3d32 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -1,9 +1,5 @@ -// -*- C+ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename S_var, typename to_S, @@ -112,4 +108,3 @@ arg (void) return this->x_.out (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp index 1bd5ab450eb..a6fe3ead5f4 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp @@ -9,7 +9,6 @@ #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename Insert_Policy> CORBA::Boolean @@ -96,6 +95,4 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_BASIC_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index 074367b1102..33297cb7adf 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -144,8 +142,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index 9c7f0f0de3c..195d7bca229 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> ACE_INLINE TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void) @@ -62,4 +60,3 @@ TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void) return this->x_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h index 433002d391f..933476cb806 100644 --- a/TAO/tao/PortableServer/Basic_SArguments.h +++ b/TAO/tao/PortableServer/Basic_SArguments.h @@ -25,7 +25,6 @@ #include "tao/PortableServer/Basic_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -107,8 +106,6 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_BASIC_SARGUMENTS_H */ diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 9ac5275b9ef..dd27ae99b0f 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -1,9 +1,9 @@ //$Id$ // -- PortableServer Include -- -#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h" -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/Servant_Base.h" +#include "Collocated_Object_Proxy_Broker.h" +#include "Object_Adapter.h" +#include "Servant_Upcall.h" +#include "Servant_Base.h" // -- TAO Include -- @@ -16,7 +16,6 @@ ACE_RCSID (PortableServer, Collocated_Object_Proxy_Broker, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -307,8 +306,11 @@ the_tao_collocated_object_proxy_broker (void) return &the_broker; } -TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void) +TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory ( + CORBA::Object_ptr obj + ) { + ACE_UNUSED_ARG (obj); return the_tao_collocated_object_proxy_broker (); } @@ -327,5 +329,3 @@ _TAO_collocation_Object_Proxy_Broker_Factory_Initializer ( reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer ) ); - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index cd28b880933..070e24ba648 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -18,7 +18,7 @@ #define TAO_COLLOCATED_OBJECT_PROXY_BROKER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +26,6 @@ #include "tao/Object_Proxy_Broker.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -75,8 +73,6 @@ namespace TAO /// proxy broker. All the CORBA::Object share the proxy broker. TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_COLLOCATED_OBJECT_PROXY_BROKER_H*/ diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp index 0156db0dec3..2b938b862ce 100644 --- a/TAO/tao/PortableServer/Creation_Time.cpp +++ b/TAO/tao/PortableServer/Creation_Time.cpp @@ -1,10 +1,10 @@ -#include "tao/PortableServer/Creation_Time.h" +#include "Creation_Time.h" ACE_RCSID (PortableServer, Creation_Time, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Creation_Time.inl" +# include "Creation_Time.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 525ce68acee..5804c01a892 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -93,10 +91,8 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Creation_Time.inl" +# include "Creation_Time.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl index f629b10e91b..18df03c4bed 100644 --- a/TAO/tao/PortableServer/Creation_Time.inl +++ b/TAO/tao/PortableServer/Creation_Time.inl @@ -5,8 +5,6 @@ #include "tao/orbconf.h" /* For POA_NO_TIMESTAMP definition. */ #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -123,4 +121,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index 40177f90b27..6a054ee480f 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -1,6 +1,6 @@ // @(#) $Id$ -#include "tao/PortableServer/Default_Acceptor_Filter.h" +#include "Default_Acceptor_Filter.h" #include "tao/Transport_Acceptor.h" #include "tao/MProfile.h" #include "tao/Profile.h" @@ -9,9 +9,6 @@ ACE_RCSID(PortableServer, Default_Acceptor_Filter, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void) { } @@ -54,5 +51,3 @@ TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index b9288216837..d6a859d0e3d 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -6,7 +6,8 @@ * * $Id$ * - * Default strategy for populating mprofile + * Default strategy for populating mprofile + * * * @author Marina Spivak <marina@cs.wustl.edu> * @author Carlos O'Ryan <coryan@uci.edu> @@ -16,10 +17,9 @@ #ifndef TAO_DEFAULT_ACCEPTOR_FILTER_H #define TAO_DEFAULT_ACCEPTOR_FILTER_H - #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +27,6 @@ #include "tao/Acceptor_Filter.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; /** @@ -57,8 +55,5 @@ public: int encode_endpoints (TAO_MProfile &mprofile); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_DEFAULT_ACCEPTOR_FILTER_H */ diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index a8ad08a7394..e3b7c8a597b 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -1,18 +1,16 @@ -// $Id$ +// @(#) $Id$ -#include "tao/PortableServer/Default_Policy_Validator.h" +#include "Default_Policy_Validator.h" #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "tao/PolicyFactory_Registry_Adapter.h" -#include "tao/PortableServer/PortableServer.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, Default_Policy_Validator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator ( TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core) @@ -124,6 +122,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies #endif /* TAO_HAS_MINIMUM_POA == 0 */ } + CORBA::Boolean TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type) { @@ -148,5 +147,3 @@ TAO_POA_Default_Policy_Validator::merge_policies_impl ( ACE_ENV_ARG_DECL_NOT_USED) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index ce099b9d402..0b9f8a33a29 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Default_Policy_Validator.h @@ -18,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,8 +24,6 @@ #include "tao/Policy_Validator.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator : public TAO_Policy_Validator { @@ -62,7 +58,5 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_POLICY_VALIDATOR_H_ */ diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index ae93dee3d61..dbd38fd621c 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -1,14 +1,12 @@ -// $Id$ +// @(#) $Id$ -#include "tao/PortableServer/Default_Servant_Dispatcher.h" -#include "tao/PortableServer/Root_POA.h" +#include "Default_Servant_Dispatcher.h" +#include "Root_POA.h" ACE_RCSID(PortableServer, Default_Servant_Dispatcher, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void) { } @@ -65,5 +63,3 @@ TAO_Default_Servant_Dispatcher::post_invoke ( TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 412e8eea9c6..b0af90027e3 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,15 +14,13 @@ #define TAO_DEFAULT_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Dispatcher.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Servant_Dispatcher.h" /** * @class TAO_Default_Servant_Dispatcher @@ -71,7 +69,5 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_SERVANT_DISPATCHER_H */ diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index 9b2d483f011..026f9f44ff5 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" +#include "Direct_Collocation_Upcall_Wrapper.h" #if (TAO_HAS_MINIMUM_CORBA == 0) -# include "tao/PortableServer/ForwardRequestC.h" +# include "ForwardRequestC.h" #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #include "tao/Abstract_Servant_Base.h" @@ -16,8 +16,6 @@ ACE_RCSID (PortableServer, Direct_Collocation_Upcall_Wrapper, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO::Direct_Collocation_Upcall_Wrapper::upcall ( CORBA::Object_ptr obj, @@ -70,4 +68,3 @@ ACE_THROW_SPEC ((CORBA::Exception)) ACE_CHECK; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index 3bdf12a5022..2d7dc5ff483 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #ifndef ACE_LACKS_PRAGMA_ONCE # pragma once @@ -25,11 +25,9 @@ #include "tao/orbconf.h" #include "tao/Collocation_Strategy.h" #include "tao/Exception.h" +#include "ace/CORBA_macros.h" #include "tao/CORBA_methods.h" #include "tao/Pseudo_VarOut_T.h" -#include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -71,7 +69,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 9ddd1ea1d36..1d90e7de4bc 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -9,8 +9,6 @@ #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename S_slice, typename S_forany, @@ -159,6 +157,4 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice, #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_FIXED_ARRAY_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index e03fb2c19f4..4fb052bbfc7 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -22,9 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -177,8 +174,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index 0708aa7ebf1..24a54390d96 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename S_slice, typename S_forany, @@ -119,5 +117,3 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice, { return this->x_._retn_arg (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp index 2fc65cd99cf..a145529ec0c 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -9,7 +9,6 @@ #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename Insert_Policy> @@ -110,6 +109,4 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_FIXED_SIZE_SARGUMENT_T_CPP */ +#endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */ diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index fb9f6ea732a..b7d77ee05d3 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -12,6 +12,7 @@ */ //============================================================================= + #ifndef TAO_FIXED_SIZE_SARGUMENT_T_H #define TAO_FIXED_SIZE_SARGUMENT_T_H @@ -23,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -216,7 +215,6 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index 3a265297105..05e29ce35a6 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> ACE_INLINE @@ -67,5 +65,3 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) { return this->x_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp index 24d7567729c..e7f7a7415bf 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.cpp +++ b/TAO/tao/PortableServer/ForwardRequestA.cpp @@ -30,15 +30,13 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/PortableServer/ForwardRequestA.h" +#include "ForwardRequestA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO extension - the virtual _type method. CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const { @@ -158,6 +156,4 @@ CORBA::Boolean operator>>= ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestA.h b/TAO/tao/PortableServer/ForwardRequestA.h index 578ec0ccb21..7334c86752b 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.h +++ b/TAO/tao/PortableServer/ForwardRequestA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ForwardRequestC.h" +#include "portableserver_export.h" +#include "ForwardRequestC.h" #if (TAO_HAS_MINIMUM_POA == 0) // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -64,8 +62,6 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Forwar TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index d82d2935b9f..c062858725e 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ForwardRequestC.h" +#include "ForwardRequestC.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -199,6 +197,4 @@ CORBA::Boolean operator>> ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h index 299323cee16..68cd5c23e74 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.h +++ b/TAO/tao/PortableServer/ForwardRequestC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -132,8 +130,6 @@ namespace TAO TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index f3744823ab9..89efde0e574 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -1,12 +1,10 @@ -#include "tao/PortableServer/IdAssignmentPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "IdAssignmentPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, IdAssignmentPolicy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,4 +62,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index c8c6d9f9cf3..d467272019e 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "IdAssignmentPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -30,8 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -67,8 +65,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl index 7f06e39e614..1159445ce0b 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_ #define _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index 83970768fa3..ad3a8c200b3 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -30,14 +30,12 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/IdAssignmentPolicyA.h" +#include "IdAssignmentPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -110,5 +108,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.h b/TAO/tao/PortableServer/IdAssignmentPolicyA.h index 49df4b62e0e..5e640efa07f 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "portableserver_export.h" +#include "IdAssignmentPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -67,8 +65,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index 7d78dc8ac31..dae4a91d05b 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "IdAssignmentPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -189,5 +187,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPoli return _tao_success; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h index 3a01f212361..f7c43ec160d 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -230,8 +228,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index 969a6bfa112..87cb019e4b5 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -1,21 +1,17 @@ // $Id$ -#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "IdAssignmentStrategy.h" ACE_RCSID (PortableServer, IdAssignmentStrategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { void - IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ - ACE_ENV_ARG_DECL_NOT_USED) + IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED) { } @@ -43,4 +39,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index d53a67c62b3..e3085c33be2 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -14,7 +14,7 @@ #define TAO_ID_ASSIGNMENT_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,14 +22,12 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - class IdAssignmentStrategy - : public Policy_Strategy + class IdAssignmentStrategy : + public Policy_Strategy { public: virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL); @@ -53,7 +51,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ID_ASSIGNMENT_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h index 2d0dd83a80c..73a5e0c050a 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/IdAssignmentPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "StrategyFactory.h" +#include "IdAssignmentPolicyC.h" namespace TAO { @@ -46,7 +44,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 475632c8363..b83c49ecf00 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h" -#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "IdAssignmentStrategyFactoryImpl.h" +#include "IdAssignmentStrategy.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, IdAssignmentStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -54,20 +52,15 @@ namespace TAO // Noop because both types are singletons } + ACE_STATIC_SVC_DEFINE ( + IdAssignmentStrategyFactoryImpl, + ACE_TEXT ("IdAssignmentStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + + ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyFactoryImpl) } } - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE ( - IdAssignmentStrategyFactoryImpl, - ACE_TEXT ("IdAssignmentStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdAssignmentStrategyFactoryImpl, - TAO::Portable_Server::IdAssignmentStrategyFactoryImpl) diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h index 1e7cadb3267..2ae4e43b745 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdAssignmentStrategyFactory.h" #include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "IdAssignmentStrategyFactory.h" namespace TAO { @@ -41,14 +39,11 @@ namespace TAO IdAssignmentStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl) - #include /**/ "ace/post.h" - #endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index d7775832e2c..fbdbaed75c4 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -1,14 +1,11 @@ // $Id$ -#include "tao/PortableServer/IdAssignmentStrategySystem.h" +#include "IdAssignmentStrategySystem.h" ACE_RCSID (PortableServer, Id_Assignment_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -24,21 +21,17 @@ namespace TAO { return true; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategySystem) -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdAssignmentStrategySystem, - TAO::Portable_Server::IdAssignmentStrategySystem) - -ACE_STATIC_SVC_DEFINE ( - IdAssignmentStrategySystem, - ACE_TEXT ("IdAssignmentStrategySystem"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdAssignmentStrategySystem), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_STATIC_SVC_DEFINE ( + IdAssignmentStrategySystem, + ACE_TEXT ("IdAssignmentStrategySystem"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdAssignmentStrategySystem), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index e77cbc95b8f..6471e5bce3f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -14,17 +14,15 @@ #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "IdAssignmentStrategy.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -37,13 +35,11 @@ namespace TAO virtual bool has_system_id (void) const; }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem) - #include /**/ "ace/post.h" #endif /* TAO_IDASSIGNMENTSTRATEGYSYSTEM_H */ diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 3cfa5cef85a..9895db85f2e 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -1,13 +1,11 @@ // $Id$ -#include "tao/PortableServer/IdAssignmentStrategyUser.h" +#include "IdAssignmentStrategyUser.h" ACE_RCSID (PortableServer, Id_Assignment_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -23,20 +21,17 @@ namespace TAO { return false; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyUser) -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdAssignmentStrategyUser, - TAO::Portable_Server::IdAssignmentStrategyUser) + ACE_STATIC_SVC_DEFINE ( + IdAssignmentStrategyUser, + ACE_TEXT ("IdAssignmentStrategyUser"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdAssignmentStrategyUser), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} -ACE_STATIC_SVC_DEFINE ( - IdAssignmentStrategyUser, - ACE_TEXT ("IdAssignmentStrategyUser"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdAssignmentStrategyUser), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index f3560cef1d5..f202c12c6ad 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -14,17 +14,15 @@ #define TAO_IDASSIGNMENTSTRATEGYUSER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "IdAssignmentStrategy.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -37,13 +35,11 @@ namespace TAO virtual bool has_system_id (void) const; }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser) - #include /**/ "ace/post.h" #endif /* TAO_IDASSIGNMENTSTRATEGYUSER_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index 03a206a6301..7dc969af49c 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -1,12 +1,10 @@ -#include "tao/PortableServer/IdUniquenessPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "IdUniquenessPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, IdUniquenessPolicy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,4 +62,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 20e641bc3bf..3064d77924a 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "IdUniquenessPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -30,8 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -67,8 +65,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl index 5175cb16d30..110ee6471f0 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_ #define _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index a11afa6fd24..49e84fb2d7e 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -34,10 +34,9 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -#include "tao/PortableServer/IdUniquenessPolicyA.h" +#include "IdUniquenessPolicyA.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -111,5 +110,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.h b/TAO/tao/PortableServer/IdUniquenessPolicyA.h index 547e53a5073..22d04465329 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "portableserver_export.h" +#include "IdUniquenessPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -67,8 +65,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index 636a02a22c3..340160fd2fc 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "IdUniquenessPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -189,5 +187,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPoli return _tao_success; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h index c706c285feb..dbdeb5d2ed6 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -230,8 +228,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index de0fb20c737..bdb2f08e182 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -14,17 +14,15 @@ #define TAO_ID_UNIQUENESS_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Policy_Strategy.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" -#include "tao/PortableServer/PS_ForwardC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Policy_Strategy.h" +#include "IdUniquenessPolicyC.h" +#include "PS_ForwardC.h" namespace TAO { @@ -50,7 +48,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ID_UNIQUENESS_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h index b3f973ef19f..c4c28dd26e4 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "StrategyFactory.h" +#include "IdUniquenessPolicyC.h" namespace TAO { @@ -47,7 +45,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 47530f5a9a9..7a9aae6ed11 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h" -#include "tao/PortableServer/IdUniquenessStrategy.h" +#include "IdUniquenessStrategyFactoryImpl.h" +#include "IdUniquenessStrategy.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, IdUniquenessStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -81,20 +79,15 @@ namespace TAO } } + ACE_STATIC_SVC_DEFINE ( + IdUniquenessStrategyFactoryImpl, + ACE_TEXT ("IdUniquenessStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyFactoryImpl) } } - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyFactoryImpl, - ACE_TEXT ("IdUniquenessStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyFactoryImpl, - TAO::Portable_Server::IdUniquenessStrategyFactoryImpl) diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index 8846237437d..88d453a4a59 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/PortableServer/IdUniquenessStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "IdUniquenessStrategyFactory.h" namespace TAO { @@ -41,13 +39,11 @@ namespace TAO IdUniquenessStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (IdUniquenessStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl) - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index d1071f1470c..19b94296166 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -1,14 +1,11 @@ // $Id$ -#include "tao/PortableServer/IdUniquenessStrategyMultiple.h" +#include "IdUniquenessStrategyMultiple.h" ACE_RCSID (PortableServer, Id_Uniqueness_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -48,20 +45,15 @@ namespace TAO return ::PortableServer::MULTIPLE_ID; } + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyMultiple) + + ACE_STATIC_SVC_DEFINE ( + IdUniquenessStrategyMultiple, + ACE_TEXT ("IdUniquenessStrategyMultiple"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdUniquenessStrategyMultiple), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) } } - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyMultiple, - TAO::Portable_Server::IdUniquenessStrategyMultiple) - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyMultiple, - ACE_TEXT ("IdUniquenessStrategyMultiple"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyMultiple), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index f3c2e405447..e706f0e7b87 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -14,17 +14,15 @@ #define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdUniquenessStrategy.h" +#include "IdUniquenessStrategy.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -46,14 +44,10 @@ namespace TAO virtual ::PortableServer::IdUniquenessPolicyValue type() const; }; + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple) - - #include /**/ "ace/post.h" #endif /* TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 3c5516d4956..b612a8ffb4d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -1,15 +1,12 @@ // $Id$ -#include "tao/PortableServer/IdUniquenessStrategyUnique.h" -#include "tao/PortableServer/Root_POA.h" +#include "IdUniquenessStrategyUnique.h" +#include "Root_POA.h" ACE_RCSID (PortableServer, Id_Uniqueness_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -60,20 +57,15 @@ namespace TAO return ::PortableServer::UNIQUE_ID; } + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUnique) + + ACE_STATIC_SVC_DEFINE ( + IdUniquenessStrategyUnique, + ACE_TEXT ("IdUniquenessStrategyUnique"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdUniquenessStrategyUnique), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) } } - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyUnique, - TAO::Portable_Server::IdUniquenessStrategyUnique) - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyUnique, - ACE_TEXT ("IdUniquenessStrategyUnique"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyUnique), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 58bbf096de5..7af8890f475 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -14,17 +14,15 @@ #define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/IdUniquenessStrategy.h" +#include "IdUniquenessStrategy.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -52,14 +50,10 @@ namespace TAO TAO_Root_POA* poa_; }; + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique) - - #include /**/ "ace/post.h" #endif /* TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H */ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index b29178c143f..77b597e30c9 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h" -#include "tao/PortableServer/IdUniquenessStrategyUnique.h" +#include "IdUniquenessStrategyUniqueFactoryImpl.h" +#include "IdUniquenessStrategyUnique.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, IdUniquenessStrategyUniqueFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -48,21 +46,16 @@ namespace TAO delete strategy; } + ACE_STATIC_SVC_DEFINE ( + IdUniquenessStrategyUniqueFactoryImpl, + ACE_TEXT ("IdUniquenessStrategyUniqueFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + + ACE_FACTORY_DEFINE (ACE_Local_Service, IdUniquenessStrategyUniqueFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE ( - IdUniquenessStrategyUniqueFactoryImpl, - ACE_TEXT ("IdUniquenessStrategyUniqueFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - IdUniquenessStrategyUniqueFactoryImpl, - TAO::Portable_Server::IdUniquenessStrategyUniqueFactoryImpl) - diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index 721ae2a6eb9..927dda0a86b 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/PortableServer/IdUniquenessStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "IdUniquenessStrategyFactory.h" namespace TAO { @@ -42,14 +40,10 @@ namespace TAO ACE_ENV_ARG_DECL); }; + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl) - - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index c5a9d148f85..379a7696117 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -1,21 +1,19 @@ -// $Id$ +// @(#) $Id$ -#include "tao/PortableServer/ImR_Client_Adapter.h" +#include "ImR_Client_Adapter.h" ACE_RCSID (tao, ImR_Client_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { + ImR_Client_Adapter::~ImR_Client_Adapter (void) { } } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index e5b55bd6077..019cc333669 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +27,6 @@ #include "tao/orbconf.h" #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Root_POA; namespace TAO @@ -59,7 +57,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_IMR_CLIENT_ADAPTER_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index 3c968d993da..940a0f05b18 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -1,5 +1,5 @@ -#include "tao/PortableServer/ImplicitActivationPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "ImplicitActivationPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, ImplicitActivationPolicy, @@ -7,8 +7,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -66,6 +64,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index ee7f98bbbe5..6e9f11bea63 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "ImplicitActivationPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -32,8 +32,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -69,8 +67,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl index 976c399bc02..9a5351cac56 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_ #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index e9cf1e13d1c..dbf3b01f052 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/ImplicitActivationPolicyA.h" +#include "ImplicitActivationPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -113,6 +111,4 @@ CORBA::Boolean operator>>= ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h index 1445a5a68a6..70e35ef75ac 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "portableserver_export.h" +#include "ImplicitActivationPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -67,8 +65,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index 3a6f411acf4..825dd9af720 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "ImplicitActivationPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivati return _tao_success; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h index baad7fbbbbc..82f509d1bd9 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -237,8 +235,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index f2761572e36..0e1e4d3002e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -1,13 +1,11 @@ // -*- C++ -*- -#include "tao/PortableServer/ImplicitActivationStrategy.h" +#include "ImplicitActivationStrategy.h" ACE_RCSID (PortableServer, ImplicitActivationStrategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -28,4 +26,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 22ca61b5cbf..fbdaf2cab52 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -14,14 +14,12 @@ #define TAO_ACTIVATION_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -39,7 +37,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ACTIVATION_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 09ca4fb613e..55f3a61fcef 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -1,13 +1,11 @@ // -*- C++ -*- -#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" +#include "ImplicitActivationStrategyExplicit.h" ACE_RCSID (PortableServer, ImplicitActivationStrategyExplicit, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -17,22 +15,17 @@ namespace TAO { return false; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyExplicit) -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ImplicitActivationStrategyExplicit, - TAO::Portable_Server::ImplicitActivationStrategyExplicit) - -ACE_STATIC_SVC_DEFINE ( - ImplicitActivationStrategyExplicit, - ACE_TEXT ("ImplicitActivationStrategyExplicit"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImplicitActivationStrategyExplicit), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_STATIC_SVC_DEFINE ( + ImplicitActivationStrategyExplicit, + ACE_TEXT ("ImplicitActivationStrategyExplicit"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ImplicitActivationStrategyExplicit), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index af9e70e931e..0e03d29c584 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -14,17 +14,15 @@ #define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ImplicitActivationStrategy.h" +#include "ImplicitActivationStrategy.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -35,14 +33,11 @@ namespace TAO public: virtual bool allow_implicit_activation (void) const; }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit) + ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit) } } -TAO_END_VERSIONED_NAMESPACE_DECL - - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit) -ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit) - #include /**/ "ace/post.h" #endif /* TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h index f5d1a8aa5f4..48ed323d19d 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "StrategyFactory.h" +#include "ImplicitActivationPolicyC.h" namespace TAO { @@ -46,7 +44,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index 0fa7771687c..ef3916e288a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h" +#include "ImplicitActivationStrategyFactoryImpl.h" #include "ace/Dynamic_Service.h" -#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" -#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" +#include "ImplicitActivationStrategyImplicit.h" +#include "ImplicitActivationStrategyExplicit.h" ACE_RCSID (PortableServer, ImplicitActivationStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -54,22 +52,17 @@ namespace TAO { // Noop because both types are singletons } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ImplicitActivationStrategyFactoryImpl, - TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl) + ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyFactoryImpl) - -ACE_STATIC_SVC_DEFINE ( - ImplicitActivationStrategyFactoryImpl, - ACE_TEXT ("ImplicitActivationStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_STATIC_SVC_DEFINE ( + ImplicitActivationStrategyFactoryImpl, + ACE_TEXT ("ImplicitActivationStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index 6b9e87ef7f3..90ff9ea0a63 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -14,17 +14,14 @@ #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/PortableServer/ImplicitActivationStrategyFactory.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ImplicitActivationStrategyFactory.h" namespace TAO { @@ -42,13 +39,11 @@ namespace TAO ImplicitActivationStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl) - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 551d6f45bdf..dbc91745bf1 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- -#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" +#include "ImplicitActivationStrategyImplicit.h" ACE_RCSID (PortableServer, ImplicitActivationStrategyImplicit, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -18,22 +15,17 @@ namespace TAO { return true; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ImplicitActivationStrategyImplicit, - TAO::Portable_Server::ImplicitActivationStrategyImplicit) - -ACE_STATIC_SVC_DEFINE ( - ImplicitActivationStrategyImplicit, - ACE_TEXT ("ImplicitActivationStrategyImplicit"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ImplicitActivationStrategyImplicit), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyImplicit) + ACE_STATIC_SVC_DEFINE ( + ImplicitActivationStrategyImplicit, + ACE_TEXT ("ImplicitActivationStrategyImplicit"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ImplicitActivationStrategyImplicit), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 92f9feab992..766d0aff4cb 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -14,17 +14,15 @@ #define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ImplicitActivationStrategy.h" +#include "ImplicitActivationStrategy.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -35,14 +33,11 @@ namespace TAO public: virtual bool allow_implicit_activation (void) const; }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit) + ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit) -ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit) - - #include /**/ "ace/post.h" #endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */ diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index 9263e4470fc..0765402e755 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Key_Adapters.h" +#include "Key_Adapters.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" @@ -10,9 +10,7 @@ ACE_RCSID (PortableServer, Key_Adapters, "$Id$") -/////////////////////////////////////////////////////////////////////////////// - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +//////////////////////////////////////////////////////////////////////////////// TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void) : counter_ (0) @@ -148,5 +146,4 @@ TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modif return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - +//////////////////////////////////////////////////////////////////////////////// diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index ac5881a10fa..a7f8e544b5c 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -15,21 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PS_ForwardC.h" +#include "PS_ForwardC.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Active_Map_Manager_Key; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// /** * @class TAO_Incremental_Key_Generator @@ -120,9 +116,7 @@ public: PortableServer::ObjectId &original_key); }; -/////////////////////////////////////////////////////////////////////////////// - -TAO_END_VERSIONED_NAMESPACE_DECL +//////////////////////////////////////////////////////////////////////////////// #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index f3eb4894a21..377b34fedd6 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -1,12 +1,10 @@ -#include "tao/PortableServer/LifespanPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "LifespanPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, LifespanPolicy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,4 +62,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index eb0de5aae3c..8d6f3aafc10 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -14,13 +14,13 @@ #define TAO_POA_LIFESPANPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/LifespanPolicyC.h" +#include "LifespanPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -30,8 +30,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -67,8 +65,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl index 6ab38f36c71..428503d0157 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.pidl +++ b/TAO/tao/PortableServer/LifespanPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_LIFESPANPOLICY_IDL_ #define _PORTABLESERVER_LIFESPANPOLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index ee1706bf526..bfee89df475 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -30,14 +30,12 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/LifespanPolicyA.h" +#include "LifespanPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -110,5 +108,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanPolicyA.h b/TAO/tao/PortableServer/LifespanPolicyA.h index 645805dbec9..cd12e1ef5b5 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.h +++ b/TAO/tao/PortableServer/LifespanPolicyA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/LifespanPolicyC.h" +#include "portableserver_export.h" +#include "LifespanPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -67,8 +65,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index 6e819d2f343..832e35bf202 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/LifespanPolicyC.h" +#include "LifespanPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -189,5 +187,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyVa return _tao_success; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h index 30753638f7f..3213dce6668 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.h +++ b/TAO/tao/PortableServer/LifespanPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -230,8 +228,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index aea66e7161c..42bec436226 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -9,14 +9,12 @@ */ //============================================================================= -#include "tao/PortableServer/LifespanStrategy.h" +#include "LifespanStrategy.h" ACE_RCSID (PortableServer, LifespanStrategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -49,4 +47,3 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index 895c20335d8..047427364ca 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -14,17 +14,15 @@ #define TAO_PORTABLESERVER_LIFESPANPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/LifespanPolicyC.h" +#include "LifespanPolicyC.h" #include "tao/Object_KeyC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -83,7 +81,5 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFESPANPOLICY_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h index 085e2c75228..ca53f9f58e0 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactory.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/StrategyFactory.h" -#include "tao/PortableServer/LifespanPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "StrategyFactory.h" +#include "LifespanPolicyC.h" namespace TAO { @@ -47,7 +45,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 07e24aebc59..8f2fe097b6e 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/PortableServer/LifespanStrategyFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategy.h" +#include "LifespanStrategyFactoryImpl.h" +#include "LifespanStrategy.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -82,20 +80,17 @@ namespace TAO } } } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + LifespanStrategyFactoryImpl, + ACE_TEXT ("LifespanStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (LifespanStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - LifespanStrategyFactoryImpl, - ACE_TEXT ("LifespanStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (LifespanStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyFactoryImpl) + } +} -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - LifespanStrategyFactoryImpl, - TAO::Portable_Server::LifespanStrategyFactoryImpl) diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h index e0ece8266bb..273a11a9d0f 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "LifespanStrategyFactory.h" namespace TAO { @@ -42,14 +40,11 @@ namespace TAO LifespanStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl) - - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 6b2e3420c14..5e40ac9785a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -1,21 +1,19 @@ // -*- C++ -*- -#include "tao/PortableServer/LifespanStrategyPersistent.h" +#include "LifespanStrategyPersistent.h" ACE_RCSID (PortableServer, Lifespan_Strategy, "$Id$") -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/POAManager.h" -#include "tao/PortableServer/ImR_Client_Adapter.h" +#include "Root_POA.h" +#include "POAManager.h" +#include "ImR_Client_Adapter.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_sys_time.h" #include "ace/Dynamic_Service.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -155,5 +153,3 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 01634563c72..00ea12a2e5c 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -14,7 +14,7 @@ #define TAO_LIFESPANSTRATEGYPERSISTENT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/LifespanStrategy.h" +#include "LifespanStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -22,8 +22,6 @@ #include "tao/Object_KeyC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class ServerObject_i; namespace TAO @@ -67,7 +65,5 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LIFESPANSTRATEGYPERSISTENT_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index ab24406bf5f..1396342b549 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" +#include "LifespanStrategyPersistentFactoryImpl.h" #include "ace/Dynamic_Service.h" -#include "tao/PortableServer/LifespanStrategyPersistent.h" +#include "LifespanStrategyPersistent.h" ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -47,21 +45,17 @@ namespace TAO delete strategy; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + LifespanStrategyPersistentFactoryImpl, + ACE_TEXT ("LifespanStrategyPersistentFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - LifespanStrategyPersistentFactoryImpl, - ACE_TEXT ("LifespanStrategyPersistentFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - LifespanStrategyPersistentFactoryImpl, - TAO::Portable_Server::LifespanStrategyPersistentFactoryImpl) + ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyPersistentFactoryImpl) + } +} diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h index b32a3c63440..a51984d8a51 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h @@ -14,16 +14,14 @@ #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "LifespanStrategyFactory.h" namespace TAO { @@ -42,14 +40,11 @@ namespace TAO LifespanStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl) - - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index d1859883dac..267707e0f75 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "tao/PortableServer/LifespanStrategyTransient.h" +#include "LifespanStrategyTransient.h" ACE_RCSID (PortableServer, Lifespan_Strategy, @@ -8,12 +8,10 @@ ACE_RCSID (PortableServer, #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_string.h" -#include "tao/PortableServer/POAManager.h" -#include "tao/PortableServer/Root_POA.h" +#include "POAManager.h" +#include "Root_POA.h" #include "tao/ORB_Constants.h" -#include "tao/PortableServer/Creation_Time.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Creation_Time.h" namespace TAO { @@ -115,4 +113,3 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 6638973712f..2b89e8b6c91 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -14,17 +14,15 @@ #define TAO_LIFESPANSTRATEGYTRANSIENT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/LifespanStrategy.h" +#include "LifespanStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Creation_Time.h" +#include "Creation_Time.h" #include "tao/Object_KeyC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,7 +62,5 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LIFESPANSTRATEGYTRANSIENT_H */ diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index 896745f0846..c9a01858ca7 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" +#include "LifespanStrategyTransientFactoryImpl.h" #include "ace/Dynamic_Service.h" -#include "tao/PortableServer/LifespanStrategyTransient.h" +#include "LifespanStrategyTransient.h" ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -47,22 +45,17 @@ namespace TAO delete strategy; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DEFINE ( - LifespanStrategyTransientFactoryImpl, - ACE_TEXT ("LifespanStrategyTransientFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - LifespanStrategyTransientFactoryImpl, - TAO::Portable_Server::LifespanStrategyTransientFactoryImpl) + ACE_STATIC_SVC_DEFINE ( + LifespanStrategyTransientFactoryImpl, + ACE_TEXT ("LifespanStrategyTransientFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyTransientFactoryImpl) + } +} diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h index e3a8c076934..5cd7ad9483b 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h @@ -12,19 +12,16 @@ #ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H - #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/PortableServer/LifespanStrategyFactory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "LifespanStrategyFactory.h" namespace TAO { @@ -43,15 +40,11 @@ namespace TAO LifespanStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl) - - #include /**/ "ace/post.h" - #endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp index 007b1ca5e05..319d5d22acf 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.cpp +++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp @@ -8,11 +8,9 @@ ACE_RCSID (PortableServer, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Local_Servant_Base.inl" +# include "Local_Servant_Base.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void * @@ -20,5 +18,3 @@ TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, { ACE_THROW (CORBA::BAD_OPERATION ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h index dd3d9447932..6c624d77d01 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.h +++ b/TAO/tao/PortableServer/Local_Servant_Base.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -23,8 +23,6 @@ #include "tao/PortableServer/Servant_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Local_ServantBase * @@ -41,7 +39,7 @@ class TAO_PortableServer_Export TAO_Local_ServantBase : public virtual TAO_ServantBase { protected: - /// This is an auxiliary method for _this(). Make sure *not* to + /// This is an auxiliar method for _this(). Make sure *not* to /// register with the default POA. TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); @@ -51,10 +49,8 @@ protected: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Local_Servant_Base.inl" +# include "Local_Servant_Base.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl index f811de25b9f..4a426bdaa07 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.inl +++ b/TAO/tao/PortableServer/Local_Servant_Base.inl @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Stub * TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index 2660f700538..c4ac484a1c5 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/Root_POA.h" +#include "Non_Servant_Upcall.h" +#include "Object_Adapter.h" +#include "Root_POA.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Non_Servant_Upcall.inl" +# include "Non_Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableServer, Non_Servant_Upcall, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -92,4 +90,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index 92b05194d9d..98f3eec8ec3 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declaration class TAO_Root_POA; class TAO_Object_Adapter; @@ -62,16 +58,14 @@ namespace TAO protected: TAO_Object_Adapter &object_adapter_; - TAO_Root_POA &poa_; + ::TAO_Root_POA &poa_; Non_Servant_Upcall *previous_; }; } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Non_Servant_Upcall.inl" +# include "Non_Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl index 0a9b6f2e8de..75e0ae843af 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -16,4 +14,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ORT_Adapter.cpp b/TAO/tao/PortableServer/ORT_Adapter.cpp new file mode 100644 index 00000000000..5c918bb1a4b --- /dev/null +++ b/TAO/tao/PortableServer/ORT_Adapter.cpp @@ -0,0 +1,9 @@ +// $Id$ + +#include "ORT_Adapter.h" +#include "ace/Dynamic_Service.h" + +ACE_RCSID(PortableServer, + ORT_Adapter, + "$Id$") + diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 34d89eb42db..8483a3ee8b3 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -14,18 +14,17 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/SystemException.h" -#include "tao/PI_ForwardC.h" + #include "ace/Service_Object.h" #include "ace/Array_Base.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/PI_ForwardC.h" namespace CORBA { @@ -111,7 +110,5 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ORT_ADAPTER_H */ diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp index 7d4a85297b8..b64dec61851 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "tao/PortableServer/ORT_Adapter_Factory.h" +#include "ORT_Adapter_Factory.h" +#include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, ORT_Adapter_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ORT_Adapter_Factory::~ORT_Adapter_Factory (void) @@ -15,4 +14,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index d5c7570f93f..9295cdbed41 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -16,17 +16,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class ORT_Adapter; @@ -67,8 +64,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ORT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 49c557070c8..6ad3cc7ad62 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -1,22 +1,20 @@ // $Id$ // -- PortableServer Include -- -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Regular_POA.h" -#include "tao/PortableServer/Creation_Time.h" -#include "tao/PortableServer/POA_Guard.h" -#include "tao/PortableServer/Default_Servant_Dispatcher.h" -#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h" -#include "tao/PortableServer/POAManager.h" -#include "tao/PortableServer/Servant_Base.h" +#include "Object_Adapter.h" +#include "Non_Servant_Upcall.h" +#include "Servant_Upcall.h" +#include "Root_POA.h" +#include "Regular_POA.h" +#include "Creation_Time.h" +#include "POA_Guard.h" +#include "Default_Servant_Dispatcher.h" +#include "Collocated_Object_Proxy_Broker.h" +#include "POAManager.h" +#include "Servant_Base.h" // -- ACE Include -- #include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" // -- TAO Include -- #include "tao/PortableInterceptorC.h" @@ -36,16 +34,18 @@ #include "tao/ServerRequestInterceptor_Adapter.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Object_Adapter.i" +# include "Object_Adapter.i" #endif /* __ACE_INLINE__ */ -#include "tao/PortableServer/ThreadPolicy.h" -#include "tao/PortableServer/LifespanPolicy.h" -#include "tao/PortableServer/IdAssignmentPolicy.h" -#include "tao/PortableServer/IdUniquenessPolicy.h" -#include "tao/PortableServer/ImplicitActivationPolicy.h" -#include "tao/PortableServer/RequestProcessingPolicy.h" -#include "tao/PortableServer/ServantRetentionPolicy.h" +#include "ace/OS_NS_string.h" + +#include "ThreadPolicy.h" +#include "LifespanPolicy.h" +#include "IdAssignmentPolicy.h" +#include "IdUniquenessPolicy.h" +#include "ImplicitActivationPolicy.h" +#include "RequestProcessingPolicy.h" +#include "ServantRetentionPolicy.h" ACE_RCSID (PortableServer, Object_Adapter, @@ -99,8 +99,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* static */ CORBA::ULong TAO_Object_Adapter::transient_poa_name_size_ = 0; @@ -166,7 +164,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ new_hint_strategy->object_adapter (this); - persistent_poa_name_map *ppnm = 0; + persistent_poa_name_map *ppnm; switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_) { case TAO_LINEAR: @@ -296,7 +294,7 @@ TAO_Object_Adapter::create_lock (int enable_locking, #if defined (ACE_HAS_THREADS) if (enable_locking) { - ACE_Lock *the_lock = 0; + ACE_Lock *the_lock; ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock), 0); @@ -307,7 +305,7 @@ TAO_Object_Adapter::create_lock (int enable_locking, ACE_UNUSED_ARG (thread_lock); #endif /* ACE_HAS_THREADS */ - ACE_Lock *the_lock = 0; + ACE_Lock *the_lock; ACE_NEW_RETURN (the_lock, ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (), 0); @@ -357,7 +355,9 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key, { ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START); - do_dispatch (req, servant_upcall ACE_ENV_ARG_PARAMETER); + servant_upcall.servant ()->_dispatch (req, + &servant_upcall + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result); } @@ -741,7 +741,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, { #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 CORBA::OctetSeq_var ocs; - sri_adapter->tao_ft_interception_point (request, + sri_adapter.tao_ft_interception_point (request, 0, // args 0, // nargs 0, // servant_upcall @@ -883,8 +883,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub, stub->servant_orb (this->orb_core_.orb ()); // It is ok to create a collocated object even when <sb> is - // zero. This constructor will set the stub collocated indicator and - // the strategized proxy broker if required. + // zero. CORBA::Object_ptr x; ACE_NEW_RETURN (x, CORBA::Object (stub, @@ -892,16 +891,20 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub, sb), CORBA::Object::_nil ()); + // Here we set the strategized Proxy Broker. + x->_proxy_broker (the_tao_collocated_object_proxy_broker ()); + // Success. return x; } CORBA::Long -TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub) +TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub, + CORBA::Object_ptr obj) { - // If we have been forwarded: use the forwarded profiles - const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ()) - : stub->base_profiles (); + // @@ What about forwarding. With this approach we are never + // forwarded when we use collocation! + const TAO_MProfile &mp = stub->base_profiles (); TAO_ServantBase *sb = this->get_collocated_servant (mp); @@ -911,14 +914,13 @@ TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub) // It is ok to set the object as a collocated object even when // <sb> is zero. - stub->collocated_servant (sb); + obj->set_collocated_servant (sb); - // Mark the stub as collocated. This will set the strategized object - // proxy broker if required. - stub->is_collocated (true); + // Here we set the strategized Proxy Broker. + obj->_proxy_broker (the_tao_collocated_object_proxy_broker ()); - // Return 0 (success) iff we found a servant. - return ! sb; + // Success. + return 0; } TAO_ServantBase * @@ -1240,15 +1242,3 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher) this->servant_dispatcher_ = dispatcher; } -void -TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL) -{ - upcall.servant ()->_dispatch(req, - &upcall - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 5ceb0ce6878..a3605dc2f11 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -15,17 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Key_Adapters.h" -#include "tao/PortableServer/poa_macros.h" -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/Default_Policy_Validator.h" -#include "tao/PortableServer/POA_Policy_Set.h" +#include "Key_Adapters.h" +#include "poa_macros.h" +#include "Servant_Location.h" +#include "Default_Policy_Validator.h" +#include "POA_Policy_Set.h" #include "tao/Adapter.h" #include "tao/Adapter_Factory.h" @@ -36,15 +36,13 @@ #include "ace/Condition_Thread_Mutex.h" #include "ace/Map_T.h" -#include "tao/PortableServer/Servant_Location.h" +#include "Servant_Location.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Root_POA; class TAO_POA_Manager; class TAO_TSS_Resources; @@ -172,7 +170,8 @@ public: virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); - virtual CORBA::Long initialize_collocated_object (TAO_Stub *); + virtual CORBA::Long initialize_collocated_object (TAO_Stub *, + CORBA::Object_ptr); protected: @@ -218,10 +217,6 @@ protected: static ACE_Lock *create_lock (int enable_locking, TAO_SYNCH_MUTEX &thread_lock); - virtual void do_dispatch (TAO_ServerRequest& req, - TAO::Portable_Server::Servant_Upcall& upcall - ACE_ENV_ARG_DECL); - public: /** @@ -502,14 +497,12 @@ private: TAO_POA_Policy_Set default_poa_policies_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Object_Adapter.i" +# include "Object_Adapter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index 2fe048e9a5e..ae4008bcc17 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -4,8 +4,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Policy_Validator & TAO_Object_Adapter::validator (void) { @@ -167,4 +165,3 @@ TAO_Object_Adapter::non_servant_upcall_in_progress (void) const return this->non_servant_upcall_in_progress_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp index 0e2859d333c..81bc1d4b47b 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp @@ -1,10 +1,12 @@ // $Id$ -#include "tao/PortableServer/Object_Adapter_Factory.h" -#include "tao/PortableServer/Object_Adapter.h" +#include "Object_Adapter_Factory.h" +#include "Object_Adapter.h" #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void) +{ +} TAO_Adapter* TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) @@ -18,8 +20,6 @@ TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return adapter; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Object_Adapter_Factory, ACE_TEXT ("TAO_Object_Adapter_Factory"), diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h index 77266900e27..460fb242519 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.h +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,20 +24,18 @@ #include "tao/Adapter_Factory.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory { public: + /// Constructor + TAO_Object_Adapter_Factory (void); // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for // details. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory) diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h index 9f88d1f0970..1e60217f11d 100644 --- a/TAO/tao/PortableServer/Object_SArg_Traits.h +++ b/TAO/tao/PortableServer/Object_SArg_Traits.h @@ -26,8 +26,6 @@ #include "tao/Pseudo_VarOut_T.h" #include "tao/Any_Insert_Policy_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; @@ -53,8 +51,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_OBJECT_SARG_TRAITS_H */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp index 598619694c6..2146062474a 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp @@ -9,7 +9,6 @@ #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_ptr, typename S_var, @@ -120,6 +119,4 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_OBJECT_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index fd9a6cae8bc..733beda2955 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -22,8 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // This set of classes is also used by valuetype arguments. If the // specialization is done using S * for the parameter, the semantics // are the same as for interfaces, so there's no need for another @@ -160,8 +158,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index 6fcb78ff824..a202807a59d 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -3,8 +3,6 @@ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S_ptr, typename S_var, typename Insert_Policy> @@ -79,5 +77,3 @@ TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) { return this->x_.out (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index bf8be18d80d..4d8d3308e46 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "tao/PortableServer/Operation_Table.h" +#include "Operation_Table.h" #include "tao/ORB.h" ACE_RCSID(PortableServer, Operation_Table, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // destructor TAO_Operation_Table::~TAO_Operation_Table (void) { @@ -17,9 +15,8 @@ TAO_Operation_Table::~TAO_Operation_Table (void) /**************************************************************/ TAO::Operation_Skeletons::Operation_Skeletons (void) : skel_ptr (0) - , thruPOA_skel_ptr (0) - , direct_skel_ptr (0) + , thruPOA_skel_ptr (0) + , direct_skel_ptr (0) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index d573d2c9f8e..2301d7929f6 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,8 +24,6 @@ #include "tao/Object.h" #include "tao/Collocation_Strategy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ServerRequest; class TAO_Abstract_ServantBase; @@ -71,7 +69,6 @@ struct TAO_operation_db_entry TAO_Collocated_Skeleton direct_skel_ptr; }; -// -------------------------- namespace TAO { @@ -133,7 +130,5 @@ public: virtual ~TAO_Operation_Table (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_OPTABLE_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index 0df9e27630a..12ff4cf608e 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Operation_Table_Binary_Search.h" +#include "Operation_Table_Binary_Search.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" @@ -29,7 +29,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Binary_Search_OpTable::TAO_Binary_Search_OpTable (void) +{ +} TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void) { @@ -54,6 +57,7 @@ TAO_Binary_Search_OpTable::find (const char *opname, return 0; } + int TAO_Binary_Search_OpTable::find (const char *opname, TAO_Collocated_Skeleton &skelfunc, @@ -83,9 +87,8 @@ TAO_Binary_Search_OpTable::find (const char *opname, int TAO_Binary_Search_OpTable::bind (const char *, - const TAO::Operation_Skeletons) + const TAO::Operation_Skeletons ) { return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index 1d8d0a11c02..107be238432 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Operation_Table.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Operation_Table.h" /** * @class TAO_Binary_Search_OpTable @@ -40,6 +38,8 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table { public: + /// Do nothing constructor. + TAO_Binary_Search_OpTable (void); /// Do nothing destrctor. virtual ~TAO_Binary_Search_OpTable (void); @@ -63,7 +63,5 @@ private: virtual const TAO_operation_db_entry* lookup (const char *str) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_BINARY_SEARCH_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 21a206d9fba..feea6d0d7e9 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Operation_Table_Dynamic_Hash.h" +#include "Operation_Table_Dynamic_Hash.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" @@ -29,8 +29,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // constructor TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable ( TAO_operation_db_entry const * db, @@ -130,4 +128,3 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname, return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index 40973757eba..a16c3a3acb3 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,19 +15,17 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Operation_Table.h" +#include "Operation_Table.h" #include "ace/Hash_Map_Manager.h" #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Dynamic_Hash_OpTable * @@ -78,7 +76,5 @@ private: OP_MAP_MANAGER hash_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_DYNAMIC_HASH_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 0ad27a2c2c8..277f0f35269 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Operation_Table_Linear_Search.h" +#include "Operation_Table_Linear_Search.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" @@ -31,7 +31,9 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, /***************************************************************/ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Linear_Search_OpTable::TAO_Linear_Search_OpTable (void) +{ +} TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void) { @@ -90,4 +92,4 @@ TAO_Linear_Search_OpTable::find (const char *opname, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index 1f26bc71a2f..f2055d753d3 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Operation_Table.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Operation_Table.h" /** * @class TAO_Linear_Search_OpTable @@ -36,6 +34,8 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable { public: // = Initialization and termination methods. + /// Default constructor. + TAO_Linear_Search_OpTable (void); /// Destructor. ~TAO_Linear_Search_OpTable (void); @@ -59,7 +59,5 @@ private: virtual const TAO_operation_db_entry* lookup (const char *str) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_LINEAR_SEARCH_H */ diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index c0b75b8b6fe..5a6b950399f 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Operation_Table_Perfect_Hash.h" +#include "Operation_Table_Perfect_Hash.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" @@ -29,7 +29,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// Do nothing constructor. +TAO_Perfect_Hash_OpTable::TAO_Perfect_Hash_OpTable (void) +{ +} // Do nothing destrctor. TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void) @@ -51,7 +54,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%s' (length=%d) failed\n"), - ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length), + ACE_TEXT_TO_TCHAR_IN (opname ? opname : "<null string>"), length), -1); } @@ -77,7 +80,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%s' (length=%d) failed\n"), - ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length), + ACE_TEXT_TO_TCHAR_IN (opname ? opname : "<null string>"), length), -1); } @@ -100,4 +103,3 @@ TAO_Perfect_Hash_OpTable::bind (const char *, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 00338dcc2c7..5c60c7ad69f 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Operation_Table.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Operation_Table.h" /** * @class TAO_Perfect_Hash_OpTable @@ -41,6 +39,8 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table { public: + /// Do nothing constructor. + TAO_Perfect_Hash_OpTable (void); /// Do nothing destrctor. virtual ~TAO_Perfect_Hash_OpTable (void); @@ -68,7 +68,6 @@ private: unsigned int len) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_OPERATION_TABLE_PERFECT_HASH_H */ diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index a4c999bbd1a..539f5d0cd9d 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "tao/PortableServer/POAManager.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/poa_macros.h" +#include "POAManager.h" +#include "Root_POA.h" +#include "poa_macros.h" #include "tao/Server_Strategy_Factory.h" #include "tao/ORB_Core.h" #include "tao/IORInterceptor_Adapter.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/POAManager.i" +# include "POAManager.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, POAManager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter) : state_ (PortableServer::POAManager::HOLDING), lock_ (object_adapter.lock ()), @@ -53,15 +51,6 @@ TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL) else { this->state_ = PortableServer::POAManager::ACTIVE; - // Find the poas that applied the custom servant dispatching - // strategy to launch the dispatching threads. - - for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin (); - iterator != this->poa_collection_.end (); - ++iterator) - { - (*iterator)->poa_activated_hook (); - } } this->adapter_manager_state_changed (this->state_ @@ -128,10 +117,6 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, ++iterator) { TAO_Root_POA *poa = *iterator; - // Notify the poas that applied the custom servant dispatching - // strategy to stop the dispatching threads. - poa->poa_deactivated_hook (); - poa->deactivate_all_objects_i (etherealize_objects, wait_for_completion ACE_ENV_ARG_PARAMETER); @@ -154,8 +139,7 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableInterceptor::AdapterState adapter_state = - static_cast<PortableInterceptor::AdapterState> (state); + PortableInterceptor::AdapterState adapter_state = state; TAO_IORInterceptor_Adapter *ior_adapter = this->object_adapter_.orb_core ().ior_interceptor_adapter (); @@ -392,4 +376,3 @@ TAO_POA_Manager::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ()); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 056efb7578c..59dd117fcdf 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -16,20 +16,24 @@ #define TAO_POAMANAGER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/poa_macros.h" -#include "tao/PortableServer/POAManagerC.h" +#include "poa_macros.h" +#include "POAManagerC.h" // Local Object #include "tao/LocalObject.h" #include "tao/PI_ForwardC.h" #include "ace/Unbounded_Set.h" +// Forward decl. +class TAO_Root_POA; +class TAO_Object_Adapter; + // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) @@ -37,13 +41,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Forward decl. -class TAO_Root_POA; -class TAO_Object_Adapter; - - class TAO_PortableServer_Export TAO_POA_Manager : public PortableServer::POAManager, public TAO_Local_RefCounted_Object @@ -157,14 +154,12 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "tao/PortableServer/POAManager.i" +# include "POAManager.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index 19adb23dd8f..c38b1bd02ef 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -5,7 +5,6 @@ #include "tao/Environment.h" #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Lock & TAO_POA_Manager::lock (void) @@ -128,5 +127,3 @@ TAO_POA_Manager::generate_manager_id (void) const return id; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index 3c397bb99a2..b29a3593b40 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -40,15 +40,13 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -#include "tao/PortableServer/POAManagerC.h" +#include "POAManagerC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -330,4 +328,3 @@ namespace PortableServer } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h index 9d767071182..83cbbebcc56 100644 --- a/TAO/tao/PortableServer/POAManagerC.h +++ b/TAO/tao/PortableServer/POAManagerC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -316,8 +314,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 76afbefadbc..0cb18e988c3 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -1,25 +1,23 @@ -// $Id$ - -#include "tao/PortableServer/POA_Cached_Policies.h" -#include "tao/PortableServer/POA_Policy_Set.h" -#include "tao/PortableServer/IdAssignmentPolicyC.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" -#include "tao/PortableServer/LifespanPolicyC.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" -#include "tao/PortableServer/ThreadPolicyC.h" +// @(#) $Id$ + +#include "POA_Cached_Policies.h" +#include "POA_Policy_Set.h" +#include "IdAssignmentPolicyC.h" +#include "IdUniquenessPolicyC.h" +#include "ImplicitActivationPolicyC.h" +#include "LifespanPolicyC.h" +#include "RequestProcessingPolicyC.h" +#include "ServantRetentionPolicyC.h" +#include "ThreadPolicyC.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/POA_Cached_Policies.i" +# include "POA_Cached_Policies.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(PortableServer, POA_Cached_Policies, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -58,7 +56,7 @@ namespace TAO void Cached_Policies::update_policy (const CORBA::Policy_ptr policy - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if (TAO_HAS_MINIMUM_POA == 0) @@ -162,5 +160,3 @@ namespace TAO } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index a756f101782..1c5efabd5d8 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -16,21 +16,19 @@ #define TAO_POA_CACHED_POLICIES_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadPolicyC.h" -#include "tao/PortableServer/LifespanPolicyC.h" -#include "tao/PortableServer/IdUniquenessPolicyC.h" -#include "tao/PortableServer/IdAssignmentPolicyC.h" -#include "tao/PortableServer/ImplicitActivationPolicyC.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ThreadPolicyC.h" +#include "LifespanPolicyC.h" +#include "IdUniquenessPolicyC.h" +#include "IdAssignmentPolicyC.h" +#include "ImplicitActivationPolicyC.h" +#include "ServantRetentionPolicyC.h" +#include "RequestProcessingPolicyC.h" // Forward references. class TAO_POA_Policy_Set; @@ -104,10 +102,8 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/POA_Cached_Policies.i" +# include "POA_Cached_Policies.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.i b/TAO/tao/PortableServer/POA_Cached_Policies.i index b3699fe3e7d..ab12991fe6e 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.i +++ b/TAO/tao/PortableServer/POA_Cached_Policies.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -81,5 +77,3 @@ namespace TAO } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index a1e30c3faed..09a8f02134c 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -1,18 +1,20 @@ // $Id$ // -- PortableServer Include -- -#include "tao/PortableServer/POA_Current.h" -#include "tao/PortableServer/POA_Current_Impl.h" +#include "POA_Current.h" +#include "POA_Current_Impl.h" // -- TAO Include -- #include "tao/TSS_Resources.h" +#if !defined (__ACE_INLINE__) +# include "POA_Current.inl" +#endif /* __ACE_INLINE__ */ + ACE_RCSID (PortableServer, POA_Current, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -56,18 +58,6 @@ namespace TAO return impl->get_servant (); } - CORBA::Object_ptr - POA_Current::get_reference (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)) - { - POA_Current_Impl *impl = this->implementation (); - - if (impl == 0) - ACE_THROW_RETURN (PortableServer::Current::NoContext (), - 0); - return impl->get_reference (); - } POA_Current_Impl * POA_Current::implementation (void) @@ -91,4 +81,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 4af15a2b241..a8e5583a101 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -15,22 +15,20 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PS_CurrentC.h" #include "tao/LocalObject.h" +#include "tao/PortableServer/PS_CurrentC.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -38,10 +36,12 @@ namespace TAO class POA_Current_Impl; class TAO_PortableServer_Export POA_Current - : public PortableServer::Current - , public TAO_Local_RefCounted_Object + : public PortableServer::Current, + public TAO_Local_RefCounted_Object { public: + /// Constructor + POA_Current (void); /** * Returns the POA on which the current request is being invoked. @@ -62,19 +62,6 @@ namespace TAO PortableServer::Current::NoContext)); /** - * This operation returns a locally manufactured reference to the object - * in the context of which it is called. If called outside the context - * of a POA dispatched operation, a NoContext exception is raised. - * @note This reference is not guaranteed to be identical to the original - * reference the client used to make the invocation, and calling the - * Object::is_equivalent operation to compare the two references may not - * necessarily return true. - */ - CORBA::Object_ptr get_reference (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::Current::NoContext)); - - /** * Returns a reference to the servant that hosts the object in whose * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised @@ -93,12 +80,14 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ +#if defined (__ACE_INLINE__) +# include "POA_Current.inl" +#endif /* __ACE_INLINE__ */ + #include /**/ "ace/post.h" #endif /* TAO_POA_CURRENT_H */ diff --git a/TAO/tao/PortableServer/POA_Current.inl b/TAO/tao/PortableServer/POA_Current.inl new file mode 100644 index 00000000000..4b713846977 --- /dev/null +++ b/TAO/tao/PortableServer/POA_Current.inl @@ -0,0 +1,14 @@ +// -*- C++ -*- +// +// $Id$ + +namespace TAO +{ + namespace Portable_Server + { + ACE_INLINE + POA_Current::POA_Current (void) + { + } + } +} diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index 081147aad3c..b32ba5f91b0 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -1,10 +1,12 @@ // $Id$ -#include "tao/PortableServer/POA_Current_Factory.h" -#include "tao/PortableServer/POA_Current.h" +#include "POA_Current_Factory.h" +#include "POA_Current.h" #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_POA_Current_Factory::TAO_POA_Current_Factory (void) +{ +} CORBA::Object_ptr TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, @@ -20,8 +22,6 @@ TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, return adapter; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_POA_Current_Factory) ACE_STATIC_SVC_DEFINE (TAO_POA_Current_Factory, ACE_TEXT ("TAO_POA_Current_Factory"), diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index 6ef224d32fd..c7cbb6d2e2a 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,12 +24,12 @@ #include "tao/Object_Loader.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PortableServer_Export TAO_POA_Current_Factory : public TAO_Object_Loader { public: + /// Constructor + TAO_POA_Current_Factory (void); /// Creates a PICurrent and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, @@ -39,8 +39,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_POA_Current_Factory) ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_POA_Current_Factory) diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp index 1c1e81b55c2..3d51448e37f 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.cpp +++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp @@ -1,22 +1,20 @@ // $Id$ // -- PortableServer Include -- -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PortableServer/Root_POA.h" +#include "Object_Adapter.h" +#include "POA_Current_Impl.h" +#include "Root_POA.h" #include "tao/TSS_Resources.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/POA_Current_Impl.inl" +# include "POA_Current_Impl.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableServer, POA_Current_IMpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -86,12 +84,6 @@ namespace TAO return objid; } - CORBA::Object_ptr - POA_Current_Impl::get_reference (void) - { - return this->poa_->id_to_reference (this->object_id_); - } - PortableServer::Servant POA_Current_Impl::get_servant (void) { @@ -107,4 +99,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index 47f2a03994c..15bf03cb843 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.h +++ b/TAO/tao/PortableServer/POA_Current_Impl.h @@ -15,15 +15,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PS_ForwardC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PS_ForwardC.h" namespace TAO { @@ -71,22 +69,18 @@ namespace TAO /** * Return pointer to the object id through which this was invoked. * This may be necessary in cases where a <Servant> is serving under - * the guise of multiple object ids. + * the guise of multiple object ids. This has _out semantics Raises + * the <CORBA::NoContext> exception. */ PortableServer::ObjectId *get_object_id (void); /** * Returns a reference to the servant that hosts the object in whose - * context it is called. + * context it is called. If called outside the context of the POA + * dispatched operation, a NoContext exception is raised */ PortableServer::Servant get_servant (void); - /** - * This operation returns a locally manufactured reference to the object - * in the context of which it is called. - */ - CORBA::Object_ptr get_reference (void); - /// Set the POA implementation. void poa (::TAO_Root_POA *); @@ -136,12 +130,6 @@ namespace TAO void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key); - private: - - // = Hidden because we don't allow these - POA_Current_Impl (const POA_Current_Impl &); - void operator= (const POA_Current_Impl &); - protected: /// The POA implementation invoking an upcall ::TAO_Root_POA *poa_; @@ -171,14 +159,15 @@ namespace TAO /// Pointer to tss resources. TAO_TSS_Resources *tss_resources_; + // = Hidden because we don't allow these + POA_Current_Impl (const POA_Current_Impl &); + void operator= (const POA_Current_Impl &); }; } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/POA_Current_Impl.inl" +# include "POA_Current_Impl.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl index db220558ae6..350d1cf820b 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.inl +++ b/TAO/tao/PortableServer/POA_Current_Impl.inl @@ -4,8 +4,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -83,4 +81,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp index a2943714015..cbf2eb0bba7 100644 --- a/TAO/tao/PortableServer/POA_Guard.cpp +++ b/TAO/tao/PortableServer/POA_Guard.cpp @@ -1,16 +1,13 @@ // $Id$ -#include "tao/PortableServer/POA_Guard.h" -#include "tao/PortableServer/Root_POA.h" +#include "POA_Guard.h" +#include "Root_POA.h" #include "tao/ORB_Constants.h" ACE_RCSID(PortableServer, POA_Guard, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -46,4 +43,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h index da0f74dedae..a7347130783 100644 --- a/TAO/tao/PortableServer/POA_Guard.h +++ b/TAO/tao/PortableServer/POA_Guard.h @@ -1,29 +1,27 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** * @file POA_Guard.h * * $Id$ + * */ //============================================================================= #ifndef TAO_POA_GUARD_H #define TAO_POA_GUARD_H - #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Environment.h" #include "ace/Guard_T.h" #include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Environment.h" class TAO_Root_POA; @@ -51,8 +49,5 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_POA_GUARD_H */ diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 043020de869..e0ee81f34e2 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -1,24 +1,23 @@ // @(#) $Id$ -#include "tao/PortableServer/POA_Policy_Set.h" -#include "tao/PortableServer/POA_Cached_Policies.h" -#include "tao/PortableServer/PortableServer.h" +#include "POA_Policy_Set.h" +#include "POA_Cached_Policies.h" +#include "PortableServer.h" #include "tao/Policy_Validator.h" #include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/POA_Policy_Set.i" +# include "POA_Policy_Set.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, POA_Policy_Set, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_POA_Policy_Set::TAO_POA_Policy_Set (void) - : impl_ (TAO_POLICY_POA_SCOPE) +TAO_POA_Policy_Set::TAO_POA_Policy_Set () + : + impl_ (TAO_POLICY_POA_SCOPE) { } @@ -90,5 +89,3 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator, } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 182ad836a8f..46fc0f4b5b7 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -6,7 +6,8 @@ * * $Id$ * - * POA + * POA + * * * @author Irfan Pyarali */ @@ -16,7 +17,7 @@ #define TAO_POA_POLICY_SET_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,15 +25,13 @@ #include "tao/Policy_Set.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Policy_Validator; class TAO_PortableServer_Export TAO_POA_Policy_Set { public: - TAO_POA_Policy_Set (void); + TAO_POA_Policy_Set (); TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs); @@ -73,10 +72,8 @@ protected: TAO_Policy_Set impl_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/POA_Policy_Set.i" +# include "POA_Policy_Set.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i index 4181baecf48..fee42969600 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.i +++ b/TAO/tao/PortableServer/POA_Policy_Set.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_POA_Policy_Set::num_policies (void) const { @@ -55,5 +51,3 @@ TAO_POA_Policy_Set::policies (void) { return this->impl_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl index 91bd07204c6..a1b7ab68b61 100644 --- a/TAO/tao/PortableServer/PS_Current.pidl +++ b/TAO/tao/PortableServer/PS_Current.pidl @@ -9,7 +9,7 @@ * PS_CurrentC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -Sci -Sc -SS -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ @@ -21,8 +21,8 @@ #define _PORTABLESERVER_CURRENT_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/PortableServer/PS_Forward.pidl" -#include "tao/Current.pidl" +#include <tao/PortableServer/PS_Forward.pidl> +#include <Current.pidl> #pragma prefix "omg.org" @@ -43,9 +43,6 @@ module PortableServer ObjectId get_object_id () raises (NoContext); - Object get_reference () - raises (NoContext); - Servant get_servant () raises (NoContext); }; diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp new file mode 100644 index 00000000000..7142aaed13a --- /dev/null +++ b/TAO/tao/PortableServer/PS_CurrentA.cpp @@ -0,0 +1,224 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" +#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "PS_CurrentC.h" +#include "tao/CDR.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Impl_T.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" + +// TAO_IDL - Generated from +// be\be_visitor_typecode/struct_typecode.cpp:87 + +static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_Current_NoContext = 0; +static TAO::TypeCode::Struct<char const *, + CORBA::TypeCode_ptr const *, + TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableServer_Current_NoContext ( + CORBA::tk_except, + "IDL:omg.org/PortableServer/Current/NoContext:2.3", + "NoContext", + _tao_fields_PortableServer_Current_NoContext, + 0); + +::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext = + &_tao_tc_PortableServer_Current_NoContext; + +// TAO_IDL - Generated from +// be\be_visitor_typecode/objref_typecode.cpp:76 + +static TAO::TypeCode::Objref<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableServer_Current ( + CORBA::tk_local_interface, + "IDL:omg.org/PortableServer/Current:2.3", + "Current"); + +namespace PortableServer +{ + ::CORBA::TypeCode_ptr const _tc_Current = + &_tao_tc_PortableServer_Current; +} + + + +// TAO_IDL - Generated from +// be\be_visitor_interface/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableServer::Current>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const + { + _tao_elem = CORBA::Object::_duplicate (this->value_); + return true; + } +} + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableServer::Current_ptr _tao_elem + ) +{ + PortableServer::Current_ptr _tao_objptr = + PortableServer::Current::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + PortableServer::Current_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T<PortableServer::Current>::insert ( + _tao_any, + PortableServer::Current::_tao_any_destructor, + PortableServer::_tc_Current, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + PortableServer::Current_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T<PortableServer::Current>::extract ( + _tao_any, + PortableServer::Current::_tao_any_destructor, + PortableServer::_tc_Current, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +namespace TAO +{ + template<> + CORBA::Boolean + Any_Dual_Impl_T<PortableServer::Current::NoContext>::marshal_value (TAO_OutputCDR &) + { + return false; + } + + template<> + CORBA::Boolean + Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &) + { + return false; + } +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const PortableServer::Current::NoContext &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert_copy ( + _tao_any, + PortableServer::Current::NoContext::_tao_any_destructor, + PortableServer::Current::_tc_NoContext, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + PortableServer::Current::NoContext *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert ( + _tao_any, + PortableServer::Current::NoContext::_tao_any_destructor, + PortableServer::Current::_tc_NoContext, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + PortableServer::Current::NoContext *&_tao_elem + ) +{ + return _tao_any >>= const_cast< + const PortableServer::Current::NoContext *&> ( + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const PortableServer::Current::NoContext *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::extract ( + _tao_any, + PortableServer::Current::NoContext::_tao_any_destructor, + PortableServer::Current::_tc_NoContext, + _tao_elem + ); +} diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 1f0d5f29e69..92de45c9df6 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -26,27 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:277 +// be\be_codegen.cpp:291 -#include "tao/PortableServer/PS_CurrentC.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "PS_CurrentC.h" #include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "ace/OS_NS_string.h" +#if defined (__BORLANDC__) +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig +#endif /* __BORLANDC__ */ + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -80,20 +73,20 @@ TAO::Objref_Traits<PortableServer::Current>::nil (void) return PortableServer::Current::_nil (); } -::CORBA::Boolean +CORBA::Boolean TAO::Objref_Traits<PortableServer::Current>::marshal ( PortableServer::Current_ptr p, TAO_OutputCDR & cdr ) { - return ::CORBA::Object::marshal (p, cdr); + return CORBA::Object::marshal (p, cdr); } // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 PortableServer::Current::NoContext::NoContext (void) - : ::CORBA::UserException ( + : CORBA::UserException ( "IDL:omg.org/PortableServer/Current/NoContext:2.3", "NoContext" ) @@ -105,7 +98,7 @@ PortableServer::Current::NoContext::~NoContext (void) } PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp) - : ::CORBA::UserException ( + : CORBA::UserException ( _tao_excp._rep_id (), _tao_excp._name () ) @@ -115,7 +108,7 @@ PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current:: PortableServer::Current::NoContext& PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -127,28 +120,28 @@ void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_po } PortableServer::Current::NoContext * -PortableServer::Current::NoContext::_downcast ( ::CORBA::Exception *_tao_excp) +PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp) { return dynamic_cast<NoContext *> (_tao_excp); } const PortableServer::Current::NoContext * -PortableServer::Current::NoContext::_downcast ( ::CORBA::Exception const *_tao_excp) +PortableServer::Current::NoContext::_downcast (CORBA::Exception const *_tao_excp) { return dynamic_cast<const NoContext *> (_tao_excp); } -::CORBA::Exception *PortableServer::Current::NoContext::_alloc (void) +CORBA::Exception *PortableServer::Current::NoContext::_alloc (void) { - ::CORBA::Exception *retval = 0; + CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0); return retval; } -::CORBA::Exception * +CORBA::Exception * PortableServer::Current::NoContext::_tao_duplicate (void) const { - ::CORBA::Exception *result = 0; + CORBA::Exception *result = 0; ACE_NEW_RETURN ( result, ::PortableServer::Current::NoContext (*this), @@ -167,7 +160,7 @@ void PortableServer::Current::NoContext::_tao_encode ( ACE_ENV_ARG_DECL ) const { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } void PortableServer::Current::NoContext::_tao_decode ( @@ -175,42 +168,32 @@ void PortableServer::Current::NoContext::_tao_decode ( ACE_ENV_ARG_DECL ) { - ACE_THROW ( ::CORBA::MARSHAL ()); + ACE_THROW (CORBA::MARSHAL ()); } // TAO extension - the virtual _type method. -::CORBA::TypeCode_ptr PortableServer::Current::NoContext::_tao_type (void) const +CORBA::TypeCode_ptr PortableServer::Current::NoContext::_tao_type (void) const { return ::PortableServer::Current::_tc_NoContext; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/struct_typecode.cpp:89 - -static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_Current_NoContext = 0; -static TAO::TypeCode::Struct<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableServer_Current_NoContext ( - ::CORBA::tk_except, - "IDL:omg.org/PortableServer/Current/NoContext:2.3", - "NoContext", - _tao_fields_PortableServer_Current_NoContext, - 0); - -::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext = - &_tao_tc_PortableServer_Current_NoContext; - PortableServer::Current::Current (void) {} PortableServer::Current::~Current (void) {} +void +PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer) +{ + Current *_tao_tmp_pointer = + static_cast<Current *> (_tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + PortableServer::Current_ptr PortableServer::Current::_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -221,7 +204,7 @@ PortableServer::Current::_narrow ( PortableServer::Current_ptr PortableServer::Current::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { @@ -247,7 +230,7 @@ PortableServer::Current::_tao_release (Current_ptr obj) CORBA::release (obj); } -::CORBA::Boolean +CORBA::Boolean PortableServer::Current::_is_a ( const char *value ACE_ENV_ARG_DECL_NOT_USED @@ -285,27 +268,8 @@ const char* PortableServer::Current::_interface_repository_id (void) const return "IDL:omg.org/PortableServer/Current:2.3"; } -::CORBA::Boolean +CORBA::Boolean PortableServer::Current::marshal (TAO_OutputCDR &) { return false; } - -// TAO_IDL - Generated from -// be\be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy> - _tao_tc_PortableServer_Current ( - ::CORBA::tk_local_interface, - "IDL:omg.org/PortableServer/Current:2.3", - "Current"); - -namespace PortableServer -{ - ::CORBA::TypeCode_ptr const _tc_Current = - &_tao_tc_PortableServer_Current; -} - - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h index f897b62f9ce..69ac3faaf4d 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.h +++ b/TAO/tao/PortableServer/PS_CurrentC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:154 +// be\be_codegen.cpp:153 -#ifndef _TAO_IDL_PS_CURRENTC_H_ -#define _TAO_IDL_PS_CURRENTC_H_ +#ifndef _TAO_IDL_ORIG_PS_CURRENTC_H_ +#define _TAO_IDL_ORIG_PS_CURRENTC_H_ #include /**/ "ace/pre.h" @@ -41,13 +41,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/portableserver_export.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/PortableServer/PS_ForwardA.h" -#include "tao/AnyTypeCode/CurrentA.h" #include "tao/Objref_VarOut_T.h" #include "tao/PortableServer/PS_ForwardC.h" @@ -58,16 +55,23 @@ #endif #define TAO_EXPORT_MACRO TAO_PortableServer_Export -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +#if defined (__BORLANDC__) +#pragma option push -w-rvl -w-rch -w-ccc -w-inl +#endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// TAO_IDL - Generated from +// be\be_visitor_module/module_ch.cpp:48 namespace PortableServer { // TAO_IDL - Generated from - // be\be_interface.cpp:646 + // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_CURRENT__VAR_OUT_CH_) #define _PORTABLESERVER_CURRENT__VAR_OUT_CH_ @@ -108,12 +112,12 @@ namespace PortableServer static void _tao_release (Current_ptr obj); static Current_ptr _narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static Current_ptr _unchecked_narrow ( - ::CORBA::Object_ptr obj + CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -122,7 +126,7 @@ namespace PortableServer return static_cast<Current_ptr> (0); } - + static void _tao_any_destructor (void *); // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 @@ -130,7 +134,7 @@ namespace PortableServer #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_) #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_ - class TAO_PortableServer_Export NoContext : public ::CORBA::UserException + class TAO_PortableServer_Export NoContext : public CORBA::UserException { public: @@ -142,12 +146,12 @@ namespace PortableServer static void _tao_any_destructor (void *); - static NoContext *_downcast ( ::CORBA::Exception *); - static const NoContext *_downcast ( ::CORBA::Exception const *); + static NoContext *_downcast (CORBA::Exception *); + static const NoContext *_downcast (CORBA::Exception const *); - static ::CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (void); - virtual ::CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -161,11 +165,14 @@ namespace PortableServer ACE_ENV_ARG_DECL ); - virtual ::CORBA::TypeCode_ptr _tao_type (void) const; + // TAO_IDL - Generated from + // be\be_visitor_exception/exception_ch.cpp:129 + + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 + // be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr const _tc_NoContext; @@ -178,7 +185,7 @@ namespace PortableServer ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableServer::Current::NoContext )) = 0; @@ -189,18 +196,7 @@ namespace PortableServer ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, - ::PortableServer::Current::NoContext - )) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Object_ptr get_reference ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableServer::Current::NoContext )) = 0; @@ -211,20 +207,20 @@ namespace PortableServer ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( - ::CORBA::SystemException, + CORBA::SystemException, ::PortableServer::Current::NoContext )) = 0; // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - virtual ::CORBA::Boolean _is_a ( + 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); + virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. @@ -242,12 +238,12 @@ namespace PortableServer #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 + // be\be_visitor_typecode/typecode_decl.cpp:44 extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 +// be\be_visitor_module/module_ch.cpp:66 } // module PortableServer @@ -258,8 +254,8 @@ namespace PortableServer namespace TAO { -#if !defined (_PORTABLESERVER_CURRENT__TRAITS_) -#define _PORTABLESERVER_CURRENT__TRAITS_ +#if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_) +#define _PORTABLESERVER_CURRENT__TRAITS_CH_ template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current> @@ -271,7 +267,7 @@ namespace TAO ::PortableServer::Current_ptr ); static ::PortableServer::Current_ptr nil (void); - static ::CORBA::Boolean marshal ( + static CORBA::Boolean marshal ( ::PortableServer::Current_ptr p, TAO_OutputCDR & cdr ); @@ -281,9 +277,30 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:1040 +// be\be_visitor_interface/any_op_ch.cpp:52 + +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &); + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_ch.cpp:52 + +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&); + +// TAO_IDL - Generated from +// be\be_codegen.cpp:955 + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if defined (__BORLANDC__) +#pragma option pop +#endif /* __BORLANDC__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl index f475927eab9..86f8af6f927 100644 --- a/TAO/tao/PortableServer/PS_Forward.pidl +++ b/TAO/tao/PortableServer/PS_Forward.pidl @@ -24,7 +24,7 @@ #ifndef _PORTABLESERVER_PS_FORWARD_IDL_ #define _PORTABLESERVER_PS_FORWARD_IDL_ -#include "tao/OctetSeq.pidl" +#include <OctetSeq.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index efaca76332e..777efdd75a0 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -28,12 +28,10 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/PortableServer/PS_ForwardA.h" +#include "PS_ForwardA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -53,4 +51,3 @@ namespace PortableServer } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h index 047e66c649b..7818c218778 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.h +++ b/TAO/tao/PortableServer/PS_ForwardA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/PS_ForwardC.h" +#include "portableserver_export.h" +#include "PS_ForwardC.h" #include "tao/AnyTypeCode/OctetSeqA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -56,8 +54,6 @@ namespace PortableServer } // module PortableServer -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index d23e1ebf431..c39046225ac 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -29,18 +29,15 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/PS_ForwardC.h" +#include "PS_ForwardC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index e05abec2d4c..24cb55a00f1 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Objref_VarOut_T.h" @@ -52,8 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_PortableServer_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ServantBase; class TAO_ServantBase_var; class TAO_Local_ServantBase; @@ -119,8 +117,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index ef2bd9c048b..02b37e7afe3 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -35,7 +35,7 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/PortableServer/PolicyS.h" +#include "PolicyS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -1084,5 +1082,3 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL) #endif /* ifndef */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 91d1c44b232..8a337b60d65 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -55,7 +55,7 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -65,8 +65,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_CORBA { @@ -308,9 +306,7 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:995 -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "tao/PortableServer/PolicyS_T.h" +#include "PolicyS_T.h" #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index dfe7cbabbdd..a53bc9459b6 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ #define _TAO_IDL_ORIG_POLICYS_T_CPP_ -#include "tao/PortableServer/PolicyS_T.h" +#include "PolicyS_T.h" #if !defined (__ACE_INLINE__) -#include "tao/PortableServer/PolicyS_T.inl" +#include "PolicyS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index f4ef428808e..2e8d80a5198 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -39,8 +39,6 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 @@ -131,14 +129,12 @@ namespace POA_CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:1096 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/PortableServer/PolicyS_T.inl" +#include "PolicyS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/PortableServer/PolicyS_T.cpp" +#include "PolicyS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl index 4bccdaee36d..42c4ad90eac 100644 --- a/TAO/tao/PortableServer/PolicyS_T.inl +++ b/TAO/tao/PortableServer/PolicyS_T.inl @@ -26,8 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/tie_si.cpp:96 @@ -169,4 +167,3 @@ void POA_CORBA::Policy_tie<T>::destroy ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index d0854a95849..9498924469a 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -14,16 +14,14 @@ #define TAO_POLICY_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Environment.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Object.h" #include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Environment.h" class TAO_Root_POA; @@ -44,7 +42,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_POLICY_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index 67d92f9fdbb..2517081b640 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -1,166 +1,163 @@ // $Id$ -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/Object_Adapter_Factory.h" -#include "tao/PortableServer/POA_Current_Factory.h" +#include "PortableServer.h" +#include "Object_Adapter.h" +#include "Object_Adapter_Factory.h" +#include "POA_Current_Factory.h" -#include "tao/PortableServer/ThreadStrategyFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategyFactoryImpl.h" -#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h" -#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h" -#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h" +#include "ThreadStrategyFactoryImpl.h" +#include "LifespanStrategyFactoryImpl.h" +#include "IdAssignmentStrategyFactoryImpl.h" +#include "IdUniquenessStrategyFactoryImpl.h" +#include "ImplicitActivationStrategyFactoryImpl.h" +#include "RequestProcessingStrategyFactoryImpl.h" +#include "ServantRetentionStrategyFactoryImpl.h" -#include "tao/PortableServer/ThreadStrategyORBControl.h" -#include "tao/PortableServer/ThreadStrategySingle.h" -#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" +#include "ThreadStrategyORBControl.h" +#include "ThreadStrategySingle.h" +#include "ThreadStrategySingleFactoryImpl.h" -#include "tao/PortableServer/IdAssignmentStrategySystem.h" -#include "tao/PortableServer/IdAssignmentStrategyUser.h" +#include "IdAssignmentStrategySystem.h" +#include "IdAssignmentStrategyUser.h" -#include "tao/PortableServer/IdUniquenessStrategyMultiple.h" -#include "tao/PortableServer/IdUniquenessStrategyUnique.h" +#include "IdUniquenessStrategyMultiple.h" +#include "IdUniquenessStrategyUnique.h" -#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" -#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" +#include "ImplicitActivationStrategyExplicit.h" +#include "ImplicitActivationStrategyImplicit.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" +#include "RequestProcessingStrategyAOMOnly.h" +#include "RequestProcessingStrategyDefaultServant.h" +#include "RequestProcessingStrategyServantManager.h" -#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h" +#include "ServantRetentionStrategyNonRetainFactoryImpl.h" +#include "ServantRetentionStrategyRetainFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" +#include "RequestProcessingStrategyDefaultServantFI.h" +#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h" +#include "RequestProcessingStrategyServantActivatorFI.h" +#include "RequestProcessingStrategyServantLocatorFI.h" -#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h" +#include "IdUniquenessStrategyUniqueFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" -#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" +#include "LifespanStrategyPersistentFactoryImpl.h" +#include "LifespanStrategyTransientFactoryImpl.h" ACE_RCSID (PortableServer, PortableServer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_POA_Initializer::init (void) { ACE_Service_Config::process_directive ( - ace_svc_desc_IdAssignmentStrategySystem + TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategySystem ); ACE_Service_Config::process_directive ( - ace_svc_desc_IdAssignmentStrategyUser + TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyUser ); ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyMultiple + TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyMultiple ); ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyUnique + TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUnique ); ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl + TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_ImplicitActivationStrategyExplicit + TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyExplicit ); ACE_Service_Config::process_directive ( - ace_svc_desc_ImplicitActivationStrategyImplicit + TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyImplicit ); // Strategy factories ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_ThreadStrategyFactoryImpl ); #if (TAO_HAS_MINIMUM_POA == 0) ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategySingleFactoryImpl + TAO::Portable_Server::ace_svc_desc_ThreadStrategySingleFactoryImpl ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_LifespanStrategyFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyPersistentFactoryImpl + TAO::Portable_Server::ace_svc_desc_LifespanStrategyPersistentFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_LifespanStrategyTransientFactoryImpl + TAO::Portable_Server::ace_svc_desc_LifespanStrategyTransientFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_IdAssignmentStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_IdUniquenessStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_ImplicitActivationStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl + TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl ); #if (TAO_HAS_MINIMUM_POA == 0) ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl + TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl + TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl + TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyFactoryImpl + TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyFactoryImpl ); ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl + TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl ); #if (TAO_HAS_MINIMUM_POA == 0) ACE_Service_Config::process_directive ( - ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl + TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ // Strategy implementations ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategyORBControl + TAO::Portable_Server::ace_svc_desc_ThreadStrategyORBControl ); #if (TAO_HAS_MINIMUM_POA == 0) ACE_Service_Config::process_directive ( - ace_svc_desc_ThreadStrategySingle + TAO::Portable_Server::ace_svc_desc_ThreadStrategySingle ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -173,5 +170,3 @@ TAO_POA_Initializer::init (void) ace_svc_desc_TAO_Object_Adapter_Factory ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index 4c27f187332..b5d9c773bdf 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_PortableServer_Export TAO_POA_Initializer { public: @@ -35,23 +31,21 @@ public: static int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_PORTABLESERVER_SAFE_INCLUDE -#include "tao/PortableServer/PortableServerC.h" +#include "PortableServerC.h" #undef TAO_PORTABLESERVER_SAFE_INCLUDE -#include "tao/PortableServer/POAManagerC.h" -#include "tao/PortableServer/PS_CurrentC.h" -#include "tao/PortableServer/PortableServer_Functions.h" -#include "tao/PortableServer/PortableServer_WFunctions.h" -#include "tao/PortableServer/PS_ForwardA.h" -#include "tao/PortableServer/IdUniquenessPolicyA.h" -#include "tao/PortableServer/ImplicitActivationPolicyA.h" -#include "tao/PortableServer/RequestProcessingPolicyA.h" -#include "tao/PortableServer/ServantRetentionPolicyA.h" -#include "tao/PortableServer/ThreadPolicyA.h" -#include "tao/PortableServer/IdAssignmentPolicyA.h" -#include "tao/PortableServer/LifespanPolicyA.h" +#include "POAManagerC.h" +#include "PS_CurrentC.h" +#include "PortableServer_Functions.h" +#include "PortableServer_WFunctions.h" +#include "PS_ForwardA.h" +#include "IdUniquenessPolicyA.h" +#include "ImplicitActivationPolicyA.h" +#include "RequestProcessingPolicyA.h" +#include "ServantRetentionPolicyA.h" +#include "ThreadPolicyA.h" +#include "IdAssignmentPolicyA.h" +#include "LifespanPolicyA.h" #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 938c7edeaec..fd221867830 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -45,17 +45,17 @@ #define _PORTABLE_SERVER_IDL_ ///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" -#include "tao/PortableServer/ImplicitActivationPolicy.pidl" -#include "tao/PortableServer/LifespanPolicy.pidl" -#include "tao/PortableServer/RequestProcessingPolicy.pidl" -#include "tao/PortableServer/ServantRetentionPolicy.pidl" -#include "tao/PortableServer/ThreadPolicy.pidl" +#include <Policy_Forward.pidl> +#include <OctetSeq.pidl> +#include <orb_types.pidl> +#include <tao/PortableServer/PS_Forward.pidl> +#include <tao/PortableServer/IdAssignmentPolicy.pidl> +#include <tao/PortableServer/IdUniquenessPolicy.pidl> +#include <tao/PortableServer/ImplicitActivationPolicy.pidl> +#include <tao/PortableServer/LifespanPolicy.pidl> +#include <tao/PortableServer/RequestProcessingPolicy.pidl> +#include <tao/PortableServer/ServantRetentionPolicy.pidl> +#include <tao/PortableServer/ThreadPolicy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index 548d4f7ce54..fefd713bd53 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -33,14 +33,12 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/PortableServer/PortableServer.h" +#include "PortableServer.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -1203,5 +1201,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 6b5bb141a5a..4c59d1769ad 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/PortableServer/PortableServer.h" +#include "PortableServer.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "tao/Object_Argument_T.h" @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -1222,5 +1220,3 @@ PortableServer::POA::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 4609975b004..7d21fd57717 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -44,7 +44,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -83,8 +83,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -1448,8 +1446,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h index acf326b7e64..5b1c718ab1c 100644 --- a/TAO/tao/PortableServer/PortableServerS.h +++ b/TAO/tao/PortableServer/PortableServerS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/PortableServerC.h" +#include "PortableServerC.h" #include "tao/Policy_ForwardS.h" #include "tao/OctetSeqS.h" #include "tao/orb_typesS.h" @@ -54,8 +54,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_PortableServer { @@ -68,8 +66,6 @@ namespace POA_PortableServer // TAO_IDL - Generated from // be\be_codegen.cpp:1060 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "PortableServerS.inl" diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp index ac70be706c3..23fb82cb0fd 100644 --- a/TAO/tao/PortableServer/PortableServer_Functions.cpp +++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp @@ -1,4 +1,4 @@ -#include "tao/PortableServer/PortableServer_Functions.h" +#include "PortableServer_Functions.h" ACE_RCSID (PortableServer, PortableServer_Functions, @@ -6,8 +6,6 @@ ACE_RCSID (PortableServer, #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { PortableServer::ObjectId * @@ -56,5 +54,3 @@ namespace PortableServer } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h index e14222ac6b9..e5de24e99f7 100644 --- a/TAO/tao/PortableServer/PortableServer_Functions.h +++ b/TAO/tao/PortableServer/PortableServer_Functions.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,8 +40,6 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "ace/OS_NS_wchar.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { /// Utility functions for the other @@ -52,8 +50,6 @@ namespace PortableServer const char *id); } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_FUNCTIONS_H */ diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp index d980f303b74..63b6716fffb 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp @@ -1,4 +1,4 @@ -#include "tao/PortableServer/PortableServer_WFunctions.h" +#include "PortableServer_WFunctions.h" ACE_RCSID (PortableServer, PortableServer_WFunctions, @@ -6,8 +6,6 @@ ACE_RCSID (PortableServer, #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { PortableServer::ObjectId * @@ -18,7 +16,7 @@ namespace PortableServer // We DO NOT include the zero terminator, as this is simply an // artifact of the way strings are stored in C. // - u_int string_length = ACE_OS::wslen (string); + u_int string_length = ACE_OS::strlen (string); CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar); @@ -68,4 +66,3 @@ namespace PortableServer } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h index 2d6cdcbabb4..b020106a939 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.h +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,8 +40,6 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "ace/OS_NS_wchar.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar* ObjectId_to_wstring ( @@ -51,8 +49,6 @@ namespace PortableServer const CORBA::WChar *id); } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_WFUNCTIONS_H */ diff --git a/TAO/tao/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl index 54132cd083d..dd300389aa6 100644 --- a/TAO/tao/PortableServer/PortableServer_include.pidl +++ b/TAO/tao/PortableServer/PortableServer_include.pidl @@ -35,6 +35,6 @@ #define _PORTABLESERVER_INCLUDE_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/PortableServer/PortableServer.pidl" +#include <tao/PortableServer/PortableServer.pidl> #endif /* _PORTABLESERVER_INCLUDE_IDL_ */ diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h index 8f2a1503f6c..152ccaf4f6a 100644 --- a/TAO/tao/PortableServer/PortableServer_includeC.h +++ b/TAO/tao/PortableServer/PortableServer_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -55,15 +55,11 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { } -TAO_END_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_codegen.cpp:1028 diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index 7383d7bd9cf..1b8045b030d 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -1,4 +1,4 @@ -#include "tao/PortableServer/Regular_POA.h" +#include "Regular_POA.h" ACE_RCSID (PortableServer, POA, @@ -6,11 +6,9 @@ ACE_RCSID (PortableServer, // #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Regular_POA.inl" +# include "Regular_POA.inl" #endif /* ! __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies, @@ -69,5 +67,3 @@ TAO_Regular_POA::root_key_type (void) return TAO_Root_POA::root_key_type (); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 7a6d3c2289c..516fa3b6f68 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "tao/PortableServer/Root_POA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Regular_POA * @@ -66,12 +64,11 @@ protected: TAO_Root_POA *parent_; }; -TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Regular_POA.inl" +# include "Regular_POA.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index 04b4b4b091b..fa533b4991e 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -2,13 +2,13 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE PortableServer::POA_ptr TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - return PortableServer::POA::_duplicate (this->parent_); + if (this->parent_ != 0) + return PortableServer::POA::_duplicate (this->parent_); + else + return PortableServer::POA::_nil (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index c3f4f480b8e..ca76ad11887 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -1,5 +1,5 @@ -#include "tao/PortableServer/RequestProcessingPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "RequestProcessingPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, RequestProcessingPolicy, @@ -7,8 +7,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -68,6 +66,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index 0d8d4f7485a..6e9b9703085 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/RequestProcessingPolicyC.h" +#include "RequestProcessingPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -32,8 +32,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -69,8 +67,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl index 256defab1b9..7c8d7ac787b 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_ #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index 5db99f4446e..69e96b2261c 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/RequestProcessingPolicyA.h" +#include "RequestProcessingPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -114,6 +112,4 @@ CORBA::Boolean operator>>= ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.h b/TAO/tao/PortableServer/RequestProcessingPolicyA.h index 71cd9e73205..a00d7522145 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h @@ -33,16 +33,14 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/RequestProcessingPolicyC.h" +#include "portableserver_export.h" +#include "RequestProcessingPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -67,8 +65,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index d980d70fd44..c33d79df47f 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/RequestProcessingPolicyC.h" +#include "RequestProcessingPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessin return _tao_success; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h index cdac90a297d..ec1286f49ae 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -237,8 +235,6 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index 535faabda48..e0874c451eb 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -5,23 +5,21 @@ * @file RequestProcessingStrategy.cpp * * $Id$ + * */ //============================================================================= -#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "RequestProcessingStrategy.h" ACE_RCSID (PortableServer, RequestProcessingStrategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - RequestProcessingStrategy::RequestProcessingStrategy (void) + RequestProcessingStrategy::RequestProcessingStrategy() : poa_ (0) { } @@ -58,4 +56,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 8c767103d0b..c6029211f5f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -14,16 +14,14 @@ #define TAO_REQUEST_PROCESSING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Location.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "PortableServer.h" +#include "Servant_Location.h" namespace PortableServer { @@ -139,7 +137,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REQUEST_PROCESSING_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 877f8033219..b77993ba572 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -1,18 +1,16 @@ // -*- C++ -*- #include "tao/ORB_Constants.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" -#include "tao/PortableServer/ServantManagerC.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Servant_Base.h" -#include "tao/PortableServer/Root_POA.h" +#include "RequestProcessingStrategyAOMOnly.h" +#include "ServantManagerC.h" +#include "Non_Servant_Upcall.h" +#include "Servant_Base.h" +#include "Root_POA.h" ACE_RCSID (PortableServer, Request_Processing, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -182,4 +180,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index b8b1b493ad4..f98b135f3ac 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -14,26 +14,19 @@ #define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/PortableServer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Servant_Location.h" +#include "PortableServer.h" namespace TAO { namespace Portable_Server { - /** - * @class RequestProcessingStrategyAOMOnly - * - * Request Processing Strategy which only uses the Active Object Map (AOM) - */ class RequestProcessingStrategyAOMOnly : public RequestProcessingStrategy { @@ -115,7 +108,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 820605a1d42..53a356fbf32 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -1,17 +1,14 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" +#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyAOMOnly.h" #include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" ACE_RCSID (PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -50,20 +47,17 @@ namespace TAO delete strategy; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyAOMOnlyFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyAOMOnlyFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyAOMOnlyFactoryImpl) + } +} -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyAOMOnlyFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyAOMOnlyFactoryImpl) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h index 44a9df665af..81e10c20474 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,6 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -42,14 +40,11 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl) - - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 3b86eb66ce7..1d5954cd800 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -2,12 +2,12 @@ #include "tao/ORB_Constants.h" #include "tao/TSS_Resources.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/ServantManagerC.h" -#include "tao/PortableServer/Servant_Base.h" -#include "tao/PortableServer/POA_Current_Impl.h" +#include "RequestProcessingStrategyDefaultServant.h" +#include "Non_Servant_Upcall.h" +#include "Root_POA.h" +#include "ServantManagerC.h" +#include "Servant_Base.h" +#include "POA_Current_Impl.h" ACE_RCSID (PortableServer, Request_Processing, @@ -15,8 +15,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -282,7 +280,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 26fe17df989..dcb5232e54e 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -14,21 +14,19 @@ #define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Base.h" +#include "Servant_Base.h" -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/PortableServer.h" +#include "Servant_Location.h" +#include "PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Root_POA; namespace TAO @@ -115,8 +113,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index c1f739832f5..ea8c1b03a3d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -1,19 +1,16 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" +#include "RequestProcessingStrategyDefaultServantFI.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyDefaultServant.h" #include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" ACE_RCSID (PortableServer, - RequestProcessingStrategyDefaultServantFI, + RequestProcessingStrategyDefaultServantFactoryImpl, "$Id$") #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -52,24 +49,19 @@ namespace TAO delete strategy; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyDefaultServantFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyDefaultServantFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyDefaultServantFactoryImpl) + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyDefaultServantFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyDefaultServantFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index 7328d0bd30a..b02aba40dc3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -44,14 +42,12 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl) - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h index 9ee872f1a90..157321b4152 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,8 +24,6 @@ #include "tao/PortableServer/RequestProcessingPolicyC.h" #include "tao/PortableServer/ServantRetentionPolicyC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -48,7 +46,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 138fee4eb92..8582dd19f01 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -1,19 +1,16 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h" -#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" -#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" +#include "RequestProcessingStrategyFactoryImpl.h" +#include "RequestProcessingStrategyAOMOnly.h" +#include "RequestProcessingStrategyDefaultServant.h" +#include "RequestProcessingStrategyServantLocator.h" +#include "RequestProcessingStrategyServantActivator.h" #include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" ACE_RCSID (PortableServer, RequestProcessingStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -131,20 +128,17 @@ namespace TAO ACE_CHECK; } } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyFactoryImpl) + } +} -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyFactoryImpl) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h index fa07f1c30a3..007659174cd 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,6 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/RequestProcessingStrategyFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -41,14 +39,11 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl) - - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 666eb25551b..c1ffab9927d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -1,12 +1,12 @@ // $Id$ #include "tao/ORB_Constants.h" -#include "tao/PortableServer/ServantActivatorC.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" -#include "tao/PortableServer/Servant_Base.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PortableServer/Servant_Upcall.h" +#include "ServantActivatorC.h" +#include "RequestProcessingStrategyServantActivator.h" +#include "Servant_Base.h" +#include "Non_Servant_Upcall.h" +#include "Root_POA.h" +#include "POA_Current_Impl.h" +#include "Servant_Upcall.h" ACE_RCSID (PortableServer, Request_Processing, @@ -14,8 +14,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -350,6 +348,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 3108a053031..8130b9eb8c0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -14,19 +14,17 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" +#include "RequestProcessingStrategyServantManager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/PortableServer.h" +#include "Servant_Location.h" +#include "PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { class ServantActivator; @@ -97,8 +95,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index a2b3d222282..766fb256043 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" +#include "RequestProcessingStrategyServantActivatorFI.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyServantActivator.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -12,8 +12,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,23 +62,18 @@ namespace TAO delete strategy; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyServantActivatorFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyServantActivatorFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyServantActivatorFactoryImpl) + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyServantActivatorFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantActivatorFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index ea487fa69d3..cdc19cff125 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -44,15 +42,12 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl) - - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index e8ba2678612..47beac46acc 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -1,11 +1,13 @@ +// -*- C++ -*- + #include "tao/ORB_Constants.h" -#include "tao/PortableServer/ServantLocatorC.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Servant_Base.h" +#include "ServantLocatorC.h" +#include "RequestProcessingStrategyServantLocator.h" +#include "Root_POA.h" +#include "POA_Current_Impl.h" +#include "Servant_Upcall.h" +#include "Non_Servant_Upcall.h" +#include "Servant_Base.h" ACE_RCSID (PortableServer, Request_Processing, @@ -13,8 +15,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -253,7 +253,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index f4f8b1e0d8f..103ccba19fc 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -14,19 +14,17 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" +#include "RequestProcessingStrategyServantManager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/PortableServer.h" +#include "Servant_Location.h" +#include "PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { class ServantLocator; @@ -88,8 +86,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index 631d95d573d..bf962eaf46c 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" +#include "RequestProcessingStrategyServantLocatorFI.h" +#include "RequestProcessingStrategy.h" +#include "RequestProcessingStrategyServantLocator.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -12,8 +12,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -64,24 +62,19 @@ namespace TAO delete strategy; } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL -ACE_STATIC_SVC_DEFINE ( - RequestProcessingStrategyServantLocatorFactoryImpl, - ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - RequestProcessingStrategyServantLocatorFactoryImpl, - TAO::Portable_Server::RequestProcessingStrategyServantLocatorFactoryImpl) + ACE_STATIC_SVC_DEFINE ( + RequestProcessingStrategyServantLocatorFactoryImpl, + ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + ACE_FACTORY_DEFINE (ACE_Local_Service, RequestProcessingStrategyServantLocatorFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h index 89e5d4db19b..795a7b9d5b6 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -44,14 +42,12 @@ namespace TAO RequestProcessingStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl) - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 9cfd35ba5ac..af78da4ca83 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- -#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" -#include "tao/PortableServer/ServantManagerC.h" -#include "tao/PortableServer/Root_POA.h" +#include "RequestProcessingStrategyServantManager.h" +#include "ServantManagerC.h" +#include "Root_POA.h" #include "tao/ORB_Constants.h" ACE_RCSID (PortableServer, @@ -11,8 +11,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -96,7 +94,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 77932c74be9..f68cc5d887d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -14,19 +14,17 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/PortableServer.h" +#include "Servant_Location.h" +#include "PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -72,8 +70,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index c68b5dba54a..ffad80905db 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -1,35 +1,35 @@ // $Id$ -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Regular_POA.h" - -#include "tao/PortableServer/ThreadPolicy.h" -#include "tao/PortableServer/LifespanPolicy.h" -#include "tao/PortableServer/IdAssignmentPolicy.h" -#include "tao/PortableServer/IdUniquenessPolicy.h" -#include "tao/PortableServer/ImplicitActivationPolicy.h" -#include "tao/PortableServer/RequestProcessingPolicy.h" -#include "tao/PortableServer/ServantRetentionPolicy.h" -#include "tao/PortableServer/Active_Object_Map.h" -#include "tao/PortableServer/Default_Acceptor_Filter.h" -#include "tao/PortableServer/ORT_Adapter.h" -#include "tao/PortableServer/ORT_Adapter_Factory.h" -#include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/AdapterActivatorC.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/POAManager.h" -#include "tao/PortableServer/ServantManagerC.h" -#include "tao/PortableServer/poa_macros.h" -#include "tao/PortableServer/POA_Guard.h" -#include "tao/PortableServer/Creation_Time.h" -#include "tao/PortableServer/RequestProcessingStrategy.h" -#include "tao/PortableServer/LifespanStrategy.h" -#include "tao/PortableServer/IdUniquenessStrategy.h" -#include "tao/PortableServer/IdAssignmentStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ImplicitActivationStrategy.h" -#include "tao/PortableServer/ThreadStrategy.h" +#include "Root_POA.h" +#include "Regular_POA.h" + +#include "ThreadPolicy.h" +#include "LifespanPolicy.h" +#include "IdAssignmentPolicy.h" +#include "IdUniquenessPolicy.h" +#include "ImplicitActivationPolicy.h" +#include "RequestProcessingPolicy.h" +#include "ServantRetentionPolicy.h" +#include "Active_Object_Map.h" +#include "Default_Acceptor_Filter.h" +#include "ORT_Adapter.h" +#include "ORT_Adapter_Factory.h" +#include "POA_Current_Impl.h" +#include "Servant_Upcall.h" +#include "AdapterActivatorC.h" +#include "Non_Servant_Upcall.h" +#include "POAManager.h" +#include "ServantManagerC.h" +#include "poa_macros.h" +#include "POA_Guard.h" +#include "Creation_Time.h" +#include "RequestProcessingStrategy.h" +#include "LifespanStrategy.h" +#include "IdUniquenessStrategy.h" +#include "IdAssignmentStrategy.h" +#include "ServantRetentionStrategy.h" +#include "ImplicitActivationStrategy.h" +#include "ThreadStrategy.h" #include "tao/StringSeqC.h" #include "tao/PortableInterceptorC.h" @@ -53,17 +53,14 @@ #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Root_POA.inl" +# include "Root_POA.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, - Root_POA, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + POA, + "$Id$") // This is the TAO_Object_key-prefix that is appended to all TAO Object keys. // It's an array of octets representing ^t^a^o/0 in octal. @@ -825,10 +822,6 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects, this->cleanup_in_progress_ = 1; - // Inform the custom servant dispatching strategy to stop the working - // threads when the poa is destroyed. - this->poa_deactivated_hook (); - // This operation destroys the POA and all descendant POAs. The POA // so destroyed (that is, the POA with its name) may be re-created // later in the same process. (This differs from the @@ -1117,9 +1110,9 @@ TAO_Root_POA::add_ior_component_to_profile ( { // Add the given tagged component to all profiles matching the given // ProfileId. - bool found_profile = false; + int found_profile = 0; - CORBA::ULong const profile_count = mprofile.profile_count (); + const CORBA::ULong profile_count = mprofile.profile_count (); for (CORBA::ULong i = 0; i < profile_count; ++i) { @@ -1131,14 +1124,14 @@ TAO_Root_POA::add_ior_component_to_profile ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; - found_profile = true; + found_profile = 1; } } // According to the Portable Interceptor specification, we're // supposed to throw a CORBA::BAD_PARAM exception if no profile // matched the given ProfileId. - if (found_profile == false) + if (found_profile == 0) ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29, CORBA::COMPLETED_NO)); } @@ -1502,8 +1495,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference } PortableServer::ObjectId system_id; - bool const is_generated = - this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER); + bool is_generated = this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!is_generated) @@ -1548,18 +1540,18 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference, ACE_CHECK_RETURN (false); TAO_Object_Adapter::poa_name poa_system_name; - CORBA::Boolean is_root = false; - CORBA::Boolean is_persistent = false; - CORBA::Boolean is_system_id = false; + CORBA::Boolean is_root = 0; + CORBA::Boolean is_persistent = 0; + CORBA::Boolean is_system_id = 0; TAO::Portable_Server::Temporary_Creation_Time poa_creation_time; - int const result = this->parse_key (key.in (), - poa_system_name, - system_id, - is_root, - is_persistent, - is_system_id, - poa_creation_time); + int result = this->parse_key (key.in (), + poa_system_name, + system_id, + is_root, + is_persistent, + is_system_id, + poa_creation_time); if (result != 0 || !this->root () && poa_system_name != this->system_name () || @@ -1598,9 +1590,9 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference // reference was not created by this POA, the WrongAdapter exception // is raised. PortableServer::ObjectId system_id; - bool const is_generated = this->is_poa_generated (reference, - system_id - ACE_ENV_ARG_PARAMETER); + bool is_generated = this->is_poa_generated (reference, + system_id + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!is_generated) @@ -1750,11 +1742,11 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key, char root_key_type = key_data[starting_at]; if (root_key_type == TAO_Root_POA::root_key_char ()) { - is_root = true; + is_root = 1; } else if (root_key_type == TAO_Root_POA::non_root_key_char ()) { - is_root = false; + is_root = 0; } else { @@ -1769,11 +1761,11 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key, char system_id_key_type = key_data[starting_at]; if (system_id_key_type == TAO_Root_POA::system_id_key_char ()) { - is_system_id = true; + is_system_id = 1; } else if (system_id_key_type == TAO_Root_POA::user_id_key_char ()) { - is_system_id = false; + is_system_id = 0; } else { @@ -1788,11 +1780,11 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key, char persistent_key_type = key_data[starting_at]; if (persistent_key_type == TAO_Root_POA::persistent_key_char ()) { - is_persistent = true; + is_persistent = 1; } else if (persistent_key_type == TAO_Root_POA::transient_key_char ()) { - is_persistent = false; + is_persistent = 0; } else { @@ -1842,7 +1834,7 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key, starting_at += sizeof (poa_name_size); } - // Grep the name if there is a name + // Grep the name if there is aname if (!is_root) { poa_system_name.replace (poa_name_size, @@ -1891,9 +1883,9 @@ TAO_Root_POA::create_object_key (const PortableServer::ObjectId &id) TAO::ObjectKey *key = 0; ACE_NEW_RETURN (key, TAO::ObjectKey (buffer_size, - buffer_size, - buffer, - 1), + buffer_size, + buffer, + 1), 0); return key; @@ -1910,7 +1902,7 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent) // used, then we need to add the POA name length field to the object // key. Otherwise, the POA name length can be calculated by looking // at the remainder after extracting other parts of the key. - bool const add_poa_name_length = + int add_poa_name_length = this->is_persistent () && !this->system_id (); @@ -1932,14 +1924,14 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent) // Get the space needed for the lifespan length // byte. - CORBA::ULong const lifespan_key_length = + CORBA::ULong lifespan_key_length = this->active_policy_strategies_.lifespan_strategy()->key_length (); - CORBA::ULong const id_assignment_key_length = + CORBA::ULong id_assignment_key_length = this->active_policy_strategies_.id_assignment_strategy()->key_type_length (); // Calculate the space required for the POA id. - CORBA::ULong const buffer_size = + CORBA::ULong buffer_size = prefix_size + this->root_key_type_length () + id_assignment_key_length + @@ -2000,6 +1992,7 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent) int TAO_Root_POA::is_poa_generated_id (const PortableServer::ObjectId &id) { + #if defined (POA_NAME_IN_POA_GENERATED_ID) // Grab the buffer @@ -2011,6 +2004,7 @@ TAO_Root_POA::is_poa_generated_id (const PortableServer::ObjectId &id) ACE_OS::strncmp (id_buffer, this->name_.c_str (), this->name_.length ()) == 0; + #else /* POA_NAME_IN_POA_GENERATED_ID */ ACE_UNUSED_ARG (id); @@ -2056,9 +2050,9 @@ TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key, PortableServer::ObjectId &user_id) { TAO_Object_Adapter::poa_name poa_system_name; - CORBA::Boolean is_root = false; - CORBA::Boolean is_persistent = false; - CORBA::Boolean is_system_id = false; + CORBA::Boolean is_root = 0; + CORBA::Boolean is_persistent = 0; + CORBA::Boolean is_system_id = 0; TAO::Portable_Server::Temporary_Creation_Time poa_creation_time; return TAO_Root_POA::parse_key (object_key, @@ -2143,7 +2137,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "IMR IOR = \n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ()))); + ACE_TEXT_TO_TCHAR_IN (imr_str.in ()))); // Search for "corbaloc:" alone, without the protocol. This code // should be protocol neutral. @@ -2176,7 +2170,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "ImR-ified IOR = \n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ()))); + ACE_TEXT_TO_TCHAR_IN (ior.c_str ()))); obj = this->orb_core_.orb ()->string_to_object (ior.c_str () @@ -2315,9 +2309,9 @@ save_ior_component_and_profile_id (const IOP::TaggedComponent &component, // this->tagged_component_id_ is increased, we need to increase the // size of this->profile_id_array_ also. - CORBA::ULong const old_len = this->tagged_component_id_.length (); + const CORBA::ULong old_len = this->tagged_component_id_.length (); - CORBA::ULong const new_len = old_len + 1; + const CORBA::ULong new_len = old_len + 1; this->tagged_component_id_.length (new_len); this->tagged_component_id_[old_len] = component; @@ -2337,7 +2331,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key, int error = 0; // Count the number of endpoints. - size_t const profile_count = + size_t profile_count = acceptor_registry.endpoint_count (); // Create a profile container and have acceptor registries populate @@ -2471,18 +2465,6 @@ TAO_Root_POA::find_servant ( ACE_ENV_ARG_PARAMETER); } -int -TAO_Root_POA::find_servant_priority ( - const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL) -{ - return this->active_policy_strategies_.servant_retention_strategy()-> - find_servant_priority (system_id, - priority - ACE_ENV_ARG_PARAMETER); -} - TAO::ORT_Adapter_Factory * TAO_Root_POA::ORT_adapter_factory (void) { @@ -2532,8 +2514,8 @@ TAO_Root_POA::ORT_adapter_i (void) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Cannot initialize the " - "object_reference_template_adapter"); + "(%P|%t) Cannot initialize the " + "object_reference_template_adapter\n"); } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -2910,28 +2892,3 @@ TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) { } -void -TAO_Root_POA::poa_activated_hook () -{ -} - -void -TAO_Root_POA::poa_deactivated_hook () -{ -} - -void -TAO_Root_POA::servant_activated_hook (PortableServer::Servant, - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) -{ -} - -void -TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant, - const PortableServer::ObjectId& - ACE_ENV_ARG_DECL) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 59d8e490c0c..7fcd071f9f7 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -17,25 +17,33 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/SString.h" +#include "ace/Hash_Map_Manager_T.h" +#include "ace/Array_Base.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Recursive_Thread_Mutex.h" +#include "ace/Null_Mutex.h" + // Object Adapter -#include "tao/PortableServer/Object_Adapter.h" +#include "Object_Adapter.h" // POA Policy Set -#include "tao/PortableServer/POA_Policy_Set.h" +#include "POA_Policy_Set.h" // Cached POA Policies -#include "tao/PortableServer/POA_Cached_Policies.h" -#include "tao/PortableServer/Active_Policy_Strategies.h" +#include "POA_Cached_Policies.h" +#include "Active_Policy_Strategies.h" -#include "tao/PortableServer/ORT_Adapter.h" +#include "ORT_Adapter.h" -#include "tao/PortableServer/PortableServer.h" +#include "PortableServer.h" // Object_Key #include "tao/Object_KeyC.h" @@ -49,14 +57,6 @@ // OctetSeq #include "tao/OctetSeqC.h" -#include "ace/SString.h" -#include "ace/Hash_Map_Manager_T.h" -#include "ace/Array_Base.h" -#include "ace/Synch_Traits.h" -#include "ace/Thread_Mutex.h" -#include "ace/Recursive_Thread_Mutex.h" -#include "ace/Null_Mutex.h" - // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined(_MSC_VER) @@ -64,8 +64,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward Declaration class TAO_Acceptor_Filter; class TAO_Acceptor_Registry; @@ -506,19 +504,6 @@ public: TAO::Portable_Server::POA_Current_Impl &poa_current_impl ACE_ENV_ARG_DECL); - /** - * Find the the servant with ObjectId <system_id>, and retrieve - * its priority.Usually used in RT CORBA with SERVER_DECLARED - * priority model. - * - * @return -1 if servant does not exist, else 0 indicating the - * servant exists and priority successfully retrieved. - */ - int find_servant_priority ( - const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL); - int unbind_using_user_id (const PortableServer::ObjectId &user_id); void cleanup_servant ( @@ -576,25 +561,6 @@ public: ACE_ENV_SINGLE_ARG_DECL ); - /// These hooks are needed by the CSD strategy to override - /// and no-ops by default. - - /// Hook - The POA has been (or is being) activated. - virtual void poa_activated_hook (); - - /// Hook - The POA has been deactivated. - virtual void poa_deactivated_hook (); - - /// Hook - A servant has been activated. - virtual void servant_activated_hook (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - - /// Hook - A servant has been deactivated. - virtual void servant_deactivated_hook (PortableServer::Servant servant, - const PortableServer::ObjectId& oid - ACE_ENV_ARG_DECL); - protected: #if (TAO_HAS_MINIMUM_POA == 0) @@ -1023,8 +989,6 @@ private: static TAO_POA_Static_Resources* initialization_reference_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** #if defined(_MSC_VER) @@ -1032,7 +996,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Root_POA.inl" +# include "Root_POA.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index 116d1d99c4f..fa9ba6014e4 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -5,8 +5,6 @@ // Exception macros #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_Root_POA::cleanup_in_progress (void) { @@ -242,5 +240,3 @@ TAO_Root_POA::servant_deactivation_condition (void) { return servant_deactivation_condition_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/SArg_Traits_T.h b/TAO/tao/PortableServer/SArg_Traits_T.h index 09f01b6bef4..4287b2d2765 100644 --- a/TAO/tao/PortableServer/SArg_Traits_T.h +++ b/TAO/tao/PortableServer/SArg_Traits_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -6,11 +6,11 @@ * * $Id$ * - * @author Jeff Parsons - * @author Carlos O'Ryan + * @authors Jeff Parsons and Carlos O'Ryan */ //============================================================================= + #ifndef TAO_SARG_TRAITS_T_H #define TAO_SARG_TRAITS_T_H @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -35,8 +33,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SARG_TRAITS_T_H */ diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl index f84cffaa3b1..b51f5be5e2e 100644 --- a/TAO/tao/PortableServer/ServantActivator.pidl +++ b/TAO/tao/PortableServer/ServantActivator.pidl @@ -21,9 +21,9 @@ #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" +#include <tao/PortableServer/PS_Forward.pidl> +#include <tao/PortableServer/ServantManager.pidl> +#include <tao/PortableServer/ForwardRequest.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index 2ce0254c337..fb2ece136ab 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -29,15 +29,13 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/ServantActivatorA.h" +#include "ServantActivatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -54,6 +52,4 @@ namespace PortableServer &_tao_tc_PortableServer_ServantActivator; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorA.h b/TAO/tao/PortableServer/ServantActivatorA.h index 31a9823c2c1..da5bc2387bf 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.h +++ b/TAO/tao/PortableServer/ServantActivatorA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ServantActivatorC.h" +#include "portableserver_export.h" +#include "ServantActivatorC.h" #include "tao/PortableServer/PS_ForwardA.h" #include "tao/PortableServer/ServantManagerA.h" #include "tao/PortableServer/ForwardRequestA.h" @@ -43,8 +43,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -58,8 +56,6 @@ namespace PortableServer } // module PortableServer -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index 2fb05a0669e..2a2333d0567 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ServantActivatorC.h" +#include "ServantActivatorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" @@ -39,8 +39,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -172,6 +170,4 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &) return false; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index f86eeef4a4b..53e28b18c8a 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -61,8 +61,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -217,8 +215,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl index 69b5961bafe..333fea55271 100644 --- a/TAO/tao/PortableServer/ServantLocator.pidl +++ b/TAO/tao/PortableServer/ServantLocator.pidl @@ -25,10 +25,10 @@ #define _PORTABLESERVER_SERVANTLOCATOR_IDL_ ///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" +#include <orb_types.pidl> +#include <tao/PortableServer/PS_Forward.pidl> +#include <tao/PortableServer/ServantManager.pidl> +#include <tao/PortableServer/ForwardRequest.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index f6afe468d3e..c08d031be92 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -30,15 +30,13 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/PortableServer/ServantLocatorA.h" +#include "ServantLocatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -55,6 +53,4 @@ namespace PortableServer &_tao_tc_PortableServer_ServantLocator; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorA.h b/TAO/tao/PortableServer/ServantLocatorA.h index 4e114ea1a86..223062154e4 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.h +++ b/TAO/tao/PortableServer/ServantLocatorA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ServantLocatorC.h" +#include "portableserver_export.h" +#include "ServantLocatorC.h" #include "tao/AnyTypeCode/orb_typesA.h" #include "tao/PortableServer/PS_ForwardA.h" #include "tao/PortableServer/ServantManagerA.h" @@ -44,8 +44,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -59,8 +57,6 @@ namespace PortableServer } // module PortableServer -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index b58ab9d6972..e20acbb995d 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ServantLocatorC.h" +#include "ServantLocatorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" @@ -39,8 +39,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -172,6 +170,4 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &) return false; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index 378b2df5c80..d0333809f29 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -62,8 +62,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -222,8 +220,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index f260c424cdf..16d863620a4 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -29,15 +29,13 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/ServantManagerA.h" +#include "ServantManagerA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -54,6 +52,4 @@ namespace PortableServer &_tao_tc_PortableServer_ServantManager; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerA.h b/TAO/tao/PortableServer/ServantManagerA.h index 25cb0d6abb9..a3b630bc035 100644 --- a/TAO/tao/PortableServer/ServantManagerA.h +++ b/TAO/tao/PortableServer/ServantManagerA.h @@ -33,15 +33,13 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ServantManagerC.h" +#include "portableserver_export.h" +#include "ServantManagerC.h" // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -55,8 +53,6 @@ namespace PortableServer } // module PortableServer -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index 2d798612889..a870d15bb09 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ServantManagerC.h" +#include "ServantManagerC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -166,6 +164,4 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &) return false; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index 42b1644d5b8..bc6f82dc2ce 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" @@ -56,8 +56,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -184,8 +182,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index 4bbcdddeb11..9ae6180bbb2 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -1,5 +1,5 @@ -#include "tao/PortableServer/ServantRetentionPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "ServantRetentionPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, ServantRetentionPolicy, @@ -7,8 +7,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -42,7 +40,7 @@ namespace TAO ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->value_; + return value_; } CORBA::PolicyType @@ -66,6 +64,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index 067b3160089..9495d660701 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "ServantRetentionPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -32,8 +32,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -69,8 +67,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl index 6301a5be4ca..fefc5b0efb5 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_ #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index e2474a81437..7fdc593fbac 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/ServantRetentionPolicyA.h" +#include "ServantRetentionPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -113,6 +111,4 @@ CORBA::Boolean operator>>= ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.h b/TAO/tao/PortableServer/ServantRetentionPolicyA.h index ec53d8ff9b0..15576579a76 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "portableserver_export.h" +#include "ServantRetentionPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" @@ -43,8 +43,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -69,8 +67,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index fd103bdc342..a1593b6f7a5 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "ServantRetentionPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention return _tao_success; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h index eac58902cca..5aac210495d 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -232,8 +230,6 @@ namespace TAO TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 7dba84696c7..83529bc8cb8 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -14,18 +14,16 @@ #define TAO_SERVANTRETENTIONSTRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/ServantRetentionPolicyC.h" -#include "tao/PortableServer/PortableServer.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Servant_Location.h" +#include "Servant_Upcall.h" +#include "ServantRetentionPolicyC.h" +#include "PortableServer.h" class TAO_Root_POA; class TAO_Active_Object_Map; @@ -55,11 +53,6 @@ namespace TAO TAO::Portable_Server::POA_Current_Impl &poa_current_impl ACE_ENV_ARG_DECL) = 0; - virtual int find_servant_priority ( - const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL) = 0; - virtual PortableServer::ObjectId *activate_object ( PortableServer::Servant servant, CORBA::Short priority, @@ -158,7 +151,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVANTRETENTIONSTRATEGY_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h index 84d581d0c18..d2331dbd421 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,6 @@ #include "tao/PortableServer/StrategyFactory.h" #include "tao/PortableServer/ServantRetentionPolicyC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -46,7 +44,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index c1a5c11f000..1e4d947f999 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" +#include "ServantRetentionStrategyFactoryImpl.h" +#include "ServantRetentionStrategy.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -9,8 +9,6 @@ ACE_RCSID (PortableServer, ServantRetentionStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -77,20 +75,17 @@ namespace TAO ACE_CHECK; } } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ServantRetentionStrategyFactoryImpl, + ACE_TEXT ("ServantRetentionStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - ServantRetentionStrategyFactoryImpl, - ACE_TEXT ("ServantRetentionStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyFactoryImpl) + } +} -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ServantRetentionStrategyFactoryImpl, - TAO::Portable_Server::ServantRetentionStrategyFactoryImpl) diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h index b6864c9984e..637569c1c87 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,6 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ServantRetentionStrategyFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -41,13 +39,11 @@ namespace TAO ServantRetentionStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl) - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 2084a6bebea..fb1cce33769 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -9,20 +9,18 @@ */ //============================================================================= -#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Servant_Base.h" +#include "ServantRetentionStrategyNonRetain.h" +#include "Non_Servant_Upcall.h" +#include "Servant_Upcall.h" +#include "POA_Current_Impl.h" +#include "Root_POA.h" +#include "Servant_Base.h" #include "tao/debug.h" ACE_RCSID (PortableServer, Servant_Retention_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -137,15 +135,6 @@ namespace TAO return 0; } - int - ServantRetentionStrategyNonRetain::find_servant_priority ( - const PortableServer::ObjectId &/*system_id*/, - CORBA::Short &/*priority*/ - ACE_ENV_ARG_DECL) - { - return -1; - } - int ServantRetentionStrategyNonRetain::is_servant_in_map ( PortableServer::Servant /*servant*/, @@ -342,4 +331,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index cb5fa9a53c7..0cc33443c9a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -14,15 +14,13 @@ #define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" +#include "ServantRetentionStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Location.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Servant_Location.h" class TAO_Root_POA; @@ -108,11 +106,6 @@ namespace TAO TAO::Portable_Server::POA_Current_Impl &poa_current_impl ACE_ENV_ARG_DECL); - virtual int find_servant_priority ( - const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL); - virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -165,7 +158,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index bc3a3510554..8703ddb53f6 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" +#include "ServantRetentionStrategyNonRetainFactoryImpl.h" +#include "ServantRetentionStrategy.h" +#include "ServantRetentionStrategyNonRetain.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -12,8 +12,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -51,22 +49,18 @@ namespace TAO delete strategy; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ServantRetentionStrategyNonRetainFactoryImpl, + ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - ServantRetentionStrategyNonRetainFactoryImpl, - ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ServantRetentionStrategyNonRetainFactoryImpl, - TAO::Portable_Server::ServantRetentionStrategyNonRetainFactoryImpl) + ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyNonRetainFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index 688e49cbeec..04594be87f6 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -43,14 +41,12 @@ namespace TAO ServantRetentionStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl) - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index ecccbc7eaf5..87cf5b4defe 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -11,21 +11,19 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" -#include "tao/PortableServer/ServantRetentionStrategyRetain.h" -#include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Active_Object_Map.h" -#include "tao/PortableServer/Active_Object_Map_Entry.h" +#include "ServantRetentionStrategyRetain.h" +#include "Non_Servant_Upcall.h" +#include "Servant_Upcall.h" +#include "POA_Current_Impl.h" +#include "Root_POA.h" +#include "Active_Object_Map.h" +#include "Active_Object_Map_Entry.h" #include "ace/Auto_Ptr.h" ACE_RCSID (PortableServer, Servant_Retention_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -107,18 +105,6 @@ namespace TAO // Decrement the reference count. CORBA::UShort new_count = --active_object_map_entry->reference_count_; - // Inform the custom servant dispatching (CSD) strategy that the - // servant is deactivated. This would be called just once when the - // servant is deactivated the first time. - if (active_object_map_entry->deactivated_ == 0) - { - this->poa_->servant_deactivated_hook ( - active_object_map_entry->servant_, - active_object_map_entry->user_id_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - if (new_count == 0) { this->poa_->cleanup_servant (active_object_map_entry->servant_, @@ -358,44 +344,6 @@ namespace TAO return servant; } - int - ServantRetentionStrategyRetain::find_servant_priority ( - const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL) - { - PortableServer::ObjectId user_id; - // If we have the RETAIN policy, convert/transform from system id to - // user id. - if (this->active_object_map_-> - find_user_id_using_system_id (system_id, - user_id) != 0) - { - ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (), - -1); - } - - // If the POA has the RETAIN policy, the POA looks in the Active - // Object Map to find if there is a servant associated with the - // Object Id value from the request. If such a servant exists, the - // POA invokes the appropriate method on the servant. - PortableServer::Servant servant = 0; - TAO_Active_Object_Map_Entry *active_object_map_entry = 0; - int result = this->active_object_map_-> - find_servant_using_system_id_and_user_id (system_id, - user_id, - servant, - active_object_map_entry); - - if (result == 0) - { - priority = active_object_map_entry->priority_; - return 0; - } - - return -1; - } - int ServantRetentionStrategyRetain::is_servant_in_map ( PortableServer::Servant servant, @@ -609,13 +557,6 @@ namespace TAO // Everything is finally ok // - // Inform the custom servant dispatching (CSD) strategy that the - // sevant is activated. - this->poa_->servant_activated_hook (servant, - user_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); @@ -694,13 +635,6 @@ namespace TAO // Everything is finally ok // - // Inform the custom servant dispatching (CSD) strategy that the - // sevant is activated. - this->poa_->servant_activated_hook (servant, - system_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); @@ -824,13 +758,6 @@ namespace TAO // Everything is finally ok // - // Inform the custom servant dispatching (CSD) strategy that the - // sevant is activated. - this->poa_->servant_activated_hook (servant, - user_id.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); @@ -853,9 +780,9 @@ namespace TAO int &wait_occurred_restart_call ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, + PortableServer::POA::WrongPolicy)) { // If the POA has the SYSTEM_ID policy and it detects that the // Object Id value was not generated by the system or for this POA, @@ -938,13 +865,6 @@ namespace TAO // Everything is finally ok // - // Inform the custom servant dispatching (CSD) strategy that the - // sevant is activated. - this->poa_->servant_activated_hook (servant, - id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - // ATTENTION: Trick locking here, see class header for details Non_Servant_Upcall non_servant_upcall (*this->poa_); ACE_UNUSED_ARG (non_servant_upcall); @@ -1081,7 +1001,6 @@ namespace TAO return this->active_object_map_->remaining_activations (servant); } - ::PortableServer::ServantRetentionPolicyValue ServantRetentionStrategyRetain::type() const { @@ -1091,4 +1010,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 011d4513fa6..789604bbb9b 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -14,14 +14,12 @@ #define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" +#include "ServantRetentionStrategyNonRetain.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Root_POA; namespace TAO @@ -105,11 +103,6 @@ namespace TAO TAO::Portable_Server::POA_Current_Impl &poa_current_impl ACE_ENV_ARG_DECL); - virtual int find_servant_priority ( - const PortableServer::ObjectId &system_id, - CORBA::Short &priority - ACE_ENV_ARG_DECL); - virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -188,7 +181,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H */ diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index f801a3b5e25..476ea401ebf 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h" -#include "tao/PortableServer/ServantRetentionStrategy.h" -#include "tao/PortableServer/ServantRetentionStrategyRetain.h" +#include "ServantRetentionStrategyRetainFactoryImpl.h" +#include "ServantRetentionStrategy.h" +#include "ServantRetentionStrategyRetain.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -10,8 +10,6 @@ ACE_RCSID (PortableServer, ServantRetentionStrategyRetainFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -49,20 +47,17 @@ namespace TAO delete strategy; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ServantRetentionStrategyRetainFactoryImpl, + ACE_TEXT ("ServantRetentionStrategyRetainFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - ServantRetentionStrategyRetainFactoryImpl, - ACE_TEXT ("ServantRetentionStrategyRetainFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyRetainFactoryImpl) + } +} -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ServantRetentionStrategyRetainFactoryImpl, - TAO::Portable_Server::ServantRetentionStrategyRetainFactoryImpl) diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h index 1dbddfbb378..9fd7a80ee08 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,6 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ServantRetentionStrategyFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -41,14 +39,11 @@ namespace TAO ServantRetentionStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl) - - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H*/ diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index a91077fe966..170196e7695 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/PortableServer/Servant_Base.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Operation_Table.h" -#include "tao/PortableServer/POA_Current_Impl.h" +#include "Servant_Base.h" +#include "Root_POA.h" +#include "Operation_Table.h" +#include "POA_Current_Impl.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" @@ -23,7 +23,7 @@ ACE_RCSID (PortableServer, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Servant_Base.i" +# include "Servant_Base.i" #endif /* ! __ACE_INLINE__ */ #if defined (ACE_ENABLE_TIMEPROBES) @@ -46,8 +46,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ServantBase::TAO_ServantBase (void) : TAO_Abstract_ServantBase () , ref_count_ (1) @@ -479,4 +477,3 @@ TAO_ServantBase_var::_retn (void) return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 486369efbed..1edd4812af9 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,17 +15,15 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PS_ForwardC.h" -#include "tao/Abstract_Servant_Base.h" +#include "PS_ForwardC.h" #include "ace/Atomic_Op.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Abstract_Servant_Base.h" class TAO_Operation_Table; @@ -219,10 +217,8 @@ private: TAO_ServantBase *ptr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Servant_Base.i" +# include "Servant_Base.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i index a975c809e62..a0f38b795a9 100644 --- a/TAO/tao/PortableServer/Servant_Base.i +++ b/TAO/tao/PortableServer/Servant_Base.i @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ServantBase_var::TAO_ServantBase_var (void) @@ -42,4 +41,3 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (servant)); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index 05f34b15345..f90cb97c96a 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -1,16 +1,11 @@ -// $Id$ +// @(#) $Id$ -#include "tao/PortableServer/Servant_Dispatcher.h" +#include "Servant_Dispatcher.h" ACE_RCSID(PortableServer, Servant_Dispatcher, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index d2741f46546..a71b949d84e 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,25 +14,20 @@ #define TAO_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/Servant_Upcall.h" #include "ace/SStringfwd.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Servant_Upcall.h" // Forward references. class TAO_POA_Manager; class TAO_POA_Policy_Set; class TAO_Root_POA; +class ACE_Lock; class TAO_ORB_Core; class TAO_ServerRequest; @@ -79,7 +74,5 @@ public: ACE_ENV_ARG_DECL) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVANT_DISPATCHER_H */ diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h index 7ab08442408..2e533e63a6b 100644 --- a/TAO/tao/PortableServer/Servant_Location.h +++ b/TAO/tao/PortableServer/Servant_Location.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - enum TAO_SERVANT_LOCATION { TAO_SERVANT_FOUND, @@ -31,8 +29,6 @@ enum TAO_SERVANT_LOCATION TAO_SERVANT_NOT_FOUND }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVANT_LOCATION_H */ diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 5df9cff3d57..5529135be6c 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/PortableServer/Object_Adapter.h" -#include "tao/PortableServer/Servant_Upcall.h" -#include "tao/PortableServer/Root_POA.h" -#include "tao/PortableServer/Default_Servant_Dispatcher.h" -#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h" -#include "tao/PortableServer/Active_Object_Map_Entry.h" -#include "tao/PortableServer/ForwardRequestC.h" +#include "Object_Adapter.h" +#include "Servant_Upcall.h" +#include "Root_POA.h" +#include "Default_Servant_Dispatcher.h" +#include "Collocated_Object_Proxy_Broker.h" +#include "Active_Object_Map_Entry.h" +#include "ForwardRequestC.h" // -- TAO Include -- #include "tao/ORB.h" @@ -14,7 +14,7 @@ #include "tao/debug.h" #if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Servant_Upcall.inl" +# include "Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ #include "ace/OS_NS_string.h" @@ -23,8 +23,6 @@ ACE_RCSID (PortableServer, Servant_Upcall, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -43,8 +41,9 @@ namespace TAO #endif /* TAO_HAS_MINIMUM_POA == 0 */ active_object_map_entry_ (0) { + TAO_Adapter *adapter = oc->poa_adapter (); TAO_Object_Adapter *object_adapter = - dynamic_cast<TAO_Object_Adapter *>(oc->poa_adapter ()); + dynamic_cast<TAO_Object_Adapter *>(adapter); this->object_adapter_ = object_adapter; } @@ -100,7 +99,7 @@ namespace TAO ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (), TAO_Adapter::DS_FAILED); - // We have acquired the object adapter lock. Record this for later + // We have acquired the object adapater lock. Record this for later // use. this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED; @@ -245,7 +244,7 @@ namespace TAO ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (), 0); - // We have acquired the object adapter lock. Record this for later + // We have acquired the object adapater lock. Record this for later // use. this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED; @@ -469,5 +468,3 @@ namespace TAO } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index dff98e83559..b9564e8d7a8 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,8 +28,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declaration class TAO_Root_POA; class TAO_ServerRequest; @@ -54,8 +52,7 @@ namespace TAO * * @brief This class finds out the POA and the servant to perform an * upcall. It can only be instantiated without the object - * adapter's lock held. For each upcall a new instance of this - * class is created. + * adapter's lock held. */ class TAO_PortableServer_Export Servant_Upcall { @@ -92,7 +89,7 @@ namespace TAO }; /// Constructor. - explicit Servant_Upcall (TAO_ORB_Core *orb_core); + Servant_Upcall (TAO_ORB_Core *orb_core); /// Destructor. ~Servant_Upcall (void); @@ -235,14 +232,12 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "tao/PortableServer/Servant_Upcall.inl" +# include "Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl index 5f016db3fe6..36c4739f457 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Servant_Upcall.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -105,4 +103,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index f15942d5e54..991f39a5bab 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -12,8 +12,6 @@ // ============================================================ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename to_S, typename from_S, @@ -140,6 +138,4 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index bb240a0a03f..e7d34f8494b 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -22,9 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -158,8 +155,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/Special_Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index 6c3d9685b54..38d18635683 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename to_S, typename from_S, @@ -93,4 +91,3 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) return this->x_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h index f306336fe83..29708781603 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArguments.h +++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -6,8 +6,7 @@ * * $Id$ * - * @author Jeff Parsons - * @author Carlos O'Ryan + * @authors Jeff Parsons and Carlos O'Ryan */ //============================================================================= @@ -28,7 +27,6 @@ #include "ace/CDR_Stream.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -76,8 +74,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SPECIAL_BASIC_SARGUMENTS_H */ diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp index 58a4bc04c11..98331b770b4 100644 --- a/TAO/tao/PortableServer/StrategyFactory.cpp +++ b/TAO/tao/PortableServer/StrategyFactory.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "tao/PortableServer/StrategyFactory.h" +#include "StrategyFactory.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, StrategyFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -18,5 +16,3 @@ namespace TAO } } /* namespace Portable_Server */ } /* namespace TAO */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h index b441256d214..54546f1f946 100644 --- a/TAO/tao/PortableServer/StrategyFactory.h +++ b/TAO/tao/PortableServer/StrategyFactory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file StrategyFactory.h @@ -12,7 +11,6 @@ #ifndef TAO_PORTABLESERVER_STRATEGYFACTORY_H #define TAO_PORTABLESERVER_STRATEGYFACTORY_H - #include /**/ "ace/pre.h" #include "ace/Service_Object.h" @@ -21,16 +19,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - class StrategyFactory - : public ACE_Service_Object + class StrategyFactory : + public ACE_Service_Object { public: virtual ~StrategyFactory (void); @@ -38,8 +32,5 @@ namespace TAO } /* namespace Portable_Server */ } /* namespace TAO */ -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_PORTABLESERVER_STRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index 2268a11ae61..a314bcb436d 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -1,5 +1,5 @@ -#include "tao/PortableServer/ThreadPolicy.h" -#include "tao/PortableServer/PortableServer.h" +#include "ThreadPolicy.h" +#include "PortableServer.h" ACE_RCSID (PortableServer, ThreadPolicy, @@ -7,8 +7,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -65,6 +63,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index a85fc863cb1..dc9673f59a7 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_THREADPOLICY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadPolicyC.h" +#include "ThreadPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -32,8 +32,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -69,8 +67,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl index 9f37950dfb4..a86084a88b5 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.pidl +++ b/TAO/tao/PortableServer/ThreadPolicy.pidl @@ -17,7 +17,7 @@ #ifndef _PORTABLESERVER_THREAD_POLICY_IDL_ #define _PORTABLESERVER_THREAD_POLICY_IDL_ -#include "tao/Policy.pidl" +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index db3bb5be86d..87d85d78165 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -35,14 +35,12 @@ #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/PortableServer/ThreadPolicyA.h" +#include "ThreadPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 @@ -116,7 +114,5 @@ CORBA::Boolean operator>>= ( ); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h index d0b05bc3667..b74bf2f030e 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.h +++ b/TAO/tao/PortableServer/ThreadPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" -#include "tao/PortableServer/ThreadPolicyC.h" +#include "portableserver_export.h" +#include "ThreadPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" #if (TAO_HAS_MINIMUM_POA == 0) @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -68,8 +66,6 @@ namespace PortableServer TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index 41e88033055..ac2f91049f7 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "tao/PortableServer/ThreadPolicyC.h" +#include "ThreadPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -38,8 +38,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValu return _tao_success; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h index e0f835a33b7..4af9f727a2b 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.h +++ b/TAO/tao/PortableServer/ThreadPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableServer { @@ -232,8 +230,6 @@ namespace TAO TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue); TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index c3d6a446a4a..6f1d80b5c36 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -1,20 +1,17 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategy.h" +#include "ThreadStrategy.h" ACE_RCSID (PortableServer, ThreadStrategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { void - ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ - ACE_ENV_ARG_DECL_NOT_USED) + ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED) { } @@ -25,4 +22,3 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 622ad7d3748..fe992cb580e 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -14,23 +14,21 @@ #define TAO_THREAD_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/Policy_Strategy.h" +#include "Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadPolicyC.h" +#include "ThreadPolicyC.h" #include "tao/orbconf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server { - class ThreadStrategy - : public Policy_Strategy + class ThreadStrategy : + public Policy_Strategy { public: virtual int enter () = 0; @@ -46,7 +44,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_THREAD_STRATEGY_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h index a22078ed773..5dea79f8b41 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h @@ -12,18 +12,15 @@ #ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H - #include /**/ "ace/pre.h" -#include "tao/PortableServer/StrategyFactory.h" +#include "StrategyFactory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadPolicyC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ThreadPolicyC.h" namespace TAO { @@ -47,8 +44,5 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index b21116e42b1..b12fb95bb29 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategyFactoryImpl.h" -#include "tao/PortableServer/ThreadStrategy.h" +#include "ThreadStrategyFactoryImpl.h" +#include "ThreadStrategy.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -9,8 +9,6 @@ ACE_RCSID (PortableServer, ThreadStrategyFactoryImpl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -82,21 +80,17 @@ namespace TAO } } } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ThreadStrategyFactoryImpl, + ACE_TEXT ("ThreadStrategyFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ThreadStrategyFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - ThreadStrategyFactoryImpl, - ACE_TEXT ("ThreadStrategyFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategyFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategyFactoryImpl, - TAO::Portable_Server::ThreadStrategyFactoryImpl) + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyFactoryImpl) + } +} diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index cfe8b44147c..9ffb364e529 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +23,6 @@ #include "ace/Service_Config.h" #include "tao/PortableServer/ThreadStrategyFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -41,13 +39,11 @@ namespace TAO ThreadStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl) - #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index 44edaa4b6a9..abec20789c5 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategyORBControl.h" +#include "ThreadStrategyORBControl.h" #include "ace/Log_Msg.h" ACE_RCSID (PortableServer, ThreadStrategyORBControl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -30,21 +28,17 @@ namespace TAO { return ::PortableServer::ORB_CTRL_MODEL; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyORBControl) + ACE_STATIC_SVC_DEFINE ( + ThreadStrategyORBControl, + ACE_TEXT ("ThreadStrategyORBControl"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ThreadStrategyORBControl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategyORBControl, - TAO::Portable_Server::ThreadStrategyORBControl) - -ACE_STATIC_SVC_DEFINE ( - ThreadStrategyORBControl, - ACE_TEXT ("ThreadStrategyORBControl"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategyORBControl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h index d88997c2214..c0f4ff5cd8f 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h @@ -12,20 +12,17 @@ #ifndef TAO_THREADSTRATEGYORBCONTROL_H #define TAO_THREADSTRATEGYORBCONTROL_H - #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadStrategy.h" -#include "tao/orbconf.h" +#include "ThreadStrategy.h" #include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/orbconf.h" namespace TAO { @@ -41,14 +38,11 @@ namespace TAO virtual ::PortableServer::ThreadPolicyValue type() const; }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl) - #include /**/ "ace/post.h" - #endif /* TAO_THREADSTRATEGYORBCONTROL_H */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 2a903d2876b..0212e5a092e 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategySingle.h" +#include "ThreadStrategySingle.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -10,8 +10,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -33,22 +31,18 @@ namespace TAO { return ::PortableServer::SINGLE_THREAD_MODEL; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingle) -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategySingle, - TAO::Portable_Server::ThreadStrategySingle) - -ACE_STATIC_SVC_DEFINE ( - ThreadStrategySingle, - ACE_TEXT ("ThreadStrategySingle"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategySingle), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) + ACE_STATIC_SVC_DEFINE ( + ThreadStrategySingle, + ACE_TEXT ("ThreadStrategySingle"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ThreadStrategySingle), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index 0836472a09e..b10a56f0bb4 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -14,16 +14,13 @@ #define TAO_THREADSTRATEGYSINGLE_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ThreadStrategy.h" - -#include "tao/orbconf.h" - +#include "ThreadStrategy.h" #include "ace/Service_Config.h" // Locking @@ -32,11 +29,10 @@ #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" +#include "tao/orbconf.h" #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -53,14 +49,12 @@ namespace TAO private: TAO_SYNCH_RECURSIVE_MUTEX lock_; }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle) + ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle) - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index b718ea02ef2..e5df89cc177 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" -#include "tao/PortableServer/ThreadStrategy.h" -#include "tao/PortableServer/ThreadStrategySingle.h" +#include "ThreadStrategySingleFactoryImpl.h" +#include "ThreadStrategy.h" +#include "ThreadStrategySingle.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -12,8 +12,6 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -51,22 +49,18 @@ namespace TAO delete strategy; } - } -} -TAO_END_VERSIONED_NAMESPACE_DECL + ACE_STATIC_SVC_DEFINE ( + ThreadStrategySingleFactoryImpl, + ACE_TEXT ("ThreadStrategySingleFactory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0 + ) -ACE_STATIC_SVC_DEFINE ( - ThreadStrategySingleFactoryImpl, - ACE_TEXT ("ThreadStrategySingleFactory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_NAMESPACE_DEFINE ( - ACE_Local_Service, - ThreadStrategySingleFactoryImpl, - TAO::Portable_Server::ThreadStrategySingleFactoryImpl) + ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingleFactoryImpl) + } +} #endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index e04f0995a42..260ea7cf4bc 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #if (TAO_HAS_MINIMUM_POA == 0) -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Portable_Server @@ -43,14 +41,12 @@ namespace TAO ThreadStrategy *strategy ACE_ENV_ARG_DECL); }; + + ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl) + ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl) } } -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl) -ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl) - #endif /* TAO_HAS_MINIMUM_POA == 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h index 2e0f067d2fd..0314b900e76 100644 --- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h +++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h @@ -24,7 +24,6 @@ #include "tao/PortableServer/Object_SArgument_T.h" #include "tao/Pseudo_VarOut_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -56,8 +55,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TYPECODE_SARG_TRAITS_H */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp index 7f8db0408f5..c5d7730469f 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp @@ -9,7 +9,6 @@ #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_var> CORBA::Boolean @@ -100,6 +99,4 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_UB_STRING_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index ac1202a2d4f..3d681d3e0d9 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -143,8 +141,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl index b60809e056d..daf8637012c 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename S_var> ACE_INLINE TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void) @@ -62,4 +58,3 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void) return this->x_.out (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h index e86e7c0ae24..fd3440e5804 100644 --- a/TAO/tao/PortableServer/UB_String_SArguments.h +++ b/TAO/tao/PortableServer/UB_String_SArguments.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -6,8 +6,7 @@ * * $Id$ * - * @author Jeff Parsons - * @author Carlos O'Ryan + * @authors Jeff Parsons and Carlos O'Ryan */ //============================================================================= @@ -25,8 +24,6 @@ #include "tao/PortableServer/UB_String_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -52,8 +49,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UB_STRING_SARGUMENTS_H */ diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index dd6b7d8e85f..ebfa73dac9b 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/Upcall_Command.h" +#include "Upcall_Command.h" ACE_RCSID (PortableServer, @@ -8,10 +8,6 @@ ACE_RCSID (PortableServer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Upcall_Command::~Upcall_Command (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 40c216457f7..700ad64090c 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -16,15 +16,12 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/portableserver_export.h" +#include "ace/CORBA_macros.h" #ifndef ACE_LACKS_PRAGMA_ONCE # pragma once #endif /* !ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" -#include "ace/CORBA_macros.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -60,7 +57,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index 352332e6cd0..dde1cedfad6 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/PortableServer/Upcall_Wrapper.h" -#include "tao/PortableServer/Upcall_Command.h" +#include "Upcall_Wrapper.h" +#include "Upcall_Command.h" #if TAO_HAS_INTERCEPTORS == 1 # include "tao/ServerRequestInterceptor_Adapter.h" @@ -14,14 +14,12 @@ #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" #include "tao/Argument.h" -#include "tao/operation_details.h" #include "ace/Log_Msg.h" ACE_RCSID (PortableServer, Upcall_Wrapper, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, @@ -49,32 +47,6 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, #if TAO_HAS_INTERCEPTORS == 1 - // Make sure that, for the collocated case, we use the client-side - // arguments. For the non-collocated case, we will use the server-side - // arguments since they got set up in our pre_upcall() method. Note that - // our pre_upcall() method doesn't get invoked in the collocated case, - // and is the reason why we need to provide the client-side args instead - // of the (never set or initialized) server-side args. - // - // Before the following logic was added, the - // $TAO_ROOT/tests/Portable_Interceptors/Collocated/run_test.pl - // showed that the server-side request interceptor was getting bogus - // values when it took a look at the request arguments. Some - // additional testing revealed that this only occurred in the - // collocated request case. - - // By default, we assume that we will use the server-side args. - TAO::Argument * const * the_args = args; - size_t the_nargs = nargs; - - if (server_request.collocated()) - { - // It is a collocated request so we need to use the client-side - // args instead. - the_args = server_request.operation_details()->args(); - the_nargs = server_request.operation_details()->args_num(); - } - TAO::ServerRequestInterceptor_Adapter *interceptor_adapter = server_request.orb_core ()->serverrequestinterceptor_adapter (); @@ -85,8 +57,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, { // Invoke intermediate server side interception points. interceptor_adapter->receive_request (server_request, - the_args, - the_nargs, + args, + nargs, servant_upcall, exceptions, nexceptions @@ -140,8 +112,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, // No location forward by interceptors and successful upcall. server_request.reply_status (PortableInterceptor::SUCCESSFUL); interceptor_adapter->send_reply (server_request, - the_args, - the_nargs, + args, + nargs, servant_upcall, exceptions, nexceptions @@ -164,8 +136,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, if (interceptor_adapter != 0) { interceptor_adapter->send_exception (server_request, - the_args, - the_nargs, + args, + nargs, servant_upcall, exceptions, nexceptions @@ -200,8 +172,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, if (interceptor_adapter != 0) { interceptor_adapter->send_exception (server_request, - the_args, - the_nargs, + args, + nargs, servant_upcall, exceptions, nexceptions @@ -294,5 +266,3 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr, } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index f0ba3f1c7e0..c6d62419310 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/portableserver_export.h" +#include "portableserver_export.h" #ifndef ACE_LACKS_PRAGMA_ONCE # pragma once @@ -28,8 +28,6 @@ #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ServantBase; class TAO_ServerRequest; class TAO_InputCDR; @@ -124,7 +122,6 @@ namespace TAO } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 06a9e5014a4..b7009ed3baa 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -9,7 +9,6 @@ #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_slice, @@ -161,6 +160,4 @@ TAO::Ret_Var_Array_SArgument_T<S_slice, #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_VAR_ARRAY_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index db7835de063..ab4418314e6 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -173,8 +171,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index bbc5dd80950..30674cca189 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_slice, @@ -116,4 +115,3 @@ TAO::Ret_Var_Array_SArgument_T<S_slice, return this->x_.out (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp index 33c151f6bb9..64b6229bd10 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -10,8 +10,6 @@ #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> CORBA::Boolean @@ -112,6 +110,4 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_VAR_SIZE_SARGUMENT_T_CPP */ diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index 99046ca2655..14585cc096a 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -151,8 +149,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl index 11d13f2e9e2..7c516b117ec 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> S const & @@ -68,4 +66,3 @@ TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::arg (void) return this->x_.out (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/get_arg.h b/TAO/tao/PortableServer/get_arg.h index 38c21f200c9..bf7a2fc892f 100644 --- a/TAO/tao/PortableServer/get_arg.h +++ b/TAO/tao/PortableServer/get_arg.h @@ -31,7 +31,6 @@ #include "tao/operation_details.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -80,7 +79,7 @@ namespace TAO size_t i) { return - (details != 0 && details->args () != 0) + details ? static_cast<typename TAO::Arg_Traits<T>::in_arg_val *> ( details->args ()[i])->arg () : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> ( @@ -136,8 +135,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_GET_ARG_H*/ diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h index 4ef9552bfd4..ca9e01b11d8 100644 --- a/TAO/tao/PortableServer/poa_macros.h +++ b/TAO/tao/PortableServer/poa_macros.h @@ -1,14 +1,10 @@ -// -*- C++ -*- - // $Id$ #ifndef TAO_POA_MACROS_H #define TAO_POA_MACROS_H - #include /**/ "ace/pre.h" - -#include "tao/orbconf.h" #include "ace/CORBA_macros.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -39,5 +35,4 @@ ACE_CHECK_RETURN (RETURN) #include /**/ "ace/post.h" - #endif /* TAO_POA_MACROS_H */ diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp index f7fed0a138c..048c289c0e5 100644 --- a/TAO/tao/Principal.cpp +++ b/TAO/tao/Principal.cpp @@ -4,8 +4,8 @@ // All Rights Reserved // ORB: Principal identifier pseudo-objref -#include "tao/Principal.h" -#include "tao/CDR.h" +#include "Principal.h" +#include "CDR.h" #if !defined (__ACE_INLINE__) #include "tao/Principal.i" @@ -15,9 +15,6 @@ ACE_RCSID (tao, Principal, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Principal::Principal (void) : refcount_ (1) { @@ -64,4 +61,3 @@ operator>> (TAO_InputCDR & cdr, CORBA::Principal *& x) return (CORBA::Boolean) cdr.good_bit (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index d080b3f1bb7..4010df0a507 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -18,20 +18,16 @@ #define TAO_PRINCIPAL_H #include /**/ "ace/pre.h" - -#include "tao/CORBA_methods.h" +#include "ace/Thread_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/OctetSeqC.h" -#include "tao/Pseudo_VarOut_T.h" - -#include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "OctetSeqC.h" +#include "Pseudo_VarOut_T.h" +#include "CORBA_methods.h" namespace CORBA { @@ -104,8 +100,6 @@ operator<< (TAO_OutputCDR &, CORBA::Principal *); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Principal *&); -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Principal.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i index 5c7ef0d666a..559ddb82db0 100644 --- a/TAO/tao/Principal.i +++ b/TAO/tao/Principal.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean CORBA::is_nil (CORBA::Principal_ptr principal) @@ -61,4 +59,3 @@ CORBA::Principal::_nil (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 9879ff26ef4..c6730ac24cb 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -16,7 +16,7 @@ #include "ace/os_include/os_ctype.h" #if !defined (__ACE_INLINE__) -#include "tao/Profile.i" +#include "Profile.i" #endif /* __ACE_INLINE__ */ @@ -26,9 +26,6 @@ ACE_RCSID (tao, // **************************************************************** - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Profile::TAO_Profile (CORBA::ULong tag, TAO_ORB_Core *orb_core, const TAO::ObjectKey &obj_key, @@ -88,7 +85,7 @@ CORBA::ULong TAO_Profile::_incr_refcnt (void) { ACE_GUARD_RETURN (ACE_Lock, guard, *this->refcount_lock_, 0); - return ++this->refcount_; + return this->refcount_++; } CORBA::ULong @@ -96,7 +93,7 @@ TAO_Profile::_decr_refcnt (void) { { ACE_GUARD_RETURN (ACE_Lock, mon, *this->refcount_lock_, 0); - --this->refcount_; + this->refcount_--; if (this->refcount_ != 0) { @@ -951,5 +948,3 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) return (CORBA::Boolean) cdr.good_bit (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index cc7fd7fea0a..a19068df002 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -25,12 +25,7 @@ #include "tao/Refcounted_ObjectKey.h" #include "tao/Service_Callbacks.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_MProfile; class TAO_Stub; class TAO_Endpoint; @@ -249,7 +244,7 @@ protected: virtual void create_profile_body (TAO_OutputCDR &cdr) const = 0; /** - * Helper for decode(). Decodes endpoints from a tagged component. + * Helper for <decode>. Decodes endpoints from a tagged component. * Decode only if RTCORBA is enabled. Furthermore, we may not find * TAO_TAG_ENDPOINTS component, e.g., if we are talking to nonRT * version of TAO or some other ORB. This is not an error, and we @@ -303,9 +298,9 @@ private: /// i.e. is not a GIOP 1.0 profile. void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL); - // Profiles should not be copied or assigned! - TAO_Profile (const TAO_Profile&); - void operator= (const TAO_Profile&); + // Profiles should not be copied! + ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Profile&)) //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK @@ -420,10 +415,8 @@ private: //@@ TAO_PROFILE_SPL_EXTERN_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Profile.i" +# include "Profile.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i index 4cbbee30eb3..dde1611c1da 100644 --- a/TAO/tao/Profile.i +++ b/TAO/tao/Profile.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_Profile::tag (void) const { @@ -63,5 +60,3 @@ TAO_Profile::object_key (void) const { return this->ref_object_key_->object_key (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 2fafd42c511..8c88d2a7db0 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -1,33 +1,28 @@ // $Id$ -#include "tao/Profile_Transport_Resolver.h" -#include "tao/Profile.h" -#include "tao/Stub.h" -#include "tao/Transport.h" -#include "tao/Invocation_Endpoint_Selectors.h" -#include "tao/ORB_Core.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Transport_Cache_Manager.h" -#include "tao/Endpoint_Selector_Factory.h" -#include "tao/Codeset_Manager.h" -#include "tao/Connector_Registry.h" -#include "tao/Transport_Connector.h" -#include "tao/Endpoint.h" -#include "tao/SystemException.h" +#include "Profile_Transport_Resolver.h" +#include "Profile.h" +#include "Transport.h" +#include "Stub.h" +#include "Invocation_Endpoint_Selectors.h" +#include "ORB_Core.h" +#include "Endpoint_Selector_Factory.h" +#include "Codeset_Manager.h" +#include "Connector_Registry.h" +#include "Transport_Connector.h" +#include "Endpoint.h" +#include "SystemException.h" #include "ace/Countdown_Time.h" #if !defined (__ACE_INLINE__) -# include "tao/Profile_Transport_Resolver.inl" +# include "Profile_Transport_Resolver.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, Profile_Transport_Resolver, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -220,21 +215,4 @@ namespace TAO ENOMEM), CORBA::COMPLETED_NO)); } - - - int - Profile_Transport_Resolver::find_transport (TAO_Transport_Descriptor_Interface *desc) - { - TAO::Transport_Cache_Manager &cache = - this->profile_->orb_core()->lane_resources ().transport_cache(); - - // the cache increments the reference count on the transport if the - // find is successful. Find_transport uses negative logic in its return, - // 0 for success - return (cache.find_transport(desc,this->transport_) == 0); - } - - } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 5ec4889a76b..0dd849a04a5 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -25,16 +25,11 @@ #include "tao/SystemException.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Stub; class TAO_Profile; class TAO_Transport; class TAO_Endpoint; +class ACE_Time_Value; class TAO_Transport_Descriptor_Interface; namespace CORBA @@ -114,13 +109,6 @@ namespace TAO /// Accessor for the transport reserved for this invocation. TAO_Transport *transport (void) const; - /// See if the transport cache has an available transport and - /// use that one rather than trying to connect via the connector. - /// Separating this functionality enables the look up of many - /// endpoints before trying the more time-consuming trip through - /// the actual connector. - int find_transport (TAO_Transport_Descriptor_Interface *); - /// Accessor to indicate whether we should block while /// establishing a connection. bool blocked_connect (void) const; @@ -193,10 +181,8 @@ namespace TAO }; } // TAO namespace end -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Profile_Transport_Resolver.inl" +# include "Profile_Transport_Resolver.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl index 3617d71e3da..2f35fa34c5b 100644 --- a/TAO/tao/Profile_Transport_Resolver.inl +++ b/TAO/tao/Profile_Transport_Resolver.inl @@ -1,10 +1,5 @@ // -*- C++ -*- -// // $Id$ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE @@ -13,12 +8,12 @@ namespace TAO TAO_Stub *stub, bool block) : obj_ (p) - , stub_ (stub) - , transport_ (0) - , profile_ (0) - , inconsistent_policies_ (0) - , is_released_ (false) - , blocked_ (block) + , stub_ (stub) + , transport_ (0) + , profile_ (0) + , inconsistent_policies_ (0) + , is_released_ (false) + , blocked_ (block) { } @@ -72,5 +67,3 @@ namespace TAO return tmp; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp index 7d67c460789..5271761663e 100644 --- a/TAO/tao/Protocol_Factory.cpp +++ b/TAO/tao/Protocol_Factory.cpp @@ -1,14 +1,13 @@ // $Id$ -#include "tao/Protocol_Factory.h" +#include "Protocol_Factory.h" +#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Protocol_Factory, "$Id$") -static const char the_prefix[] = ""; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "\0"; TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag) : tag_ (tag) @@ -53,7 +52,7 @@ TAO_Protocol_Factory::match_prefix (const ACE_CString & /* prefix */) const char * TAO_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -62,4 +61,3 @@ TAO_Protocol_Factory::options_delimiter (void) const return '\0'; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 7e0bcb71b0c..568be711664 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -14,19 +14,16 @@ #define TAO_PROTOCOL_FACTORY_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Basic_Types.h" - -#include "ace/Service_Object.h" #include "ace/SStringfwd.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "TAO_Export.h" +#include "Basic_Types.h" class TAO_Acceptor; class TAO_Connector; @@ -71,14 +68,10 @@ public: virtual int requires_explicit_endpoint (void) const = 0; private: - /// IOP protocol tag. - CORBA::ULong const tag_; - + CORBA::ULong tag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PROTOCOL_FACTORY_H */ diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp index 444d92846a6..604e01bf55e 100644 --- a/TAO/tao/Protocols_Hooks.cpp +++ b/TAO/tao/Protocols_Hooks.cpp @@ -1,14 +1,12 @@ // $Id$ -#include "tao/Protocols_Hooks.h" +#include "Protocols_Hooks.h" #include "ace/Dynamic_Service.h" ACE_RCSID (tao, Protocols_Hooks, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_IIOP_Protocol_Properties::TAO_IIOP_Protocol_Properties (void) : send_buffer_size_ (0), recv_buffer_size_ (0), @@ -52,8 +50,8 @@ TAO_SCIOP_Protocol_Properties::TAO_SCIOP_Protocol_Properties (void) { } +/// destructor TAO_Protocols_Hooks::~TAO_Protocols_Hooks (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index ddec97f4919..c176aa2bc44 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -22,14 +22,11 @@ #include "ace/Service_Object.h" -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" -#include "tao/IOP_IORC.h" +#include "TAO_Export.h" +#include "Basic_Types.h" +#include "IOP_IORC.h" #include "ace/SString.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Policy; @@ -203,8 +200,6 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_PROTOCOLS_HOOKS_H */ diff --git a/TAO/tao/Pseudo_VarOut_T.cpp b/TAO/tao/Pseudo_VarOut_T.cpp index 9d325bfb89a..5d0a9ebc3cd 100644 --- a/TAO/tao/Pseudo_VarOut_T.cpp +++ b/TAO/tao/Pseudo_VarOut_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_PSEUDO_VAROUT_T_CPP -#define TAO_PSEUDO_VAROUT_T_CPP +#ifndef TAO_PSEUDO_VAROUT_T_C +#define TAO_PSEUDO_VAROUT_T_C #include "tao/Pseudo_VarOut_T.h" @@ -9,7 +9,9 @@ #include "tao/Pseudo_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Pseudo_VarOut_T, + "$Id$") template <typename T> TAO_Pseudo_Var_T<T> & @@ -23,7 +25,4 @@ TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p) return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_PSEUDO_VAROUT_T_CPP */ +#endif /* TAO_PSEUDO_VAROUT_T_C */ diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 431e464d079..4d73bba0c55 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -42,8 +42,6 @@ #include "tao/varbase.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Pseudo_Var_T * @@ -127,8 +125,6 @@ private: TAO_Pseudo_Out_T<T,T_var> & operator= (const T_var &); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Pseudo_VarOut_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index 8e5867beac6..7baddc74b88 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename T> ACE_INLINE TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void) @@ -173,5 +171,3 @@ TAO_Pseudo_Out_T<T,T_var>::operator-> (void) { return this->ptr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource_Factory.cpp index ec50933e935..561fffca095 100644 --- a/TAO/tao/QtResource_Factory.cpp +++ b/TAO/tao/QtResource_Factory.cpp @@ -1,17 +1,16 @@ //$Id$ -#include "tao/QtResource_Factory.h" -#include "tao/debug.h" +#include "QtResource_Factory.h" +#include "debug.h" #include "ace/QtReactor.h" -ACE_RCSID (TAO_QtResource, +ACE_RCSID( TAO_QtResource, QtResource_Factory, "$Id$"); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { + QtResource_Factory::QtResource_Factory (QApplication *qapp) : reactor_impl_ (0) , qapp_ (qapp) @@ -44,5 +43,3 @@ namespace TAO return this->reactor_impl_; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/QtResource_Factory.h b/TAO/tao/QtResource_Factory.h index ba922a44480..83e37e7a3af 100644 --- a/TAO/tao/QtResource_Factory.h +++ b/TAO/tao/QtResource_Factory.h @@ -24,10 +24,9 @@ #include "ace/QtReactor.h" #include "tao/GUIResource_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { + /** * @class QtResource_Factory * @@ -62,7 +61,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_QTRESOURCE_FACTORY_H */ diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource_Loader.cpp index a735eaa6d87..70fdae3053c 100644 --- a/TAO/tao/QtResource_Loader.cpp +++ b/TAO/tao/QtResource_Loader.cpp @@ -1,14 +1,12 @@ //$Id$ -#include "tao/QtResource_Loader.h" -#include "tao/ORB_Core.h" -#include "tao/QtResource_Factory.h" +#include "QtResource_Loader.h" +#include "ORB_Core.h" +#include "QtResource_Factory.h" ACE_RCSID( TAO_QtResource, QtResource_Loader, "$Id$"); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { QtResource_Loader::QtResource_Loader (QApplication *qapp) @@ -25,5 +23,3 @@ namespace TAO { } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h index 212f2b51795..14a2e6d84b6 100644 --- a/TAO/tao/QtResource_Loader.h +++ b/TAO/tao/QtResource_Loader.h @@ -21,12 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include <qapplication.h> -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -47,12 +43,10 @@ namespace TAO class TAO_QtResource_Export QtResource_Loader { public: - QtResource_Loader (QApplication *qapp); + QtResource_Loader (QApplication *qapp); + virtual ~QtResource_Loader (void); }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_QTRESOURCE_LOADER_H */ diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp index c7caef37cc0..0839bda6455 100644 --- a/TAO/tao/Queued_Message.cpp +++ b/TAO/tao/Queued_Message.cpp @@ -1,14 +1,12 @@ +// -*- C++ -*- // $Id$ -#include "tao/Queued_Message.h" +#include "Queued_Message.h" ACE_RCSID (tao, Queued_Message, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Queued_Message::TAO_Queued_Message (TAO_ORB_Core *oc, ACE_Allocator *alloc, int is_heap_allocated) @@ -99,5 +97,3 @@ TAO_Queued_Message::push_front (TAO_Queued_Message *&head, this->prev_ = 0; head = this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index d2b1ec6c888..c078f01d6b5 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -23,14 +23,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ struct iovec; - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Message_Block; class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; /** @@ -219,8 +213,6 @@ private: TAO_Queued_Message *prev_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_QUEUED_MESSAGE_H */ diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp index de53baf576f..9c548fafaf6 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/RTCORBA/Continuous_Priority_Mapping.h" +#include "Continuous_Priority_Mapping.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -8,8 +8,6 @@ ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy) : policy_ (policy) { @@ -47,7 +45,7 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, current_native_priority = next_native_priority; } - native_priority = static_cast<RTCORBA::NativePriority> (current_native_priority); + native_priority = current_native_priority; return 1; #else @@ -130,6 +128,4 @@ TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priori } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h index a2a4b976e7a..a227587ae57 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Continuous_Priority_Mapping.h @@ -23,10 +21,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/rtcorba_export.h" -#include "tao/RTCORBA/Priority_Mapping.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "rtcorba_export.h" +#include "Priority_Mapping.h" /** * @class TAO_Continuous_Priority_Mapping @@ -46,6 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * This class was previously called Direct_Priority_Mapping. * * \nosubgrouping + * **/ class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping : public TAO_Priority_Mapping @@ -72,8 +69,6 @@ private: int max_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp index 124b0bfefa9..e415bde990a 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp @@ -4,15 +4,13 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Direct_Priority_Mapping.h" +#include "Direct_Priority_Mapping.h" #include "ace/Sched_Params.h" ACE_RCSID(RTCORBA, Direct_Priority_Mapping, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (long) { } @@ -37,6 +35,4 @@ TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h index ceee55ac971..1195b6e4f4d 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h @@ -1,6 +1,4 @@ -// -*- C++ -*- - -// ======================================================================= +//============================================================================= /** * @file Direct_Priority_Mapping.h * @@ -11,7 +9,6 @@ * * @author Carlos O'Ryan (coryan@cs.wustl.edu) */ -// ======================================================================= #ifndef TAO_DIRECT_PRIORITY_MAPPING_H #define TAO_DIRECT_PRIORITY_MAPPING_H @@ -19,7 +16,7 @@ #include "tao/orbconf.h" -#include "tao/RTCORBA/Priority_Mapping.h" +#include "Priority_Mapping.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +24,6 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Direct_Priority_Mapping * @@ -39,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping { public: - + /// Default constructor TAO_Direct_Priority_Mapping (long); /// The destructor @@ -51,9 +46,9 @@ public: virtual CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority, RTCORBA::Priority &corba_priority); -}; -TAO_END_VERSIONED_NAMESPACE_DECL +private: +}; #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp index 68d4353dbd8..084c47418b2 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp @@ -5,7 +5,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h" +#include "Linear_Network_Priority_Mapping.h" #include "tao/debug.h" #include "ace/Sched_Params.h" @@ -39,7 +39,7 @@ ACE_RCSID (RTCORBA, #define IPDSFIELD_CE_MASK 0x01 #define IPDSFIELD_DSCP_EF 0x2E -static int const dscp[] = +static int dscp [] = { IPDSFIELD_DSCP_DEFAULT , IPDSFIELD_DSCP_CS1 , @@ -65,7 +65,7 @@ static int const dscp[] = }; /* -static const char * const dscp_char[]= +static const char *dscp_char[]= { "Normal", "CS1", @@ -91,8 +91,6 @@ static const char * const dscp_char[]= }; */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Linear_Network_Priority_Mapping::TAO_Linear_Network_Priority_Mapping (long) { } @@ -137,6 +135,4 @@ TAO_Linear_Network_Priority_Mapping::to_CORBA (RTCORBA::NetworkPriority network_ return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h index 5c8410bf943..34783c3b1c5 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // ============================================================================ @@ -24,8 +22,8 @@ #include "tao/orbconf.h" -#include "tao/RTCORBA/rtcorba_export.h" -#include "tao/RTCORBA/Network_Priority_Mapping.h" +#include "rtcorba_export.h" +#include "Network_Priority_Mapping.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,8 +31,6 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Linear_Network_Priority_Mapping * @@ -46,8 +42,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping { public: - - TAO_Linear_Network_Priority_Mapping (long); + /// Default constructor + TAO_Linear_Network_Priority_Mapping (long policy); CORBA::Boolean to_network (RTCORBA::Priority corba_priority, RTCORBA::NetworkPriority &network_priority); @@ -56,8 +52,6 @@ public: RTCORBA::Priority &corba_priority); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp index f6889d5a7c5..c793c7cfa0d 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp @@ -4,7 +4,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Linear_Priority_Mapping.h" +#include "Linear_Priority_Mapping.h" #include "tao/debug.h" #include "ace/Sched_Params.h" #include "ace/Log_Msg.h" @@ -13,14 +13,11 @@ ACE_RCSID (RTCORBA, Linear_Priority_Mapping, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (long policy) : policy_ (policy) - , min_ (ACE_Sched_Params::priority_min (this->policy_)) - , max_ (ACE_Sched_Params::priority_max (this->policy_)) { + this->min_ = ACE_Sched_Params::priority_min (this->policy_); + this->max_ = ACE_Sched_Params::priority_max (this->policy_); } TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void) @@ -28,9 +25,8 @@ TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void) } CORBA::Boolean -TAO_Linear_Priority_Mapping::to_native ( - RTCORBA::Priority corba_priority, - RTCORBA::NativePriority &native_priority) +TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, + RTCORBA::NativePriority &native_priority) { if (corba_priority < RTCORBA::minPriority // The line below will always be false unless the value of @@ -60,11 +56,11 @@ TAO_Linear_Priority_Mapping::to_native ( / (RTCORBA::maxPriority - RTCORBA::minPriority)); // Now, find the value corresponding to this index. - native_priority = static_cast<RTCORBA::NativePriority> (this->min_); + native_priority = this->min_; for (int i = 2; i <= native_priority_index; ++i) { - native_priority = static_cast<RTCORBA::NativePriority> - (ACE_Sched_Params::next_priority (this->policy_, native_priority)); + native_priority = ACE_Sched_Params::next_priority (this->policy_, + native_priority); } return 1; @@ -114,9 +110,10 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, int delta = total - 1; if (delta != 0) { - corba_priority = static_cast<RTCORBA::Priority> (RTCORBA::minPriority - + ((RTCORBA::maxPriority - RTCORBA::minPriority) - * (native_priority_index - 1) / delta)); + corba_priority = + RTCORBA::minPriority + + ((RTCORBA::maxPriority - RTCORBA::minPriority) + * (native_priority_index - 1) / delta); } else { @@ -163,6 +160,4 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, #endif /* ACE_WIN32 */ } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h index 164e7f024b7..bee37377c26 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // ============================================================================ @@ -25,8 +23,8 @@ #include "tao/orbconf.h" -#include "tao/RTCORBA/rtcorba_export.h" -#include "tao/RTCORBA/Priority_Mapping.h" +#include "rtcorba_export.h" +#include "Priority_Mapping.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +32,6 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Linear_Priority_Mapping * @@ -55,22 +51,22 @@ public: /// The destructor virtual ~TAO_Linear_Priority_Mapping (void); - virtual CORBA::Boolean to_native (RTCORBA::Priority corba_priority, - RTCORBA::NativePriority &native_priority); - virtual CORBA::Boolean to_CORBA (RTCORBA::NativePriority native_priority, - RTCORBA::Priority &corba_priority); + virtual CORBA::Boolean + to_native (RTCORBA::Priority corba_priority, + RTCORBA::NativePriority &native_priority); + virtual CORBA::Boolean + to_CORBA (RTCORBA::NativePriority native_priority, + RTCORBA::Priority &corba_priority); private: /// The scheduling policy long policy_; // The range - int const min_; - int const max_; + int min_; + int max_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp index b53c0995b31..2704acc9628 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp @@ -1,4 +1,5 @@ // $Id$ +// Multi_Priority_Mapping.cpp,v 1.0 #include "tao/orbconf.h" @@ -13,22 +14,20 @@ ACE_RCSID (RTCORBA, Multi_Priority_Mapping, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping ( - int base_native_priority, - int base_corba_priority, - int priority_spacing, - int priorities_contiguous, - int policy) +TAO_Multi_Priority_Mapping::TAO_Multi_Priority_Mapping (int base_native_priority, + int base_corba_priority, + int priority_spacing, + int priorities_contiguous, + int policy) : base_native_priority_ (base_native_priority) , base_corba_priority_ (base_corba_priority) , priority_spacing_ (priority_spacing) , priorities_contiguous_(priorities_contiguous) , policy_ (policy) - , min_ (ACE_Sched_Params::priority_min (this->policy_)) - , max_ (ACE_Sched_Params::priority_max (this->policy_)) { + this->min_ = ACE_Sched_Params::priority_min (this->policy_); + this->max_ = ACE_Sched_Params::priority_max (this->policy_); + if ( this->min_ < this->max_ ) { if (base_native_priority_ < this->min_) @@ -92,7 +91,7 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, if (corba_priority == base_corba_priority_) { // If this is the highest priority endpoint, then just give it the highest priority corba base priority - native_priority = static_cast<RTCORBA::NativePriority> (base_native_priority_); + native_priority = base_native_priority_; } else { @@ -100,13 +99,11 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, { if ( this->min_ < this->max_ ) { - native_priority = static_cast<RTCORBA::NativePriority> - (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_); + native_priority = ( (corba_priority - base_corba_priority_) / priority_spacing_ ) + base_native_priority_; } else { - native_priority = static_cast<RTCORBA::NativePriority> - (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_); + native_priority = ( (base_corba_priority_ - corba_priority) / priority_spacing_ ) + base_native_priority_; } } else @@ -131,10 +128,9 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, last_priority = this->base_native_priority_; for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++) { - native_priority = static_cast<RTCORBA::NativePriority> - (ACE_Sched_Params::previous_priority (this->policy_, - last_priority, - ACE_SCOPE_THREAD)); + native_priority = ACE_Sched_Params::previous_priority (this->policy_, + last_priority, + ACE_SCOPE_THREAD); } } } @@ -163,7 +159,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, if (native_priority == base_native_priority_) { // If this is the highest priority endpoint, then just give it the highest priority corba base priority - corba_priority = static_cast<RTCORBA::Priority> (base_corba_priority_); + corba_priority = base_corba_priority_; } else { @@ -171,13 +167,11 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, { if ( this->min_ < this->max_ ) { - corba_priority = static_cast<RTCORBA::Priority> - (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_); + corba_priority = ( (native_priority - base_native_priority_) * priority_spacing_ ) + base_corba_priority_; } else { - corba_priority = static_cast<RTCORBA::Priority> - (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_); + corba_priority = ( (base_native_priority_ - native_priority) * priority_spacing_ ) + base_corba_priority_; } } else @@ -230,14 +224,11 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, priority_ndx++; } - corba_priority = static_cast<RTCORBA::Priority> - (base_corba_priority_ - priority_ndx); + corba_priority = base_corba_priority_ - priority_ndx; } } return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h index a3b3b58ec75..6d5b3623dc7 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h @@ -1,6 +1,5 @@ -// -*- C++ -*- - // $Id$ +// Multi_Priority_Mapping.h,v 1.0 // ============================================================================ // @@ -31,8 +30,6 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Multi_Priority_Mapping * @@ -44,8 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA * priorities (0...32767) */ -class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping -: public TAO_Priority_Mapping +class TAO_RTCORBA_Export TAO_Multi_Priority_Mapping : public TAO_Priority_Mapping { public: /// Default constructor @@ -86,13 +82,11 @@ private: /// The scheduling policy int policy_; - int const min_; - int const max_; + int min_; + int max_; // The range }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #endif /* TAO_MULTI_PRIORITY_MAPPING_H */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp index b896b6c61d2..cc7eb22da38 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "tao/orbconf.h" -#include "tao/RTCORBA/Network_Priority_Mapping.h" +#include "Network_Priority_Mapping.h" ACE_RCSID(RTCORBA, Network_Priority_Mapping, @@ -10,12 +10,8 @@ ACE_RCSID(RTCORBA, #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Network_Priority_Mapping::~TAO_Network_Priority_Mapping (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h index 4fa09f454f4..5c847b1f984 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -26,13 +25,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Network_Priority_Mapping * @@ -54,8 +51,6 @@ public: RTCORBA::Priority &corba_priority) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index 387adcf5677..80380c5d6ad 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -1,24 +1,22 @@ // $Id$ -#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" +#include "Network_Priority_Mapping_Manager.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #if ! defined (__ACE_INLINE__) -#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i" +#include "Network_Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (RTCORBA, Network_Priority_Mapping_Manager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager ( void ) { - delete this->mapping_; + delete mapping_; } TAO_Network_Priority_Mapping_Manager_ptr @@ -54,8 +52,5 @@ TAO_Network_Priority_Mapping_Manager::_interface_repository_id (void) const { return "IDL:Network_Priority_Mapping_Manager:1.0"; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index 7237c16ad55..bd9a33202cd 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,11 +24,9 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Network_Priority_Mapping.h" +#include "Network_Priority_Mapping.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Network_Priority_Mapping_Manager; class TAO_Network_Priority_Mapping_Manager_var; typedef TAO_Network_Priority_Mapping_Manager *TAO_Network_Priority_Mapping_Manager_ptr; @@ -147,10 +145,8 @@ private: TAO_Network_Priority_Mapping_Manager_ptr &ptr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i" +#include "Network_Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i index 919fecdfcab..6a483ec6cd9 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // Inline operations for class TAO_Network_Priority_Mapping_Manager_var // ************************************************************* @@ -211,15 +207,14 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO ACE_INLINE RTCORBA::NetworkPriorityMapping * TAO_Network_Priority_Mapping_Manager::mapping (void) { - return this->mapping_; + return mapping_; } ACE_INLINE void TAO_Network_Priority_Mapping_Manager::mapping (RTCORBA::NetworkPriorityMapping *mapping) { - delete this->mapping_; - this->mapping_ = mapping; + delete mapping_; + mapping_ = mapping; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp index ae4f6ebcf3f..99ad2c6bbfd 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp @@ -4,18 +4,13 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Priority_Mapping.h" +#include "Priority_Mapping.h" ACE_RCSID(RTCORBA, Priority_Mapping, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Priority_Mapping::~TAO_Priority_Mapping (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h index 10425814b01..0e1bcbce46e 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Priority_Mapping.h @@ -27,11 +27,9 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Priority_Mapping * @@ -53,8 +51,6 @@ public: RTCORBA::Priority &corba_priority) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 47f3804489a..11a7d1c9ed3 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -1,22 +1,20 @@ // $Id$ -#include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "Priority_Mapping_Manager.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #if ! defined (__ACE_INLINE__) -#include "tao/RTCORBA/Priority_Mapping_Manager.i" +#include "Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (RTCORBA, Priority_Mapping_Manager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void) { - delete this->mapping_; + delete mapping_; } TAO_Priority_Mapping_Manager_ptr @@ -48,7 +46,5 @@ TAO_Priority_Mapping_Manager::_interface_repository_id (void) const return "IDL:Priority_Mapping_Manager:1.0"; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index e5b63369e51..3b5d06c7808 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Priority_Mapping_Manager.h @@ -16,7 +15,7 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,11 +23,9 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Priority_Mapping.h" +#include "Priority_Mapping.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Priority_Mapping_Manager; class TAO_Priority_Mapping_Manager_var; typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr; @@ -142,10 +139,8 @@ private: TAO_Priority_Mapping_Manager_ptr &ptr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/RTCORBA/Priority_Mapping_Manager.i" +#include "Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i index 4d8fa4007ab..77eb6dec547 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // Inline operations for class TAO_Priority_Mapping_Manager_var // ************************************************************* @@ -211,14 +207,14 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap ACE_INLINE RTCORBA::PriorityMapping * TAO_Priority_Mapping_Manager::mapping (void) { - return this->mapping_; + return mapping_; } ACE_INLINE void TAO_Priority_Mapping_Manager::mapping (RTCORBA::PriorityMapping *mapping) { - delete this->mapping_; - this->mapping_ = mapping; + delete mapping_; + mapping_ = mapping; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp index 3f29493da22..f1bf07f576d 100644 --- a/TAO/tao/RTCORBA/RTCORBA.cpp +++ b/TAO/tao/RTCORBA/RTCORBA.cpp @@ -1,20 +1,16 @@ // $Id$ -#include "tao/RTCORBA/RTCORBA.h" +#include "RTCORBA.h" #if TAO_HAS_CORBA_MESSAGING == 1 -#include "tao/RTCORBA/RT_ORB_Loader.h" +#include "RT_ORB_Loader.h" ACE_RCSID (RTCORBA, RTCORBA, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void) { ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_ORB_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h index ead9d8ce329..f996f03c640 100644 --- a/TAO/tao/RTCORBA/RTCORBA.h +++ b/TAO/tao/RTCORBA/RTCORBA.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //============================================================================= @@ -21,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +29,6 @@ #if TAO_HAS_CORBA_MESSAGING == 1 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTCORBA_Export TAO_RTCORBA_Initializer { public: @@ -42,10 +38,8 @@ public: static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer; -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #endif /* TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl index 703ae6c7732..327f4441339 100644 --- a/TAO/tao/RTCORBA/RTCORBA.pidl +++ b/TAO/tao/RTCORBA/RTCORBA.pidl @@ -52,9 +52,9 @@ #ifndef _RT_CORBA_IDL_ #define _RT_CORBA_IDL_ -#include "tao/IOP.pidl" -#include "tao/TimeBase.pidl" -#include "tao/Policy.pidl" +#include <IOP.pidl> +#include <TimeBase.pidl> +#include <Policy.pidl> #pragma prefix "omg.org" diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp index 5f9260f6d8e..586a636e497 100644 --- a/TAO/tao/RTCORBA/RTCORBAA.cpp +++ b/TAO/tao/RTCORBA/RTCORBAA.cpp @@ -35,7 +35,7 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" -#include "tao/RTCORBA/RTCORBA.h" +#include "RTCORBA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" @@ -43,8 +43,6 @@ #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" #include "tao/AnyTypeCode/IOP_IORA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/alias_typecode.cpp:50 @@ -2467,5 +2465,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 59f945ff53b..bcf7695da87 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/RTCORBA/RTCORBA.h" +#include "RTCORBA.h" #include "tao/CDR.h" #include "tao/Basic_Arguments.h" #include "tao/Special_Basic_Arguments.h" @@ -43,8 +43,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -2783,5 +2781,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 036bf70b06a..4b2fd379263 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -44,8 +44,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTCORBA/rtcorba_export.h" -#include "tao/RTCORBA/rtcorba_typedefs.h" +#include "rtcorba_export.h" +#include "rtcorba_typedefs.h" #include "tao/ORB.h" #include "tao/TimeBaseC.h" #include "tao/SystemException.h" @@ -78,8 +78,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace RTCORBA { @@ -3500,8 +3498,6 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h index 1b7cc8c0f9a..a37e92f1656 100644 --- a/TAO/tao/RTCORBA/RTCORBA_includeC.h +++ b/TAO/tao/RTCORBA/RTCORBA_includeC.h @@ -40,7 +40,7 @@ #include "tao/CDR.h" #include "tao/Environment.h" -#include "tao/RTCORBA/RTCORBA.h" +#include "RTCORBA.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // .\be\be_visitor_traits.cpp:50 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { @@ -76,8 +74,6 @@ namespace TAO // TAO_IDL - Generated from // w:\ace_wrappers\tao\tao_idl\be\be_visitor_root/cdr_op.cpp:48 -TAO_END_VERSIONED_NAMESPACE_DECL - #ifndef __ACE_INLINE__ // TAO_IDL - Generated from diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index 5c9170dd78e..9bc7068f28c 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "tao/RTCORBA/RT_Current.h" +#include "RT_Current.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Priority_Mapping.h" +#include "Priority_Mapping.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" @@ -18,8 +18,6 @@ ACE_RCSID (RTCORBA, RT_Current, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core) : orb_core_ (orb_core) { @@ -67,6 +65,4 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO)); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 58b994d0bee..eed5b7e39f9 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -20,7 +20,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" @@ -34,8 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Current * @@ -44,8 +42,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * Allows setting/getting the priority of the current thread. */ class TAO_RTCORBA_Export TAO_RT_Current - : public RTCORBA::Current - , public TAO_Local_RefCounted_Object + : public RTCORBA::Current, + public TAO_Local_RefCounted_Object { public: @@ -68,12 +66,10 @@ protected: private: /// ORB Core that owns us. - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp index a74d7ea7277..874795e7a10 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -1,10 +1,10 @@ -#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" +#include "RT_Endpoint_Selector_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h" -#include "tao/RTCORBA/RT_Endpoint_Utils.h" -#include "tao/RTCORBA/RT_Stub.h" +#include "RT_Invocation_Endpoint_Selectors.h" +#include "RT_Endpoint_Utils.h" +#include "RT_Stub.h" #include "tao/Protocols_Hooks.h" @@ -18,8 +18,6 @@ ACE_RCSID (RTCORBA, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void) { ACE_NEW (this->rt_invocation_endpoint_selector_, @@ -37,8 +35,6 @@ RT_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return this->rt_invocation_endpoint_selector_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (RT_Endpoint_Selector_Factory, diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index f361563ad22..b6b5eca2d76 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -18,7 +18,7 @@ #define RT_ENDPOINT_SELECTOR_FACTORY_H #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,8 +31,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RT_Invocation_Endpoint_Selector; // **************************************************************** @@ -67,8 +65,6 @@ private: TAO_RT_Invocation_Endpoint_Selector *rt_invocation_endpoint_selector_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, RT_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, RT_Endpoint_Selector_Factory) diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index 841c73bc6dc..51be9a65283 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -1,12 +1,12 @@ -#include "tao/RTCORBA/RT_Endpoint_Utils.h" +#include "RT_Endpoint_Utils.h" #include "tao/Profile_Transport_Resolver.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" -#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h" +#include "RT_Endpoint_Selector_Factory.h" +#include "RT_Invocation_Endpoint_Selectors.h" -#include "tao/RTCORBA/RT_Stub.h" +#include "RT_Stub.h" ACE_RCSID (RTCORBA, RT_Endpoint_Utils, @@ -14,8 +14,6 @@ ACE_RCSID (RTCORBA, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy * TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, TAO::Profile_Transport_Resolver &r @@ -51,6 +49,4 @@ TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type, return policy; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h index 649c3ca2896..26dd559c5c7 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +27,6 @@ #include "tao/Policy_ForwardC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class Profile_Transport_Resolver; @@ -53,8 +51,6 @@ private: TAO_RT_Endpoint_Utils (); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* RT_ENDPOINT_UTILS_H */ diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 6e712fe4fc9..eff4b4a1520 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -1,13 +1,13 @@ -#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h" +#include "RT_Invocation_Endpoint_Selectors.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Policy_i.h" -#include "tao/RTCORBA/RT_Stub.h" -#include "tao/RTCORBA/RT_Transport_Descriptor.h" -#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" -#include "tao/RTCORBA/RT_Endpoint_Utils.h" -#include "tao/RTCORBA/RT_Protocols_Hooks.h" +#include "RT_Policy_i.h" +#include "RT_Stub.h" +#include "RT_Transport_Descriptor.h" +#include "RT_Transport_Descriptor_Property.h" +#include "RT_Endpoint_Utils.h" +#include "RT_Protocols_Hooks.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" @@ -22,8 +22,6 @@ ACE_RCSID (RTCORBA, RT_Invocation_Endpoint_Selectors, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( TAO::Profile_Transport_Resolver *r, @@ -375,6 +373,4 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h index 4c6d75e022e..539cc86f44b 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,12 +30,10 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RTCORBA.h" +#include "RTCORBA.h" #include "tao/Invocation_Endpoint_Selectors.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Invocation_Endpoint_Selector * @@ -45,8 +43,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * private connection policy. * **/ -class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector - : public TAO_Invocation_Endpoint_Selector +class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector : + public TAO_Invocation_Endpoint_Selector { public: @@ -68,8 +66,6 @@ protected: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index 701505481ee..43dd460981a 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -1,16 +1,18 @@ // $Id$ -#include "tao/RTCORBA/RT_Mutex.h" +#include "RT_Mutex.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_ORB.h" +#include "RT_ORB.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID(RTCORBA, RT_Mutex, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_RT_Mutex::TAO_RT_Mutex (void) +{ +} TAO_RT_Mutex::~TAO_RT_Mutex (void) { @@ -76,7 +78,7 @@ TAO_RT_Mutex::name (void) const return 0; } -/////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// #if (TAO_HAS_NAMED_RT_MUTEXES == 1) TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name) : name_ (name) @@ -90,8 +92,6 @@ TAO_Named_RT_Mutex::name (void) const } #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ -/////////////////////////////////////////////////////////////////////////////// - -TAO_END_VERSIONED_NAMESPACE_DECL +//////////////////////////////////////////////////////////////////////////////// #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 2381712964f..c12409e8cd0 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file RT_Mutex.h @@ -24,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" @@ -38,8 +37,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Mutex * @@ -56,6 +53,11 @@ class TAO_RTCORBA_Export TAO_RT_Mutex public TAO_Local_RefCounted_Object { public: + /// Constructor. + TAO_RT_Mutex (void); + + /// Destructor. + virtual ~TAO_RT_Mutex (void); /// Acquire the lock. virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) @@ -79,11 +81,6 @@ public: virtual const char *name (void) const; protected: - - /// Destructor. - virtual ~TAO_RT_Mutex (void); - -protected: /// Synchronization lock. TAO_SYNCH_MUTEX mu_; }; @@ -111,8 +108,6 @@ protected: }; #endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 7f6e2cc028b..6d996e8e171 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/RTCORBA/RT_ORB.h" +#include "RT_ORB.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Policy_i.h" -#include "tao/RTCORBA/RT_Mutex.h" -#include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "RT_Policy_i.h" +#include "RT_Mutex.h" +#include "Priority_Mapping_Manager.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/RTCORBA/Thread_Pool.h" @@ -17,20 +17,16 @@ ACE_RCSID(RTCORBA, RT_ORB, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core, - ACE_Time_Value const &dynamic_thread_idle_timeout) +TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core) : orb_core_ (orb_core), mutex_mgr_ (), - tp_manager_ (0), - dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout) + tp_manager_ (0) { TAO_Thread_Lane_Resources_Manager *thread_lane_resources_manager = &this->orb_core_->thread_lane_resources_manager (); TAO_RT_Thread_Lane_Resources_Manager *rt_thread_lane_resources_manager = - dynamic_cast <TAO_RT_Thread_Lane_Resources_Manager *> (thread_lane_resources_manager); + (TAO_RT_Thread_Lane_Resources_Manager *) thread_lane_resources_manager; this->tp_manager_ = &rt_thread_lane_resources_manager->tp_manager (); @@ -370,8 +366,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize, default_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - this->dynamic_thread_idle_timeout_ + max_request_buffer_size ACE_ENV_ARG_PARAMETER); } @@ -390,8 +385,7 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - this->dynamic_thread_idle_timeout_ + max_request_buffer_size ACE_ENV_ARG_PARAMETER); } @@ -552,8 +546,6 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb) } -TAO_END_VERSIONED_NAMESPACE_DECL - -/////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 612108d048d..9b5daea2202 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" @@ -37,8 +37,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward reference for TAO_Named_RT_Mutex_Manager class TAO_RT_Mutex; class TAO_Thread_Pool_Manager; @@ -107,9 +105,8 @@ class TAO_RTCORBA_Export TAO_RT_ORB public TAO_Local_RefCounted_Object { public: - /// Constructor. - TAO_RT_ORB (TAO_ORB_Core *orb_core, ACE_Time_Value const &dynamic_thread_idle_timeout); + TAO_RT_ORB (TAO_ORB_Core *orb_core); /** * Create a new mutex. Mutexes returned by this method @@ -305,28 +302,20 @@ public: static int modify_thread_scheduling_policy (CORBA::ORB_ptr orb); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_RT_ORB (void); -protected: - /// Reference to our creating ORB Core. - TAO_ORB_Core * const orb_core_; + TAO_ORB_Core *orb_core_; /// mutex_mgr_ manages the names associated with named mutexes. TAO_Named_RT_Mutex_Manager mutex_mgr_; /// Thread Pool Manager TAO_Thread_Pool_Manager *tp_manager_; - - /// Dynamic thread idle timeout - ACE_Time_Value const dynamic_thread_idle_timeout_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 464c35660aa..58c599a21ad 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -1,4 +1,4 @@ -#include "tao/RTCORBA/RT_ORBInitializer.h" +#include "RT_ORBInitializer.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -11,21 +11,21 @@ ACE_RCSID (RTCORBA, #include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RT_Policy_i.h" -#include "tao/RTCORBA/RT_PolicyFactory.h" -#include "tao/RTCORBA/RT_Protocols_Hooks.h" -#include "tao/RTCORBA/Priority_Mapping_Manager.h" -#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" -#include "tao/RTCORBA/RT_ORB_Loader.h" -#include "tao/RTCORBA/RT_Stub_Factory.h" -#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" -#include "tao/RTCORBA/Continuous_Priority_Mapping.h" -#include "tao/RTCORBA/Linear_Priority_Mapping.h" -#include "tao/RTCORBA/Direct_Priority_Mapping.h" -#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h" -#include "tao/RTCORBA/RT_ORB.h" -#include "tao/RTCORBA/RT_Current.h" -#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h" +#include "RT_Policy_i.h" +#include "RT_PolicyFactory.h" +#include "RT_Protocols_Hooks.h" +#include "Priority_Mapping_Manager.h" +#include "Network_Priority_Mapping_Manager.h" +#include "RT_ORB_Loader.h" +#include "RT_Stub_Factory.h" +#include "RT_Endpoint_Selector_Factory.h" +#include "Continuous_Priority_Mapping.h" +#include "Linear_Priority_Mapping.h" +#include "Direct_Priority_Mapping.h" +#include "Linear_Network_Priority_Mapping.h" +#include "RT_ORB.h" +#include "RT_Current.h" +#include "RT_Thread_Lane_Resources_Manager.h" #include "tao/Exception.h" #include "tao/ORB_Core.h" @@ -36,28 +36,24 @@ ACE_RCSID (RTCORBA, #include "ace/Svc_Conf.h" #include "ace/Sched_Params.h" -static const char rt_poa_factory_name[] = "TAO_RT_Object_Adapter_Factory"; -static const ACE_TCHAR rt_poa_factory_directive[] = +static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory"; +static const ACE_TCHAR *rt_poa_factory_directive = ACE_DYNAMIC_SERVICE_DIRECTIVE( "TAO_RT_Object_Adapter_Factory", "TAO_RTPortableServer", "_make_TAO_RT_Object_Adapter_Factory", ""); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type, int network_priority_mapping_type, int ace_sched_policy, long sched_policy, - long scope_policy, - ACE_Time_Value const &dynamic_thread_idle_timeout) + long scope_policy) : priority_mapping_type_ (priority_mapping_type), network_priority_mapping_type_ (network_priority_mapping_type), ace_sched_policy_ (ace_sched_policy), sched_policy_ (sched_policy), - scope_policy_ (scope_policy), - dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout) + scope_policy_ (scope_policy) { } @@ -89,7 +85,7 @@ TAO_RT_ORBInitializer::pre_init ( // If the application resolves the root POA, make sure we load the RT POA. TAO_ORB_Core::set_poa_factory (rt_poa_factory_name, - ACE_TEXT_ALWAYS_CHAR (rt_poa_factory_directive)); + ACE_TEXT_TO_CHAR_IN (rt_poa_factory_directive)); // Create the initial priority mapping instance. TAO_Priority_Mapping *pm = 0; @@ -122,6 +118,7 @@ TAO_RT_ORBInitializer::pre_init ( CORBA::COMPLETED_NO)); ACE_CHECK; + TAO_Priority_Mapping_Manager_var safe_manager = manager; info->register_initial_reference ("PriorityMappingManager", @@ -187,8 +184,7 @@ TAO_RT_ORBInitializer::pre_init ( // Create the RT_ORB. CORBA::Object_ptr rt_orb = CORBA::Object::_nil (); ACE_NEW_THROW_EX (rt_orb, - TAO_RT_ORB (tao_info->orb_core (), - dynamic_thread_idle_timeout_), + TAO_RT_ORB (tao_info->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, @@ -261,7 +257,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( // Bind the same policy factory to all RTCORBA related policy // types since a single policy factory is used to create each of // the different types of RTCORBA policies. - static CORBA::PolicyType const type[] = { + CORBA::PolicyType type[] = { RTCORBA::PRIORITY_MODEL_POLICY_TYPE, RTCORBA::THREADPOOL_POLICY_TYPE, RTCORBA::SERVER_PROTOCOL_POLICY_TYPE, @@ -273,7 +269,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); - for (CORBA::PolicyType const * i = type; + for (CORBA::PolicyType *i = type; i != end; ++i) { @@ -307,6 +303,4 @@ TAO_RT_ORBInitializer::register_policy_factories ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index c2f04c46c04..be73cbd49d0 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -20,7 +20,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,12 +37,10 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// RTCORBA ORB initializer. -class TAO_RT_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object +class TAO_RTCORBA_Export TAO_RT_ORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: /// Priority mapping types @@ -62,8 +60,7 @@ public: int network_priority_mapping_type, int ace_sched_policy, long sched_policy, - long scope_policy, - ACE_Time_Value const &dynamic_thread_idle_timeout); + long scope_policy); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -89,10 +86,10 @@ private: PortableInterceptor::PolicyFactory_var policy_factory_; /// Priority mapping type. - int const priority_mapping_type_; + int priority_mapping_type_; /// Network Priority mapping type. - int const network_priority_mapping_type_; + int network_priority_mapping_type_; /// Scheduling policy. /** @@ -102,7 +99,7 @@ private: * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR, * ACE_SCHED_FIFO, and ACE_SCHED_OTHER. */ - int const ace_sched_policy_; + int ace_sched_policy_; /// Scheduling policy flag. /** @@ -111,7 +108,7 @@ private: * thread creation functions. Legal values are THR_SCHED_RR, * THR_SCHED_FIFO, and THR_SCHED_DEFAULT. */ - long const sched_policy_; + long sched_policy_; /// Scheduling scope flag. /** @@ -120,20 +117,10 @@ private: * thread creation functions. Legal values are THR_SCOPE_SYSTEM and * THR_SCOPE_PROCESS. */ - long const scope_policy_; + long scope_policy_; - /// Dynamic thread idle timeout - /** - * When using thread pool a certain number of dynamic threads can be created. - * By default these threads are created when needed but never end, when this - * timeout is specified the threads end themselves at the moment they - * have not been serving any requests for the specified amount of time - */ - ACE_Time_Value const dynamic_thread_idle_timeout_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 381da1bd572..b395043b553 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -1,21 +1,23 @@ -#include "tao/RTCORBA/RT_ORB_Loader.h" +#include "RT_ORB_Loader.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_ORBInitializer.h" +#include "RT_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/ORBInitializer_Registry.h" #include "tao/SystemException.h" #include "ace/OS_NS_strings.h" -#include "ace/Arg_Shifter.h" ACE_RCSID (RTCORBA, RT_ORB_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void) +{ +} TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void) { @@ -27,13 +29,13 @@ TAO_RT_ORB_Loader::init (int argc, { ACE_TRACE ("TAO_RT_ORB_Loader::init"); - static bool initialized = false; + static int initialized = 0; // Only allow initialization once. if (initialized) return 0; - initialized = true; + initialized = 1; // Set defaults. int priority_mapping_type = @@ -44,113 +46,114 @@ TAO_RT_ORB_Loader::init (int argc, long sched_policy = THR_SCHED_DEFAULT; long scope_policy = THR_SCOPE_PROCESS; int curarg = 0; - ACE_Time_Value dynamic_thread_idle_timeout; - - ACE_Arg_Shifter arg_shifter (argc, argv); // Parse any service configurator parameters. - while (arg_shifter.is_anything_left ()) - { - const ACE_TCHAR *current_arg = 0; - if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBPriorityMapping")))) - { - const ACE_TCHAR *name = current_arg; - if (ACE_OS::strcasecmp (name, - ACE_TEXT("continuous")) == 0) - priority_mapping_type = - TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("linear")) == 0) - priority_mapping_type = - TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("direct")) == 0) - priority_mapping_type = - TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT; - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("RT_ORB_Loader - unknown argument") - ACE_TEXT(" <%s> for -ORBPriorityMapping\n"), - name)); - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBSchedPolicy")))) - { - const ACE_TCHAR *name = current_arg; - if (ACE_OS::strcasecmp (name, - ACE_TEXT("SCHED_OTHER")) == 0) - { - ace_sched_policy = ACE_SCHED_OTHER; - sched_policy = THR_SCHED_DEFAULT; - } - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("SCHED_FIFO")) == 0) - { - ace_sched_policy = ACE_SCHED_FIFO; - sched_policy = THR_SCHED_FIFO; - } - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("SCHED_RR")) == 0) - { - ace_sched_policy = ACE_SCHED_RR; - sched_policy = THR_SCHED_RR; - } - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("RT_ORB_Loader - unknown argument") - ACE_TEXT(" <%s> for -ORBSchedPolicy\n"), - name)); - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBScopePolicy")))) - { - const ACE_TCHAR *name = current_arg; - if (ACE_OS::strcasecmp (name, - ACE_TEXT("SYSTEM")) == 0) - scope_policy = THR_SCOPE_SYSTEM; - else if (ACE_OS::strcasecmp (name, - ACE_TEXT("PROCESS")) == 0) - scope_policy = THR_SCOPE_PROCESS; - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("RT_ORB_Loader - unknown argument") - ACE_TEXT(" <%s> for -ORBScopePolicy\n"), - name)); - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-RTORBNetworkPriorityMapping")))) - { - const ACE_TCHAR *name = current_arg; - if (ACE_OS::strcasecmp (name, - ACE_TEXT("linear")) == 0) + for (curarg = 0; curarg < argc; curarg++) + if (ACE_OS::strcasecmp (argv[curarg], + ACE_TEXT("-ORBPriorityMapping")) == 0) + { + curarg++; + if (curarg < argc) + { + ACE_TCHAR* name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + ACE_TEXT("continuous")) == 0) + priority_mapping_type = + TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS; + else if (ACE_OS::strcasecmp (name, + ACE_TEXT("linear")) == 0) + priority_mapping_type = + TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR; + else if (ACE_OS::strcasecmp (name, + ACE_TEXT("direct")) == 0) + priority_mapping_type = + TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT; + else + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("RT_ORB_Loader - unknown argument") + ACE_TEXT(" <%s> for -ORBPriorityMapping\n"), + name)); + } + } + else if (ACE_OS::strcasecmp (argv[curarg], + ACE_TEXT("-ORBSchedPolicy")) == 0) + { + curarg++; + if (curarg < argc) + { + ACE_TCHAR* name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + ACE_TEXT("SCHED_OTHER")) == 0) + { + ace_sched_policy = ACE_SCHED_OTHER; + sched_policy = THR_SCHED_DEFAULT; + } + else if (ACE_OS::strcasecmp (name, + ACE_TEXT("SCHED_FIFO")) == 0) + { + ace_sched_policy = ACE_SCHED_FIFO; + sched_policy = THR_SCHED_FIFO; + } + else if (ACE_OS::strcasecmp (name, + ACE_TEXT("SCHED_RR")) == 0) + { + ace_sched_policy = ACE_SCHED_RR; + sched_policy = THR_SCHED_RR; + } + else + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("RT_ORB_Loader - unknown argument") + ACE_TEXT(" <%s> for -ORBSchedPolicy\n"), + name)); + } + } + else if (ACE_OS::strcasecmp (argv[curarg], + ACE_TEXT("-ORBScopePolicy")) == 0) + { + curarg++; + if (curarg < argc) + { + ACE_TCHAR* name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + ACE_TEXT("SYSTEM")) == 0) + scope_policy = THR_SCOPE_SYSTEM; + else if (ACE_OS::strcasecmp (name, + ACE_TEXT("PROCESS")) == 0) + scope_policy = THR_SCOPE_PROCESS; + else + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT("RT_ORB_Loader - unknown argument") + ACE_TEXT(" <%s> for -ORBScopePolicy\n"), + name)); + } + } + else if (ACE_OS::strcasecmp (argv[curarg], + ACE_TEXT("-ORBNetworkPriorityMapping")) == 0) + { + curarg++; + if (curarg < argc) + { + ACE_TCHAR* name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + ACE_TEXT("linear")) == 0) network_priority_mapping_type = TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR; - arg_shifter.consume_arg (); - } - else if (0 != (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-RTORBDynamicThreadIdleTimeout")))) - { - const ACE_TCHAR *name = current_arg; - int timeout = ACE_OS::atoi (name); - dynamic_thread_idle_timeout = ACE_Time_Value (0, timeout); - arg_shifter.consume_arg (); - } + } + } else { - arg_shifter.ignore_arg (); if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT("RT_ORB_Loader: Unknown option ") - ACE_TEXT("<%s>.\n"), - argv[curarg])); - } + { + ACE_DEBUG ((LM_ERROR, + ACE_TEXT("RT_ORB_Loader: Unknown option ") + ACE_TEXT("<%s>.\n"), + argv[curarg])); + } } - } // Register the ORB initializer. ACE_TRY_NEW_ENV @@ -164,8 +167,7 @@ TAO_RT_ORB_Loader::init (int argc, network_priority_mapping_type, ace_sched_policy, sched_policy, - scope_policy, - dynamic_thread_idle_timeout), + scope_policy), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, @@ -192,8 +194,6 @@ TAO_RT_ORB_Loader::init (int argc, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_ORB_Loader) diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h index a3e2d4cd375..402c314f403 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.h +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,7 +17,7 @@ #define TAO_RT_ORB_LOADER_H #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #include "tao/orbconf.h" @@ -30,13 +30,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object { public: + /// Constructor. + TAO_RT_ORB_Loader (void); /// Destructor. virtual ~TAO_RT_ORB_Loader (void); @@ -46,8 +46,6 @@ public: ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_ORB_Loader) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_ORB_Loader) diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp index cd80662c192..7e5bd32fd68 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp @@ -1,4 +1,4 @@ -#include "tao/RTCORBA/RT_PolicyFactory.h" +#include "RT_PolicyFactory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -6,13 +6,11 @@ ACE_RCSID (RTCORBA, RT_PolicyFactory, "$Id$") -#include "tao/RTCORBA/RT_Policy_i.h" +#include "RT_Policy_i.h" #include "tao/PolicyC.h" #include "tao/ORB_Constants.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Policy_ptr TAO_RT_PolicyFactory::create_policy ( CORBA::PolicyType type, @@ -104,6 +102,4 @@ TAO_RT_PolicyFactory::_create_policy ( CORBA::Policy::_nil ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index 6229e74af12..3fa55b3afe8 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -21,7 +21,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -37,10 +37,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Policy factory for all RTCORBA related policies. -class TAO_RT_PolicyFactory +class TAO_RTCORBA_Export TAO_RT_PolicyFactory : public PortableInterceptor::PolicyFactory, public CORBA::LocalObject { @@ -58,8 +56,6 @@ public: CORBA::PolicyError)); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index a9f893c31e3..3cd3f89a885 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/RTCORBA/RT_Policy_i.h" +#include "RT_Policy_i.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -18,11 +18,8 @@ ACE_RCSID (RTCORBA, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_PriorityModelPolicy::TAO_PriorityModelPolicy ( - RTCORBA::PriorityModel priority_model, - RTCORBA::Priority server_priority) +TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model, + RTCORBA::Priority server_priority) : ACE_NESTED_CLASS (CORBA, Object) () , ACE_NESTED_CLASS (CORBA, Policy) () , ACE_NESTED_CLASS (CORBA, LocalObject) () @@ -1405,6 +1402,4 @@ TAO_Protocol_Properties_Factory::create_orb_protocol_property (IOP::ProfileId id return property; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index ed8e1cfe6a4..689ee8e961e 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" @@ -38,8 +38,6 @@ #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_PriorityModelPolicy * @@ -894,13 +892,10 @@ public: */ static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id); -private: - +protected: TAO_Protocol_Properties_Factory (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 9dba0b882b0..2f79523a96f 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -1,10 +1,10 @@ -#include "tao/RTCORBA/RT_Protocols_Hooks.h" +#include "RT_Protocols_Hooks.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Policy_i.h" -#include "tao/RTCORBA/Priority_Mapping_Manager.h" -#include "tao/RTCORBA/RT_Stub.h" +#include "RT_Policy_i.h" +#include "Priority_Mapping_Manager.h" +#include "RT_Stub.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" @@ -26,15 +26,11 @@ ACE_RCSID (RTCORBA, RT_Protocols_Hooks, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RT_Protocols_Hooks::TAO_RT_Protocols_Hooks (void) - : orb_core_ (0) - , current_ () { } - TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void) { } @@ -815,8 +811,6 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority ( return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks, ACE_TEXT ("RT_Protocols_Hooks"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index a1542f2e2a8..f5bc260e298 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -1,3 +1,4 @@ + // -*- C++ -*- // =================================================================== @@ -7,6 +8,7 @@ * $Id$ * * @author Priyanka Gontla <pgontla@ece.uci.edu> + * */ // =================================================================== @@ -19,8 +21,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/Priority_Mapping_Manager.h" -#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" +#include "Priority_Mapping_Manager.h" +#include "Network_Priority_Mapping_Manager.h" #include "tao/Protocols_Hooks.h" @@ -30,12 +32,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks { public: - /// Constructor TAO_RT_Protocols_Hooks (void); @@ -175,8 +174,6 @@ protected: RTCORBA::ProtocolProperties_ptr protocol_properties ACE_ENV_ARG_DECL); -protected: - TAO_ORB_Core *orb_core_; // Save a reference to the priority mapping manager. @@ -186,8 +183,6 @@ protected: RTCORBA::Current_var current_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks) diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index fe828a2bb5f..6804f192d18 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "tao/RTCORBA/RT_Stub.h" +#include "RT_Stub.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Policy_i.h" +#include "RT_Policy_i.h" #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "tao/Policy_Manager.h" @@ -15,8 +15,6 @@ ACE_RCSID (RTCORBA, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Stub::TAO_RT_Stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core) @@ -299,6 +297,4 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) 0); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index fcaf8a32562..a2c18299ba6 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file RT_Stub.h @@ -23,7 +21,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #include "tao/Stub.h" @@ -31,14 +29,14 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward references. class TAO_PriorityModelPolicy; class TAO_PriorityBandedConnectionPolicy; class TAO_ClientProtocolPolicy; class TAO_PrivateConnectionPolicy; + + /** * @class TAO_RT_Stub * @@ -125,14 +123,17 @@ private: CORBA::Boolean are_policies_parsed_; private: - // = Disallow copying and assignment. - TAO_RT_Stub (const TAO_RT_Stub &); - TAO_RT_Stub &operator = (const TAO_RT_Stub &); - + // = Disallow copy constructor and assignment operator. + ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &)) + ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub &operator = (const TAO_RT_Stub &)) + +#if defined (__GNUG__) + // G++ (even 2.6.3) stupidly thinks instances can't be created. + // This de-warns. + friend class everyone_needs_a_friend; +#endif /* __GNUG__ */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp index 84f376955cd..b28965a7891 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/RTCORBA/RT_Stub_Factory.h" +#include "RT_Stub_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/RT_Stub.h" +#include "RT_Stub.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" @@ -16,8 +16,6 @@ ACE_RCSID (RTCORBA, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void) { } @@ -42,8 +40,6 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id, return retval; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_RT_Stub_Factory, diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index 27a8f8cf712..213f88bab1f 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file RT_Stub_Factory.h @@ -10,6 +8,7 @@ * This class creates the default stub, that is used in * plain CORBA. * + * * @author Angelo Corsaro <corsaro@cs.wustl.edu> * @author Frank Hunleth <fhunleth@cs.wustl.edu> */ @@ -24,7 +23,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +33,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Stub_Factory * @@ -57,8 +54,6 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Stub_Factory) diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index 1b7aa28ff78..fbde6dd0101 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -16,8 +16,6 @@ ACE_RCSID (RTCORBA, #include "tao/LF_Follower.h" #include "tao/Leader_Follower.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : TAO_Thread_Lane_Resources_Manager (orb_core), default_lane_resources_ (0), @@ -147,8 +145,6 @@ TAO_RT_Thread_Lane_Resources_Manager_Factory::create_thread_lane_resources_manag return manager; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_RT_Thread_Lane_Resources_Manager_Factory, ACE_TEXT ("RT_Thread_Lane_Resources_Manager_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index a1cfe5cdbf8..ef95981c8be 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file RT_Thread_Lane_Resources_Manager.h @@ -26,9 +24,6 @@ #include "tao/Thread_Lane_Resources_Manager.h" #include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Thread_Pool_Manager; /** @@ -105,8 +100,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp index 0058ea2023c..8eb6ded878a 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "tao/RTCORBA/RT_Transport_Descriptor.h" +#include "RT_Transport_Descriptor.h" #include "ace/OS_Memory.h" #if ! defined (__ACE_INLINE__) -#include "tao/RTCORBA/RT_Transport_Descriptor.inl" +#include "RT_Transport_Descriptor.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$") -#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" +#include "RT_Transport_Descriptor_Property.h" #include "tao/Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Transport_Descriptor::~TAO_RT_Transport_Descriptor () { if (this->delete_properties_ == 1) @@ -114,5 +112,3 @@ TAO_RT_Transport_Descriptor::hash (void) const { return this->endpoint_->hash (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h index bbf8f97ee28..b485d8484a5 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_Transport_Descriptor.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_H @@ -13,18 +14,16 @@ #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" +#include "RT_Transport_Descriptor_Property.h" #include "tao/Transport_Descriptor_Interface.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Transport_Descriptor * @@ -69,10 +68,8 @@ private: int delete_properties_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/RTCORBA/RT_Transport_Descriptor.inl" +#include "RT_Transport_Descriptor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl index 3afd7b186e8..0c158812e9f 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_RT_Transport_Descriptor::TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint, CORBA::Boolean flag) @@ -20,5 +16,3 @@ TAO_RT_Transport_Descriptor::insert (TAO_RT_Transport_Descriptor_Property *descr this->property_list_ = descriptor_property; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp index 020fe70267a..bc59aab60d0 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp @@ -1,19 +1,17 @@ // $Id$ -#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" +#include "RT_Transport_Descriptor_Property.h" #include "ace/OS_Memory.h" #if ! defined (__ACE_INLINE__) -#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl" +#include "RT_Transport_Descriptor_Property.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (RTCORBA, TAO_RT_Transport_Descriptor_Property, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Transport_Descriptor_Property::~TAO_RT_Transport_Descriptor_Property (void) { } @@ -76,5 +74,3 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::is_equivalent (const TAO this->low_priority_ == rhs->low_priority_ && this->high_priority_ == rhs->high_priority_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index cf38816b4d6..b0645d68e9f 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -1,11 +1,12 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ /** * @file RT_Transport_Descriptor_Property.h * * $Id$ * * @author Pradeep Gore <pradeep@oomworks.com> + * + * */ #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H @@ -13,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTCORBA/rtcorba_export.h" +#include "rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +24,6 @@ #include "ace/Global_Macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Transport_Descriptor_Property * @@ -51,9 +50,9 @@ protected: TAO_RT_Transport_Descriptor_Property* next_; private: - // = Disallow copying and assignment. - TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &); - TAO_RT_Transport_Descriptor_Property & operator= (const TAO_RT_Transport_Descriptor_Property &); + // = Disallow copy constructor and assignment operator. + ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &)) + ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property &operator = (const TAO_RT_Transport_Descriptor_Property &)) }; /** @@ -94,7 +93,7 @@ private: }; -/*****************************************************************************/ +/*************************************************************************************************/ /** * @class TAO_RT_Transport_Descriptor_Banded_Connection_Property @@ -131,12 +130,10 @@ protected: CORBA::Short high_priority_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - -/*****************************************************************************/ +/*************************************************************************************************/ #if defined (__ACE_INLINE__) -#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl" +#include "RT_Transport_Descriptor_Property.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl index 89c98fe4485..c6646a943fb 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void) : next_ (0) @@ -53,5 +49,3 @@ TAO_RT_Transport_Descriptor_Banded_Connection_Property::init (CORBA::Short low_p this->low_priority_ = low_priority; this->high_priority_ = high_priority; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index f63d8809bb5..f274fb38a18 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -1,4 +1,4 @@ -#include "tao/RTCORBA/Thread_Pool.h" +#include "Thread_Pool.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -7,7 +7,7 @@ ACE_RCSID (RTCORBA, "$Id$") #if ! defined (__ACE_INLINE__) -#include "tao/RTCORBA/Thread_Pool.inl" +#include "Thread_Pool.inl" #endif /* __ACE_INLINE__ */ #include "tao/Exception.h" @@ -22,8 +22,6 @@ ACE_RCSID (RTCORBA, #include "tao/Leader_Follower.h" #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator ( TAO_Thread_Lane &lane) : lane_ (lane) @@ -56,10 +54,14 @@ TAO_Thread_Pool_Threads::svc (void) TAO_Thread_Pool_Threads::set_tss_resources (orb_core, this->lane_); + CORBA::ORB_ptr orb = + orb_core.orb (); + ACE_TRY_NEW_ENV { - // Do the work - this->run (orb_core); + // Run the ORB. + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; } ACE_CATCHANY { @@ -75,18 +77,6 @@ TAO_Thread_Pool_Threads::svc (void) return 0; } -int -TAO_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER) -{ - CORBA::ORB_ptr orb = orb_core.orb (); - - // Run the ORB. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - return 0; -} - void TAO_Thread_Pool_Threads::set_tss_resources (TAO_ORB_Core &orb_core, TAO_Thread_Lane &thread_lane) @@ -99,67 +89,23 @@ TAO_Thread_Pool_Threads::set_tss_resources (TAO_ORB_Core &orb_core, tss.lane_ = &thread_lane; } -TAO_Dynamic_Thread_Pool_Threads::TAO_Dynamic_Thread_Pool_Threads (TAO_Thread_Lane &lane) - : TAO_Thread_Pool_Threads (lane) -{ -} - -int -TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER) -{ - CORBA::ORB_ptr orb = orb_core.orb (); - - if (this->lane_.dynamic_thread_idle_timeout () == ACE_Time_Value::zero) - { - // No timeout specified, run the ORB until it shutdowns - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - else - { - // A timeout is specified, run the ORB in an idle loop, if we - // don't handle any operations for the given timeout we just - // exit the loop and this thread ends itself. - ACE_Time_Value tv (this->lane_.dynamic_thread_idle_timeout ()); - while (!orb_core.has_shutdown () && orb->work_pending (tv)) - { - orb->perform_work (); - tv = this->lane_.dynamic_thread_idle_timeout (); - } - - if (TAO_debug_level > 7) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n") - ACE_TEXT ("Current number of dynamic threads left = %d; ") - ACE_TEXT ("RTCorba worker thread is ending!\n"), - this->lane_.pool ().id (), - this->lane_.id (), - this->thr_count () - 1)); - } - - return 0; -} - TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool, CORBA::ULong id, CORBA::Short lane_priority, CORBA::ULong static_threads, - CORBA::ULong dynamic_threads, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong dynamic_threads ACE_ENV_ARG_DECL_NOT_USED) : pool_ (pool), id_ (id), lane_priority_ (lane_priority), - shutdown_ (false), - static_threads_number_ (static_threads), - dynamic_threads_number_ (dynamic_threads), - static_threads_ (*this), - dynamic_threads_ (*this), + static_threads_ (static_threads), + dynamic_threads_ (dynamic_threads), + current_threads_ (0), + threads_ (*this), new_thread_generator_ (*this), resources_ (pool.manager ().orb_core (), &new_thread_generator_), - native_priority_ (TAO_INVALID_PRIORITY), - dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout) + native_priority_ (TAO_INVALID_PRIORITY) { } @@ -167,8 +113,14 @@ bool TAO_Thread_Lane::new_dynamic_thread (void) { // Note that we are checking this condition below without the lock - // held. - if (this->dynamic_threads_.thr_count () >= this->dynamic_threads_number_) + // held. The value of <static_threads> and <dynamic_threads> does + // not change, but <current_threads> increases when new dynamic + // threads are created. Even if we catch <current_threads> in an + // inconsistent state, we will double check later with the lock + // held. Therefore, this check should not cause any big problems. + if (this->current_threads_ >= + this->static_threads_ + + this->dynamic_threads_) return false; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, @@ -179,25 +131,25 @@ TAO_Thread_Lane::new_dynamic_thread (void) TAO_Thread_Pool_Manager &manager = this->pool_.manager (); - if (!manager.orb_core ().has_shutdown () && !this->shutdown_&& - this->dynamic_threads_.thr_count () < this->dynamic_threads_number_) + if (this->current_threads_ < + (this->static_threads_ + + this->dynamic_threads_) && + !manager.orb_core ().has_shutdown ()) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n") - ACE_TEXT ("Current number of dynamic threads = %d; ") - ACE_TEXT ("static threads = %d; max dynamic threads = %d\n") + ACE_TEXT ("Current number of threads = %d; ") + ACE_TEXT ("static threads = %d; dynamic threads = %d\n") ACE_TEXT ("No leaders available; creating new leader!\n"), this->pool_.id (), this->id_, - this->dynamic_threads_.thr_count (), - this->static_threads_number_, - this->dynamic_threads_number_)); + this->current_threads_, + this->static_threads_, + this->dynamic_threads_)); int result = - this->create_threads_i (this->dynamic_threads_, - 1, - THR_BOUND | THR_DETACHED); + this->create_dynamic_threads_i (1); if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -218,16 +170,16 @@ TAO_Thread_Lane::shutting_down (void) mon, this->lock_); - // We are shutting down, this way we are not creating any more new dynamic - // threads - this->shutdown_ = true; + // Just set the number of dynamic threads to 0, this means we just can't + // create any new one + this->dynamic_threads_ = 0; } void TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL) { - // Make sure that static_threads_number_ is not zero. - if (this->static_threads_number_ == 0) + // Make sure that <static_threads_> is not zero. + if (this->static_threads_ == 0) ACE_THROW (CORBA::BAD_PARAM ()); // Check that the priority is in bounds. @@ -353,8 +305,7 @@ TAO_Thread_Lane::shutdown_reactor (void) void TAO_Thread_Lane::wait (void) { - this->static_threads_.wait (); - this->dynamic_threads_.wait (); + this->threads_.wait (); } int @@ -363,31 +314,11 @@ TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile) return this->resources_.is_collocated (mprofile); } -CORBA::ULong -TAO_Thread_Lane::current_threads (void) const -{ - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - mon, - this->lock_, - 0); - - return (this->static_threads_.thr_count () + - this->dynamic_threads_.thr_count ()); -} - - int TAO_Thread_Lane::create_static_threads (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - mon, - this->lock_, - 0); - // Create static threads. - return this->create_threads_i (this->static_threads_, - this->static_threads_number_, - THR_NEW_LWP | THR_JOINABLE); + return this->create_dynamic_threads (this->static_threads_); } int @@ -398,20 +329,17 @@ TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads) this->lock_, 0); - return this->create_threads_i (this->dynamic_threads_, - number_of_threads, - THR_BOUND | THR_DETACHED); + return this->create_dynamic_threads_i (number_of_threads); } int -TAO_Thread_Lane::create_threads_i (TAO_Thread_Pool_Threads &thread_pool, - CORBA::ULong number_of_threads, - long thread_flags) +TAO_Thread_Lane::create_dynamic_threads_i (CORBA::ULong number_of_threads) { // Overwritten parameters. int force_active = 1; // Default parameters. + long default_flags = THR_NEW_LWP | THR_JOINABLE; int default_grp_id = -1; ACE_Task_Base *default_task = 0; ACE_hthread_t *default_thread_handles = 0; @@ -437,24 +365,27 @@ TAO_Thread_Lane::create_threads_i (TAO_Thread_Pool_Threads &thread_pool, this->pool ().manager ().orb_core (); long flags = - thread_flags | + default_flags | orb_core.orb_params ()->thread_creation_flags (); // Activate the threads. int result = - thread_pool.activate (flags, - number_of_threads, - force_active, - this->native_priority_, - default_grp_id, - default_task, - default_thread_handles, - default_stack, - stack_size_array); + this->threads_.activate (flags, + number_of_threads, + force_active, + this->native_priority_, + default_grp_id, + default_task, + default_thread_handles, + default_stack, + stack_size_array); if (result != 0) return result; + this->current_threads_ += + number_of_threads; + return result; } @@ -466,8 +397,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::Short default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) : manager_ (manager), id_ (id), @@ -476,7 +406,6 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, allow_request_buffering_ (allow_request_buffering), max_buffered_requests_ (max_buffered_requests), max_request_buffer_size_ (max_request_buffer_size), - dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout), lanes_ (0), number_of_lanes_ (1), with_lanes_ (false) @@ -492,8 +421,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, 0, default_priority, static_threads, - dynamic_threads, - dynamic_thread_idle_timeout + dynamic_threads ACE_ENV_ARG_PARAMETER); } @@ -504,8 +432,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) : manager_ (manager), id_ (id), @@ -514,7 +441,6 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, allow_request_buffering_ (allow_request_buffering), max_buffered_requests_ (max_buffered_requests), max_request_buffer_size_ (max_request_buffer_size), - dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout), lanes_ (0), number_of_lanes_ (lanes.length ()), with_lanes_ (true) @@ -534,8 +460,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, i, lanes[i].lane_priority, lanes[i].static_threads, - lanes[i].dynamic_threads, - dynamic_thread_idle_timeout + lanes[i].dynamic_threads ACE_ENV_ARG_PARAMETER); } @@ -724,8 +649,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, RTCORBA::Priority default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -738,8 +662,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize, default_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - dynamic_thread_idle_timeout + max_request_buffer_size ACE_ENV_ARG_PARAMETER); } @@ -749,8 +672,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -762,8 +684,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - dynamic_thread_idle_timeout + max_request_buffer_size ACE_ENV_ARG_PARAMETER); } @@ -817,8 +738,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, RTCORBA::Priority default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -834,8 +754,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize, default_priority, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - dynamic_thread_idle_timeout + max_request_buffer_size ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -850,8 +769,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -866,8 +784,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size, - dynamic_thread_idle_timeout + max_request_buffer_size ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); @@ -950,6 +867,4 @@ TAO_Thread_Pool_Manager::orb_core (void) const return this->orb_core_; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index cd0047741e9..d1c5d45a624 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RTCORBAC.h" +#include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "ace/Hash_Map_Manager.h" @@ -33,8 +33,6 @@ #include "ace/Task.h" #include "ace/Null_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Thread_Lane; /** @@ -66,12 +64,12 @@ private: /** * @class TAO_Thread_Pool_Threads * - * @brief Class representing a static thread running in a thread lane. + * @brief Class representing a thread running in a thread lane. * * \nosubgrouping * **/ -class TAO_Thread_Pool_Threads : public ACE_Task_Base +class TAO_RTCORBA_Export TAO_Thread_Pool_Threads : public ACE_Task_Base { public: @@ -88,33 +86,12 @@ public: static void set_tss_resources (TAO_ORB_Core &orb_core, TAO_Thread_Lane &thread_lane); -protected: - /// Do the real work - virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER); +private: /// Lane to which this thread belongs to. TAO_Thread_Lane &lane_; }; -/** - * @class TAO_Dynamic_Thread_Pool_Threads - * - * @brief Class representing a dynamic thread running in a thread lane. - * - * \nosubgrouping - * - **/ -class TAO_Dynamic_Thread_Pool_Threads : public TAO_Thread_Pool_Threads -{ -public: - /// Constructor. - TAO_Dynamic_Thread_Pool_Threads (TAO_Thread_Lane &lane); - -protected: - /// Do the real work - virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER); -}; - class TAO_Thread_Pool; /** @@ -134,8 +111,7 @@ public: CORBA::ULong id, CORBA::Short lane_priority, CORBA::ULong static_threads, - CORBA::ULong dynamic_threads, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong dynamic_threads ACE_ENV_ARG_DECL); /// Destructor. @@ -187,12 +163,14 @@ public: CORBA::ULong dynamic_threads (void) const; CORBA::ULong current_threads (void) const; + void current_threads (CORBA::ULong); CORBA::Short native_priority (void) const; + TAO_Thread_Pool_Threads &threads (void); + TAO_Thread_Lane_Resources &resources (void); - ACE_Time_Value const &dynamic_thread_idle_timeout (void) const; // @} private: @@ -200,9 +178,7 @@ private: /// Validate lane's priority and map it to a native value. void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL); - int create_threads_i (TAO_Thread_Pool_Threads &thread_pool, - CORBA::ULong number_of_threads, - long thread_flags); + int create_dynamic_threads_i (CORBA::ULong number_of_threads); /// Create @a number_of_threads of dynamic threads. Can be called /// multiple times. @@ -212,25 +188,21 @@ private: TAO_Thread_Pool &pool_; /// The id of this lane - CORBA::ULong const id_; + CORBA::ULong id_; CORBA::Short lane_priority_; - /// This boolean is set when we are shutting down, then we will not create - /// any new dynamic threads - bool shutdown_; - /// Number of static threads - CORBA::ULong const static_threads_number_; + CORBA::ULong static_threads_; /// Maximum number of threads we are allowed to create - CORBA::ULong const dynamic_threads_number_; + CORBA::ULong dynamic_threads_; - /// Array with all static threads - TAO_Thread_Pool_Threads static_threads_; + /// Current number of threads + CORBA::ULong current_threads_; - /// Array with all dynamic threads - TAO_Dynamic_Thread_Pool_Threads dynamic_threads_; + /// Array with all threads + TAO_Thread_Pool_Threads threads_; TAO_RT_New_Leader_Generator new_thread_generator_; @@ -238,10 +210,8 @@ private: CORBA::Short native_priority_; - ACE_Time_Value const dynamic_thread_idle_timeout_; - /// Lock to guard all members of the lane - mutable ACE_SYNCH_MUTEX lock_; + ACE_SYNCH_MUTEX lock_; }; class TAO_Thread_Pool_Manager; @@ -268,8 +238,7 @@ public: CORBA::Short default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL); /// Constructor (for pools with lanes). @@ -280,8 +249,7 @@ public: CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL); /// Destructor. @@ -338,7 +306,6 @@ private: CORBA::Boolean allow_request_buffering_; CORBA::ULong max_buffered_requests_; CORBA::ULong max_request_buffer_size_; - ACE_Time_Value const dynamic_thread_idle_timeout_; TAO_Thread_Lane **lanes_; CORBA::ULong number_of_lanes_; @@ -385,8 +352,7 @@ public: RTCORBA::Priority default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -397,8 +363,7 @@ public: CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -432,8 +397,7 @@ private: RTCORBA::Priority default_priority, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -443,8 +407,7 @@ private: CORBA::Boolean allow_borrowing, CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, - CORBA::ULong max_request_buffer_size, - ACE_Time_Value const &dynamic_thread_idle_timeout + CORBA::ULong max_request_buffer_size ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -455,8 +418,6 @@ private: // @} -private: - TAO_ORB_Core &orb_core_; THREAD_POOLS thread_pools_; @@ -464,10 +425,8 @@ private: ACE_SYNCH_MUTEX lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/RTCORBA/Thread_Pool.inl" +#include "Thread_Pool.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl index 4dd08236764..e76815436e7 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.inl +++ b/TAO/tao/RTCORBA/Thread_Pool.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Thread_Lane & TAO_Thread_Pool_Threads::lane (void) const @@ -43,28 +39,42 @@ ACE_INLINE CORBA::ULong TAO_Thread_Lane::static_threads (void) const { - return this->static_threads_number_; + return this->static_threads_; } ACE_INLINE CORBA::ULong TAO_Thread_Lane::dynamic_threads (void) const { - return this->dynamic_threads_number_; + return this->dynamic_threads_; } ACE_INLINE -TAO_Thread_Lane_Resources & -TAO_Thread_Lane::resources (void) +CORBA::ULong +TAO_Thread_Lane::current_threads (void) const { - return this->resources_; + return this->current_threads_; +} + +ACE_INLINE +void +TAO_Thread_Lane::current_threads (CORBA::ULong current_threads) +{ + this->current_threads_ = current_threads; } ACE_INLINE -ACE_Time_Value const & -TAO_Thread_Lane::dynamic_thread_idle_timeout (void) const +TAO_Thread_Pool_Threads & +TAO_Thread_Lane::threads (void) { - return this->dynamic_thread_idle_timeout_; + return this->threads_; +} + +ACE_INLINE +TAO_Thread_Lane_Resources & +TAO_Thread_Lane::resources (void) +{ + return this->resources_; } ACE_INLINE @@ -137,4 +147,5 @@ TAO_Thread_Pool::number_of_lanes (void) const return this->number_of_lanes_; } -TAO_END_VERSIONED_NAMESPACE_DECL + + diff --git a/TAO/tao/RTCORBA/rtcorba_typedefs.h b/TAO/tao/RTCORBA/rtcorba_typedefs.h index 513e1a4169d..d39f5b27a2d 100644 --- a/TAO/tao/RTCORBA/rtcorba_typedefs.h +++ b/TAO/tao/RTCORBA/rtcorba_typedefs.h @@ -24,7 +24,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward references. class TAO_Priority_Mapping_Manager; @@ -56,7 +55,6 @@ namespace RTCORBA // End TAO-specific typedef } -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /*TAO_RTCORBA_TYPEDEFS_H*/ diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp index bb1ea26cbdb..a1e3ab95a43 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp @@ -1,3 +1,5 @@ +/* -*- C++ -*- */ + // $Id$ // ================================================================= // @@ -12,8 +14,8 @@ // // ================================================================= -#include "tao/RTPortableServer/RTPortableServer.h" -#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h" +#include "RTPortableServer.h" +#include "RT_Object_Adapter_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -21,12 +23,9 @@ ACE_RCSID (RTPortableServer, RTPortableServer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void) { ACE_Service_Config::process_directive (ace_svc_desc_TAO_RT_Object_Adapter_Factory); } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h index 82e605cccba..8202b682ad6 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.h +++ b/TAO/tao/RTPortableServer/RTPortableServer.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file RTPortableServer.h @@ -15,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/orbconf.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -26,8 +25,6 @@ #include "tao/RTCORBA/RTCORBA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer { public: @@ -37,10 +34,8 @@ public: static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer; -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE -#include "tao/RTPortableServer/RTPortableServerC.h" +#include "RTPortableServerC.h" #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp index e0e8678f7be..d5d526ece27 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp @@ -30,13 +30,11 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/RTPortableServer/RTPortableServer.h" +#include "RTPortableServer.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be/be_visitor_typecode/objref_typecode.cpp:76 @@ -129,5 +127,3 @@ operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index 85e9834111f..cc437d5e9ba 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/RTPortableServer/RTPortableServer.h" +#include "RTPortableServer.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" @@ -41,8 +41,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -193,5 +191,3 @@ RTPortableServer::POA::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index cb6e8d013f8..c6740079e07 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -44,7 +44,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -71,8 +71,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace RTPortableServer { @@ -266,8 +264,6 @@ TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPo // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTPortableServer/RTPortableServerS.h b/TAO/tao/RTPortableServer/RTPortableServerS.h index 6b5943d104f..253d03db8a3 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerS.h +++ b/TAO/tao/RTPortableServer/RTPortableServerS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTPortableServer/RTPortableServerC.h" +#include "RTPortableServerC.h" #include "tao/PortableServer/PortableServer_includeS.h" #include "tao/RTCORBA/RTCORBA_includeS.h" @@ -54,8 +54,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace POA_RTPortableServer { @@ -68,7 +66,6 @@ namespace POA_RTPortableServer // TAO_IDL - Generated from // be\be_codegen.cpp:995 -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "RTPortableServerS.inl" diff --git a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl index 1d5a8883c79..d67a85927c7 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer_include.pidl +++ b/TAO/tao/RTPortableServer/RTPortableServer_include.pidl @@ -35,6 +35,6 @@ #define _RTPORTABLESERVER_INCLUDE_IDL_ ///FUZZ: disable check_for_include/ -#include "tao/RTPortableServer/RTPortableServer.pidl" +#include <tao/RTPortableServer/RTPortableServer.pidl> #endif /* _RTPORTABLESERVER_INCLUDE_IDL_ */ diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h index 2b42eb48285..5b6dbc0d6ca 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h +++ b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_traits.cpp:61 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { @@ -74,8 +72,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp index 53444f8e1b4..0ebc6f73ac2 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp @@ -1,6 +1,6 @@ -// $Id$ +// @(#) $Id$ -#include "tao/RTPortableServer/RT_Acceptor_Filters.h" +#include "RT_Acceptor_Filters.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -12,22 +12,18 @@ ACE_RCSID (RTPortableServer, RT_Acceptor_Filter, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Server_Protocol_Acceptor_Filter::TAO_Server_Protocol_Acceptor_Filter ( - RTCORBA::ProtocolList &protocols) +TAO_Server_Protocol_Acceptor_Filter:: +TAO_Server_Protocol_Acceptor_Filter (RTCORBA::ProtocolList &protocols) : protocols_ (protocols) { } int -TAO_Server_Protocol_Acceptor_Filter::fill_profile ( - const TAO::ObjectKey &object_key, - TAO_MProfile &mprofile, - TAO_Acceptor **acceptors_begin, - TAO_Acceptor **acceptors_end, - CORBA::Short priority) +TAO_Server_Protocol_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key, + TAO_MProfile &mprofile, + TAO_Acceptor **acceptors_begin, + TAO_Acceptor **acceptors_end, + CORBA::Short priority) { // RTCORBA 1.0, Section 4.15.1: ServerProtocolPolicy determines // which protocols get included into IOR and in what order. @@ -64,6 +60,4 @@ TAO_Server_Protocol_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h index 6eb39e04677..2a8cfe9fea0 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file RT_Acceptor_Filters.h @@ -25,15 +24,13 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/Acceptor_Filter.h" #define TAO_RTCORBA_SAFE_INCLUDE #include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; /** @@ -66,8 +63,6 @@ private: RTCORBA::ProtocolList &protocols_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp index 0eecb7136a9..8dc4a8cfd0b 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp @@ -17,8 +17,6 @@ ACE_RCSID(RTPortableServer, #include "tao/RTCORBA/Thread_Pool.h" #include "tao/Profile.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Boolean TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object ACE_ENV_ARG_DECL) const @@ -26,7 +24,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object // Make sure that the servant is in the same ORB that created this // object. if (!object->_is_collocated ()) - return false; + return 0; // Get the orb core. TAO_ORB_Core *orb_core = @@ -47,7 +45,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object // If the target POA does not have a dedicated thread pool, then all // calls to it are collocated. if (target_thread_pool == 0) - return true; + return 1; /// Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources &tss = @@ -68,17 +66,17 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object // different pool than POA. Therefore, this object is not // collocated. if (current_thread_pool != target_thread_pool) - return false; + return 0; // If the current thread and the POA are in the default thread pool, // then the object is collocated. if (current_thread_pool == 0) - return true; + return 1; // If the current thread and the POA are in a thread pool without // lanes, then the object is collocated. if (!current_thread_pool->with_lanes ()) - return true; + return 1; // Grab the priority model used by the POA. Note that this cannot // be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread @@ -90,29 +88,37 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object // because the current thread is of the correct priority :-) and // we'll simple use the current thread to run the upcall. if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED) - return true; + return 1; - // Find the target servant priority. We are really not interested in the + // Locate the target servant. We are really not interested in the // servant itself but in the priority that this servant will run at. - CORBA::Short target_priority; + // Note that the operation name is bogus: it is not used because the + // IMPLICIT_ACTIVATION policy is not allowed with SERVER_DECLARED + // policy. Similarly, since there is no implicit activation, there + // is no chance of waiting on a condition variable and hence the + // <wait_occurred_restart_call_ignored> can be ignored. + int wait_occurred_restart_call_ignored = 0; + + poa->locate_servant_i ("operation not used", + servant_upcall.system_id_, + servant_upcall, + servant_upcall.current_context_, + wait_occurred_restart_call_ignored + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); - if (-1 == poa->find_servant_priority (servant_upcall.system_id_, - target_priority - ACE_ENV_ARG_PARAMETER)) - { - return false; - }; + // Get the priority that the servant will run at. + CORBA::Short target_priority = + servant_upcall.priority (); // If it matches the current thread's priority, then we are // collocated. Otherwise we are not. if (target_priority == current_thread_lane->lane_priority ()) - return true; + return 1; else - return false; + return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_RT_Collocation_Resolver, ACE_TEXT ("RT_Collocation_Resolver"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h index 64f3016a4bd..99d89bff36d 100644 --- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h +++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file RT_Collocation_Resolver.h @@ -27,8 +25,6 @@ #include "tao/Collocation_Resolver.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Collocation_Resolver * @@ -48,8 +44,6 @@ public: ACE_ENV_ARG_DECL) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Collocation_Resolver) diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index 4dc295d06aa..5246d3c2a0e 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -1,21 +1,22 @@ // $Id$ -#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h" +#include "RT_Object_Adapter_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/PortableServer/Object_Adapter.h" #include "tao/ORB_Core.h" -#include "tao/RTPortableServer/RT_Servant_Dispatcher.h" -#include "tao/RTPortableServer/RT_Policy_Validator.h" -#include "tao/RTPortableServer/RT_Collocation_Resolver.h" +#include "RT_Servant_Dispatcher.h" +#include "RT_Policy_Validator.h" +#include "RT_Collocation_Resolver.h" ACE_RCSID (RTPortableServer, RT_Object_Adapter_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void) +{ +} TAO_Adapter* TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) @@ -53,8 +54,6 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) return object_adapter; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory) ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory, ACE_TEXT ("TAO_RT_Object_Adapter_Factory"), diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h index 5749011b0e6..21bd46db733 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file RT_Object_Adapter_Factory.h @@ -14,7 +13,7 @@ #define TAO_RT_OBJECT_ADAPTER_FACTORY_H #include /**/ "ace/pre.h" -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/Adapter_Factory.h" #include "tao/orbconf.h" @@ -27,19 +26,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory : public TAO_Adapter_Factory { public: + /// Constructor + TAO_RT_Object_Adapter_Factory (void); /// Create adapter. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_RT_Object_Adapter_Factory) ACE_FACTORY_DECLARE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory) diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index 6d4baacc932..43dd02f08cb 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -1,10 +1,10 @@ -// $Id$ +// @(#) $Id$ -#include "tao/RTPortableServer/RT_POA.h" +#include "RT_POA.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTPortableServer/RT_Acceptor_Filters.h" +#include "RT_Acceptor_Filters.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -28,15 +28,13 @@ #include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) -# include "tao/RTPortableServer/RT_POA.i" +# include "RT_POA.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (RTPortableServer, RT_POA, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, TAO_POA_Manager &poa_manager, const TAO_POA_Policy_Set &policies, @@ -80,7 +78,7 @@ TAO_RT_POA::new_POA (const String &name, TAO_Object_Adapter *object_adapter ACE_ENV_ARG_DECL) { - TAO_RT_POA *poa = 0; + TAO_RT_POA *poa; ACE_NEW_THROW_EX (poa, TAO_RT_POA (name, @@ -953,6 +951,4 @@ TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL) return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 5ae1c845166..d3bbb2816d9 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file RT_POA.h @@ -17,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/PortableServer/Regular_POA.h" #include "tao/orbconf.h" @@ -25,7 +24,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE -#include "tao/RTPortableServer/RTPortableServerC.h" +#include "RTPortableServerC.h" #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -39,15 +38,13 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Thread_Pool; class TAO_Thread_Lane; class TAO_PriorityBandedConnectionPolicy; -class TAO_RTPortableServer_Export TAO_RT_POA - : public virtual RTPortableServer::POA - , public virtual TAO_Regular_POA +class TAO_RTPortableServer_Export TAO_RT_POA : + public virtual RTPortableServer::POA, + public virtual TAO_Regular_POA { public: @@ -313,14 +310,12 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "tao/RTPortableServer/RT_POA.i" +# include "RT_POA.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i index 9197a39d399..a0c51ad2e6d 100644 --- a/TAO/tao/RTPortableServer/RT_POA.i +++ b/TAO/tao/RTPortableServer/RT_POA.i @@ -1,5 +1,3 @@ -// -*- C++ -*- -// // $Id$ // Exception macros @@ -7,8 +5,6 @@ #include "tao/PortableServer/POA_Guard.h" #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_priority (const char * intf, RTCORBA::Priority priority @@ -140,5 +136,3 @@ TAO_RT_POA::thread_pool (void) const { return this->thread_pool_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 4e11afb2d2e..cd8d742f2be 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -1,4 +1,4 @@ -#include "tao/RTPortableServer/RT_Policy_Validator.h" +#include "RT_Policy_Validator.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -18,9 +18,6 @@ ACE_RCSID (RTPortableServer, RT_Policy_Validator, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_POA_RT_Policy_Validator::TAO_POA_RT_Policy_Validator (TAO_ORB_Core &orb_core) : TAO_Policy_Validator (orb_core), thread_pool_ (0) @@ -597,6 +594,4 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core, return thread_pool; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 2f96666c544..2c282de4271 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file RT_Policy_Validator.h @@ -26,12 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/Policy_Validator.h" #include "tao/RTCORBA/RTCORBA.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Acceptor_Registry; class TAO_Thread_Pool; @@ -93,8 +89,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 45eebeee97f..e3a557c5768 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -1,10 +1,9 @@ - -#include "tao/RTPortableServer/RT_Servant_Dispatcher.h" +#include "RT_Servant_Dispatcher.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "tao/RTPortableServer/RT_POA.h" - +#include "RT_POA.h" +#include "tao/RTCORBA/Thread_Pool.h" #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" #include "tao/TAO_Server_Request.h" @@ -16,18 +15,14 @@ #include "tao/debug.h" #include "tao/CDR.h" -#include "tao/RTCORBA/Thread_Pool.h" - #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" + ACE_RCSID (RTPortableServer, RT_Servant_Dispatcher, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void) { } @@ -84,7 +79,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( TAO_Protocols_Hooks *tph = poa.orb_core ().get_protocols_hooks (); - const char *priority_model = 0; + const char *priority_model; RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY; // NOT_SPECIFIED PriorityModel processing. @@ -174,8 +169,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("(%P|%t): %s processing using %s ") ACE_TEXT ("original thread CORBA/native priority %d/%d ") ACE_TEXT ("not changed\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_)); @@ -187,8 +182,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("(%P|%t): %s processing using %s ") ACE_TEXT ("original thread CORBA/native priority ") ACE_TEXT ("not changed\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id))); + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id))); #endif /* ACE_HAS_THREADS */ @@ -228,8 +223,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_, target_priority, @@ -245,8 +240,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("is the same as the target priority\n"), - ACE_TEXT_CHAR_TO_TCHAR (priority_model), - ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), + ACE_TEXT_TO_TCHAR_IN (priority_model), + ACE_TEXT_TO_TCHAR_IN (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_)); } @@ -363,7 +358,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa, { // Eat up the exception. ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught: TAO - " + "Exception caught: TAO (%P|%t) - " "Priority_Model_Processing::" "~Priority_Model_Processing"); } @@ -399,6 +394,4 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, return poa; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index 138523ff62a..64c083f008b 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -15,7 +15,7 @@ #define TAO_RT_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "tao/RTPortableServer/rtportableserver_export.h" +#include "rtportableserver_export.h" #include "tao/orbconf.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -30,13 +30,12 @@ #include "tao/PortableServer/Servant_Dispatcher.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_RT_Servant_Dispatcher * * @brief Concrete instantiation of the Servant_Dispatcher strategy. * + * */ class TAO_RTPortableServer_Export TAO_RT_Servant_Dispatcher : public TAO_Servant_Dispatcher @@ -72,8 +71,6 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 3ac075d66e0..b9f61a67120 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -1,5 +1,5 @@ -#include "tao/RTScheduling/Current.h" -#include "tao/RTScheduling/Distributable_Thread.h" +#include "Current.h" +#include "Distributable_Thread.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/RTCORBA/RT_Current.h" #include "tao/ORB_Core.h" @@ -13,7 +13,6 @@ ACE_RCSID (RTScheduling, Current, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter; @@ -26,12 +25,10 @@ TAO_DTId_Hash::operator () (const IdType &id) const TAO_RTScheduler_Current::TAO_RTScheduler_Current (void) { -} -TAO_RTScheduler_Current::~TAO_RTScheduler_Current (void) -{ } + void TAO_RTScheduler_Current::init (TAO_ORB_Core* orb ACE_ENV_ARG_DECL) @@ -328,19 +325,15 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i ( previous_current_ (prev_current), dt_hash_ (dt_hash) { - CORBA::Object_var scheduler_obj = + CORBA::Object_ptr scheduler_obj = orb->object_ref_table ().resolve_initial_reference ( "RTScheduler"); - this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in () + this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } -TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void) -{ -} - void TAO_RTScheduler_Current_i::begin_scheduling_segment( const char * name, @@ -643,11 +636,6 @@ DTTask::DTTask (//ACE_Thread_Manager *manager, { } -DTTask::~DTTask (void) -{ - delete this->current_; -} - int DTTask::svc (void) { @@ -685,6 +673,7 @@ DTTask::svc (void) return 0; } + RTScheduling::Current::IdType * TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -736,9 +725,9 @@ TAO_RTScheduler_Current_i::name (void) return CORBA::string_dup (this->name_.in ()); } -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ void TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL) @@ -812,7 +801,7 @@ TAO_RTScheduler_Current_i::id (RTScheduling::Current::IdType guid) } void -TAO_RTScheduler_Current_i::name (const char * name) +TAO_RTScheduler_Current_i::name (char * name) { this->name_ = CORBA::string_dup (name); } @@ -991,4 +980,3 @@ const char* TAO_RTScheduler_Current::_interface_repository_id (void) const return "IDL:TAO_RTScheduler_Current:1.0"; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index bae9d0e22c7..3486c4bef7c 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -16,23 +16,23 @@ #include /**/ "ace/pre.h" -#include "tao/RTScheduling/rtscheduler_export.h" +#include "rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTScheduling/RTScheduler.h" +#include "RTScheduler.h" #include "tao/LocalObject.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Task.h" #include "ace/Atomic_Op.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTScheduler_Current_i; class TAO_TSS_Resources; + /** * @class TAO_DTId_Hash * @@ -83,7 +83,6 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter; TAO_RTScheduler_Current (void); - virtual ~TAO_RTScheduler_Current (void); void init (TAO_ORB_Core* orb ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -258,7 +257,9 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i TAO_RTScheduler_Current_i* prev_current ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual ~TAO_RTScheduler_Current_i (void); + virtual ~TAO_RTScheduler_Current_i (void) + { + }; virtual RTScheduling::DistributableThread_ptr spawn (RTScheduling::ThreadAction_ptr start, @@ -326,7 +327,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i void delete_all_currents (void); const char* name (void); - void name (const char *); + void name (char *); TAO_ORB_Core* orb (void); @@ -363,8 +364,6 @@ public: CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param); - virtual ~DTTask (void); - int activate_task (RTCORBA::Priority base_priority, CORBA::ULong stack_size ACE_ENV_ARG_DECL_WITH_DEFAULTS); @@ -384,8 +383,6 @@ public: CORBA::Policy_var implicit_sched_param_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_RTSCHEDULER_CURRENT_H*/ diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp index 87c9e02a245..998aafe3a5d 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.cpp +++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp @@ -1,10 +1,8 @@ //$Id$ -#include "tao/RTScheduling/Distributable_Thread.h" +#include "Distributable_Thread.h" #include "tao/ORB_Constants.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DistributableThread::TAO_DistributableThread (void) :state_ (RTScheduling::DistributableThread::ACTIVE) { @@ -49,5 +47,3 @@ TAO_DistributableThread_Factory::create_DT (void) return DT; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h index 281eb6984cf..e73799bc15b 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.h +++ b/TAO/tao/RTScheduling/Distributable_Thread.h @@ -1,18 +1,12 @@ -// -*- C++ -*- - //$Id$ #ifndef DISTRIBUTABLE_THREAD_H #define DISTRIBUTABLE_THREAD_H #include "tao/RTScheduling/RTScheduler.h" -#include "tao/LocalObject.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_RTScheduler_Export TAO_DistributableThread: - public RTScheduling::DistributableThread, - public TAO_Local_RefCounted_Object +class TAO_RTScheduler_Export TAO_DistributableThread +: public RTScheduling::DistributableThread { public: @@ -38,6 +32,4 @@ public: static RTScheduling::DistributableThread_ptr create_DT (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*DISTRIBUTABLE_THREAD_H*/ diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp index 15eebbb61fe..82eb86ac5b2 100644 --- a/TAO/tao/RTScheduling/RTScheduler.cpp +++ b/TAO/tao/RTScheduling/RTScheduler.cpp @@ -1,15 +1,11 @@ // $Id$ -#include "tao/RTScheduling/RTScheduler.h" -#include "tao/RTScheduling/RTScheduler_Loader.h" +#include "RTScheduler.h" +#include "RTScheduler_Loader.h" ACE_RCSID (RTScheduler, RTScheduler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RTScheduler_Initializer::TAO_RTScheduler_Initializer (void) { ACE_Service_Config::process_directive (ace_svc_desc_TAO_RTScheduler_Loader); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h index 3dbcb0553b9..92c60b13038 100644 --- a/TAO/tao/RTScheduling/RTScheduler.h +++ b/TAO/tao/RTScheduling/RTScheduler.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //============================================================================= @@ -19,16 +17,13 @@ #define TAO_RTSCHEDULER_H_ #include /**/ "ace/pre.h" -#include "tao/RTScheduling/rtscheduler_export.h" +#include "rtscheduler_export.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTScheduler_Export TAO_RTScheduler_Initializer { public: @@ -38,10 +33,8 @@ public: static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer; -TAO_END_VERSIONED_NAMESPACE_DECL - #define TAO_RTSCHEDULER_SAFE_INCLUDE -#include "tao/RTScheduling/RTSchedulerC.h" +#include "RTSchedulerC.h" #undef TAO_RTSCHEDULER_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp index 38df96e2be8..a3cfd02e3c4 100644 --- a/TAO/tao/RTScheduling/RTSchedulerA.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "tao/RTScheduling/RTScheduler.h" +#include "RTScheduler.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -36,8 +36,6 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -270,4 +268,3 @@ namespace RTScheduling &_tao_tc_RTScheduling_Scheduler; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index 4c493789da4..464069748a1 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/RTScheduling/RTScheduler.h" +#include "RTScheduler.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "tao/Var_Size_Argument_T.h" @@ -42,8 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -944,5 +942,3 @@ RTScheduling::Scheduler::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index 5d9d5944fc7..4955b9caf07 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTScheduling/rtscheduler_export.h" +#include "rtscheduler_export.h" #include "tao/PI_Server/ServerRequestInfoC.h" #include "tao/PI/ClientRequestInfoC.h" @@ -81,8 +81,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -1281,8 +1279,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index 574b964f843..f6525b3d5fc 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "tao/RTScheduling/RTScheduler_Initializer.h" -#include "tao/RTScheduling/Request_Interceptor.h" +#include "RTScheduler_Initializer.h" +#include "Request_Interceptor.h" ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$") @@ -18,10 +18,6 @@ ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$") #include "ace/Service_Repository.h" #include "ace/Svc_Conf.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -static TAO_RTScheduler_Current_var current_cleanup; - void TAO_RTScheduler_ORB_Initializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info @@ -67,18 +63,18 @@ void CORBA::COMPLETED_NO)); ACE_CHECK; - current_cleanup = this->current_; - this->current_->init (tao_info->orb_core () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var current_obj = RTScheduling::Current::_narrow (this->current_ + CORBA::Object_ptr current_obj = RTScheduling::Current::_narrow (this->current_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; + CORBA::Object_var safe_current = current_obj; + info->register_initial_reference ("RTScheduler_Current", - current_obj.in () + current_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -135,6 +131,8 @@ void manager ACE_ENV_ARG_PARAMETER); ACE_CHECK; + + } void @@ -155,12 +153,12 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr ACE_DEBUG ((LM_DEBUG, "In post_init\n")); - CORBA::Object_var rt_current_obj = info->resolve_initial_references ("RTCurrent" + CORBA::Object_ptr rt_current_obj = info->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; - RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj.in () + RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -174,5 +172,3 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr this->current_->rt_current (rt_current.in ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h index 8b242f9af9e..075af17a661 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "tao/Basic_Types.h" -#include "tao/RTScheduling/rtscheduler_export.h" +#include "rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,16 +33,17 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTScheduler_Current; /// RTCORBA ORB initializer. -class TAO_RTScheduler_ORB_Initializer - : public virtual PortableInterceptor::ORBInitializer - , public virtual TAO_Local_RefCounted_Object +class TAO_RTScheduler_Export TAO_RTScheduler_ORB_Initializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual TAO_Local_RefCounted_Object { public: + + + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -51,17 +52,14 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: - - TAO_RTScheduler_Current* current_; + TAO_RTScheduler_Current* current_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" -#endif /* TAO_RTSCHEDULER_INITIALIZER_H */ +#endif /* TAO_RTSCHEDULER__INITIALIZER_H */ diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index bc4f99432bb..2c0507a1f5b 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/RTScheduling/RTScheduler_Loader.h" -#include "tao/RTScheduling/RTScheduler_Initializer.h" +#include "RTScheduler_Loader.h" +#include "RTScheduler_Initializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -11,10 +11,13 @@ ACE_RCSID (TAO, RTScheduler_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void) +{ +} TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void) { + } int @@ -69,8 +72,6 @@ TAO_RTScheduler_Loader::init (int, return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_RTScheduler, TAO_RTScheduler_Loader) diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h index 92715d11279..2dc82785123 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.h +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,22 +17,20 @@ #define TAO_RTSCHEDULER_LOADER_H #include /**/ "ace/pre.h" -#include "tao/RTScheduling/rtscheduler_export.h" +#include "rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Service_Object.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_RTScheduler_Export TAO_RTScheduler_Loader : public ACE_Service_Object { public: + /// Constructor. + TAO_RTScheduler_Loader (void); /// Destructor. virtual ~TAO_RTScheduler_Loader (void); @@ -42,8 +40,6 @@ public: ACE_TCHAR* []); }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTScheduler, TAO_RTScheduler_Loader) ACE_FACTORY_DECLARE (TAO_RTScheduler, TAO_RTScheduler_Loader) diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index 14c269cab6c..506ebde419e 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/RTScheduling/RTScheduler_Manager.h" +#include "RTScheduler_Manager.h" #if ! defined (__ACE_INLINE__) -#include "tao/RTScheduling/RTScheduler_Manager.i" +#include "RTScheduler_Manager.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(TAO, RT_ORB, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void) { @@ -43,4 +41,3 @@ TAO_RTScheduler_Manager::_interface_repository_id (void) const return "IDL:RTScheduler_Manager:1.0"; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index 908922f6bda..ecb45489a13 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file RTScheduler_Manager.h @@ -14,10 +13,9 @@ #ifndef TAO_PRIORITY_MAPPING_MANAGER_H #define TAO_PRIORITY_MAPPING_MANAGER_H -#include "tao/RTScheduling/RTScheduler.h" +#include "RTScheduler.h" #include "tao/LocalObject.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTScheduler_Manager; class TAO_RTScheduler_Manager_var; @@ -134,10 +132,8 @@ private: TAO_RTScheduler_Manager_ptr &ptr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/RTScheduling/RTScheduler_Manager.i" +#include "RTScheduler_Manager.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_PRIORITY_MAPPING_MANAGER_H */ diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.i b/TAO/tao/RTScheduling/RTScheduler_Manager.i index da473a28e64..30ec521e2f9 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.i +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.i @@ -5,8 +5,6 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // Inline operations for class TAO_RTScheduler_Manager_var // ************************************************************* @@ -230,5 +228,3 @@ TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler_include.pidl b/TAO/tao/RTScheduling/RTScheduler_include.pidl index 0c743c6794e..c4bd0ba0195 100644 --- a/TAO/tao/RTScheduling/RTScheduler_include.pidl +++ b/TAO/tao/RTScheduling/RTScheduler_include.pidl @@ -32,7 +32,7 @@ #ifndef _RT_SCHEDULER_INCLUDE_IDL_ #define _RT_SCHEDULER_INCLUDE_IDL_ -#include "tao/RTScheduling/RTScheduler.pidl" +#include "../RTScheduling/RTScheduler.pidl" #endif /* _RT_SCHEDULER_INCLUDE_IDL_ */ diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h index c0d1fb47a98..d5d3403e8ef 100644 --- a/TAO/tao/RTScheduling/RTScheduler_includeA.h +++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { @@ -76,8 +74,6 @@ namespace TAO // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 -TAO_END_VERSIONED_NAMESPACE_DECL - #ifndef __ACE_INLINE__ // TAO_IDL - Generated from diff --git a/TAO/tao/RTScheduling/RTScheduler_includeC.h b/TAO/tao/RTScheduling/RTScheduler_includeC.h index 41af68734d6..c1624376b4d 100644 --- a/TAO/tao/RTScheduling/RTScheduler_includeC.h +++ b/TAO/tao/RTScheduling/RTScheduler_includeC.h @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Traits specializations. namespace TAO { @@ -76,8 +74,6 @@ namespace TAO // TAO_IDL - Generated from // C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 -TAO_END_VERSIONED_NAMESPACE_DECL - #ifndef __ACE_INLINE__ // TAO_IDL - Generated from diff --git a/TAO/tao/RTScheduling/RTScheduler_includeS.h b/TAO/tao/RTScheduling/RTScheduler_includeS.h deleted file mode 100644 index 17b1360599e..00000000000 --- a/TAO/tao/RTScheduling/RTScheduler_includeS.h +++ /dev/null @@ -1,28 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index d9cba461f36..7e9a52427c5 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -1,14 +1,12 @@ //$Id$ -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/TypeCode.h" - -#include "tao/RTScheduling/Request_Interceptor.h" -#include "tao/RTScheduling/Current.h" -#include "tao/RTScheduling/Distributable_Thread.h" - +#include "Request_Interceptor.h" +#include "Current.h" +#include "Distributable_Thread.h" #include "tao/TSS_Resources.h" #include "tao/debug.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_string.h" @@ -16,11 +14,14 @@ ACE_RCSID (RTScheduling, Request_Interceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const IOP::ServiceId Client_Interceptor::SchedulingInfo = 30; +Client_Interceptor::Client_Interceptor (void) +{ +} + void Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL) @@ -103,8 +104,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri // Scheduler populates the service context with // scheduling parameters. - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->send_request (ri); + current->scheduler ()->send_request (ri); // If this is a one way request if (!ri->response_expected ()) @@ -133,10 +133,8 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) - { - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->send_poll (ri); - } + current->scheduler ()->send_poll (ri); + } void @@ -154,10 +152,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) - { - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->receive_reply (ri); - } + current->scheduler ()->receive_reply (ri); } void @@ -203,7 +198,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Received Exception %s\n", - ACE_TEXT_CHAR_TO_TCHAR (id))); + ACE_TEXT_TO_TCHAR_IN (id))); // If the remote host threw a THREAD_CANCELLED @@ -220,8 +215,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt { // Inform scheduler that exception was // received. - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->receive_exception (ri); + current->scheduler ()->receive_exception (ri); } } } @@ -242,10 +236,8 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) - { - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->receive_other (ri); - } + current->scheduler ()->receive_other (ri); + } char* @@ -333,12 +325,11 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr // Scheduler retrieves scheduling parameters // from request and populates the out // parameters. - RTScheduling::Scheduler_var scheduler = new_current->scheduler(); - scheduler->receive_request (ri, - guid_var.out (), - name, - sched_param, - implicit_sched_param); + new_current->scheduler()->receive_request (ri, + guid_var.out (), + name, + sched_param, + implicit_sched_param); if (guid_var.in () == 0) { @@ -420,8 +411,8 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri // Inform scheduler that upcall is complete. - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER); + current->scheduler ()->send_reply (ri + ACE_ENV_ARG_PARAMETER); ACE_CHECK; current->cleanup_DT (); @@ -459,8 +450,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r if (current != 0) { // Inform scheduler that upcall is complete. - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->send_exception (ri); + current->scheduler ()->send_exception (ri); current->cleanup_DT (); current->cleanup_current (); @@ -485,8 +475,7 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri if (current != 0) { // Inform scheduler that upcall is complete. - RTScheduling::Scheduler_var scheduler = current->scheduler (); - scheduler->send_other (ri); + current->scheduler ()->send_other (ri); current->cleanup_DT (); current->cleanup_current (); @@ -506,5 +495,3 @@ Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 1a8c74a389a..189b5220d47 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -5,25 +5,23 @@ #ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H #define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H -#include "tao/RTScheduling/rtscheduler_export.h" -#include "tao/RTScheduling/RTScheduler.h" +#include "rtscheduler_export.h" +#include "RTScheduler.h" #include "ace/Atomic_Op.h" -#include "tao/RTScheduling/Current.h" -#include "tao/LocalObject.h" +#include "Current.h" #include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; -class TAO_RTScheduler_Export Client_Interceptor: - public PortableInterceptor::ClientRequestInterceptor, - public TAO_Local_RefCounted_Object +class TAO_RTScheduler_Export Client_Interceptor : + public PortableInterceptor::ClientRequestInterceptor { public: + Client_Interceptor (void); + // Client_Interceptor (RTScheduling::Current_ptr current); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS) @@ -59,8 +57,7 @@ public: }; class TAO_RTScheduler_Export Server_Interceptor : - public PortableInterceptor::ServerRequestInterceptor, - public TAO_Local_RefCounted_Object + public PortableInterceptor::ServerRequestInterceptor { public: @@ -103,6 +100,4 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index e7b7fc530cd..a6cc2f54ea3 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //$Id$ #ifndef TAO_ThreadAction_H #define TAO_ThreadAction_H @@ -8,9 +6,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTScheduling/RTSchedulerC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "RTSchedulerC.h" class TAO_RTScheduler_Export TAO_ThreadAction: public RTScheduling::ThreadAction, @@ -23,6 +19,4 @@ public RTScheduling::ThreadAction, ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*TAO_ThreadAction_H*/ diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index 0883b3ee91c..74bddc34ee6 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -1,8 +1,8 @@ -#include "tao/Reactive_Connect_Strategy.h" -#include "tao/Connection_Handler.h" -#include "tao/ORB_Core.h" -#include "tao/debug.h" -#include "tao/Transport.h" +#include "Reactive_Connect_Strategy.h" +#include "Connection_Handler.h" +#include "ORB_Core.h" +#include "debug.h" +#include "Transport.h" #include "ace/Synch_Options.h" @@ -10,9 +10,6 @@ ACE_RCSID(tao, Reactive_Connect_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Reactive_Connect_Strategy::TAO_Reactive_Connect_Strategy ( TAO_ORB_Core *orb_core) : TAO_Connect_Strategy (orb_core) @@ -92,6 +89,7 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch, return result; } + int TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t, ACE_Time_Value *val) @@ -102,5 +100,3 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t, return this->wait (t->connection_handler (), val); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h index 305b5e9576e..5550e00380d 100644 --- a/TAO/tao/Reactive_Connect_Strategy.h +++ b/TAO/tao/Reactive_Connect_Strategy.h @@ -15,20 +15,15 @@ #include /**/ "ace/pre.h" -#include "tao/Connect_Strategy.h" +#include "Connect_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_Connector; class ACE_Time_Value; class ACE_Synch_Options; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Connector; /** * @class TAO_Reactive_Connect_Strategy @@ -62,8 +57,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" -#endif /* TAO_REACTIVE_CONNECT_STRATEGY_H */ +#endif /*TAO_REACTIVE_CONNECT_STRATEGY_H*/ diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp index ab76a31f168..15761dbcb14 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.cpp +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -1,18 +1,15 @@ // -*- C++ -*- // $Id$ -#include "tao/Reactive_Flushing_Strategy.h" -#include "tao/Transport.h" -#include "tao/ORB_Core.h" -#include "tao/Queued_Message.h" +#include "Reactive_Flushing_Strategy.h" +#include "Transport.h" +#include "ORB_Core.h" +#include "Queued_Message.h" ACE_RCSID (tao, Reactive_Flushing_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport) { @@ -79,5 +76,3 @@ TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h index 56896b01f95..27041a0be5a 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.h +++ b/TAO/tao/Reactive_Flushing_Strategy.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/Flushing_Strategy.h" +#include "Flushing_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Reactive_Flushing_Strategy * @@ -39,8 +37,6 @@ public: virtual int flush_transport (TAO_Transport *transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REACTIVE_FLUSHING_STRATEGY_H */ diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp index 9e8a02109bb..7bafb1bc50b 100644 --- a/TAO/tao/Refcounted_ObjectKey.cpp +++ b/TAO/tao/Refcounted_ObjectKey.cpp @@ -1,18 +1,15 @@ //$Id$ -#include "tao/Refcounted_ObjectKey.h" +#include "Refcounted_ObjectKey.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -#include "tao/Refcounted_ObjectKey.inl" +#include "Refcounted_ObjectKey.inl" #endif /* defined INLINE */ ACE_RCSID(tao, Refcounted_ObjectKey, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Refcounted_ObjectKey::Refcounted_ObjectKey (const TAO::ObjectKey &key) : object_key_ (key) , ref_count_ (1) @@ -37,5 +34,3 @@ TAO::Refcounted_ObjectKey::decr_refcount (void) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h index 4143f1e8af7..297ec6fd654 100644 --- a/TAO/tao/Refcounted_ObjectKey.h +++ b/TAO/tao/Refcounted_ObjectKey.h @@ -23,8 +23,6 @@ #include "tao/Object_KeyC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -65,10 +63,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Refcounted_ObjectKey.inl" +#include "Refcounted_ObjectKey.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl index be9f8f8496d..c829e6b45b0 100644 --- a/TAO/tao/Refcounted_ObjectKey.inl +++ b/TAO/tao/Refcounted_ObjectKey.inl @@ -1,20 +1,15 @@ // -*- C++ -*- -// // $Id$ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE long TAO::Refcounted_ObjectKey::incr_refcount (void) { return ++this->ref_count_; } + + ACE_INLINE const TAO::ObjectKey & TAO::Refcounted_ObjectKey::object_key (void) const { return this->object_key_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index 1e6ea8b5426..c19332acb84 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -1,21 +1,19 @@ //$Id$ -#include "tao/Remote_Invocation.h" -#include "tao/Profile.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/Stub.h" -#include "tao/Transport.h" -#include "tao/Connection_Handler.h" -#include "tao/operation_details.h" -#include "tao/ORB_Core.h" -#include "tao/Protocols_Hooks.h" -#include "tao/debug.h" +#include "Remote_Invocation.h" +#include "Profile.h" +#include "Profile_Transport_Resolver.h" +#include "Stub.h" +#include "Transport.h" +#include "Connection_Handler.h" +#include "operation_details.h" +#include "ORB_Core.h" +#include "Protocols_Hooks.h" +#include "debug.h" ACE_RCSID (tao, Remote_Invocation, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Remote_Invocation::Remote_Invocation ( @@ -27,8 +25,7 @@ namespace TAO resolver.object (), resolver.stub (), detail, - response_expected, - true /* request_is_remote */ ) + response_expected) , resolver_ (resolver) { } @@ -203,5 +200,3 @@ namespace TAO return TAO_INVOKE_SUCCESS; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h index 9bb187a3ea8..555d198afa7 100644 --- a/TAO/tao/Remote_Invocation.h +++ b/TAO/tao/Remote_Invocation.h @@ -23,8 +23,6 @@ #include "tao/Invocation_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Target_Specification; class TAO_OutputCDR; @@ -95,8 +93,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_REMOTE_INVOCATION_H*/ diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index fd4bc75cde0..3ec43f69ed7 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -1,11 +1,11 @@ -#include "tao/Remote_Object_Proxy_Broker.h" -#include "tao/CORBA_String.h" -#include "tao/UB_String_Arguments.h" -#include "tao/Special_Basic_Arguments.h" -#include "tao/Invocation_Adapter.h" -#include "tao/IFR_Client_Adapter.h" -#include "tao/ORB_Core.h" -#include "tao/SystemException.h" +#include "Remote_Object_Proxy_Broker.h" +#include "CORBA_String.h" +#include "UB_String_Arguments.h" +#include "Special_Basic_Arguments.h" +#include "Invocation_Adapter.h" +#include "IFR_Client_Adapter.h" +#include "ORB_Core.h" +#include "SystemException.h" #include "ace/Dynamic_Service.h" @@ -13,9 +13,6 @@ ACE_RCSID (tao, Remote_Object_Proxy_Broker, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { CORBA::Boolean @@ -148,5 +145,3 @@ the_tao_remote_object_proxy_broker (void) static TAO::Remote_Object_Proxy_Broker the_broker; return &the_broker; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h index eab7f29e5b7..9541b56abdb 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.h +++ b/TAO/tao/Remote_Object_Proxy_Broker.h @@ -26,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -73,8 +71,6 @@ namespace TAO TAO::Remote_Object_Proxy_Broker *the_tao_remote_object_proxy_broker (void); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REMOTE_OBJECT_PROXY_BROKER_H */ diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 278f4463203..9f8146c7bd7 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Reply_Dispatcher.h" +#include "Reply_Dispatcher.h" ACE_RCSID (tao, Reply_Dispatcher, @@ -10,8 +10,6 @@ ACE_RCSID (tao, #include "tao/Reply_Dispatcher.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void) // Just an invalid reply status. @@ -23,5 +21,3 @@ TAO_Reply_Dispatcher::TAO_Reply_Dispatcher (void) TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 4f4c16e879b..63cd7683422 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -26,8 +26,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward Declarations. class TAO_GIOP_Message_State; class TAO_GIOP_Message_Version; @@ -89,8 +87,6 @@ protected: CORBA::ULong reply_status_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Reply_Dispatcher.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i index e390ec5911c..549263801ff 100644 --- a/TAO/tao/Reply_Dispatcher.i +++ b/TAO/tao/Reply_Dispatcher.i @@ -1,14 +1,7 @@ -// -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_Reply_Dispatcher::reply_status (void) const { return this->reply_status_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp index 3663d1ee49e..4e1d483a6c3 100644 --- a/TAO/tao/Request_Dispatcher.cpp +++ b/TAO/tao/Request_Dispatcher.cpp @@ -1,15 +1,13 @@ // $Id$ -#include "tao/Request_Dispatcher.h" -#include "tao/TAO_Server_Request.h" -#include "tao/ORB_Core.h" +#include "Request_Dispatcher.h" +#include "TAO_Server_Request.h" +#include "ORB_Core.h" ACE_RCSID (tao, Request_Dispatcher, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void) { } @@ -27,5 +25,3 @@ TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h index a06f4462c6b..0c6ebba06f3 100644 --- a/TAO/tao/Request_Dispatcher.h +++ b/TAO/tao/Request_Dispatcher.h @@ -28,8 +28,6 @@ #include "tao/Pseudo_VarOut_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_ServerRequest; @@ -61,8 +59,6 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REQUEST_DISPATCHER_H */ diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 2f629c3331b..7ab5c57e770 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/Resource_Factory.h" -#include "tao/Protocol_Factory.h" -#include "tao/orbconf.h" +#include "Resource_Factory.h" +#include "Protocol_Factory.h" +#include "orbconf.h" #include "ace/ACE.h" @@ -13,8 +13,6 @@ ACE_RCSID (tao, // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name) : name_ (name), factory_ (0), @@ -90,11 +88,6 @@ TAO_Resource_Factory::get_acceptor_registry (void) return 0; } -void -TAO_Resource_Factory::use_local_memory_pool (bool) -{ -} - ACE_Allocator * TAO_Resource_Factory::input_cdr_dblock_allocator (void) { @@ -223,4 +216,3 @@ TAO_Resource_Factory::load_default_protocols (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 128a72667e0..65ec7222957 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -15,26 +15,17 @@ #define TAO_RESOURCE_FACTORY_H #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/Service_Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -#include "ace/Service_Object.h" #include "ace/Unbounded_Set.h" #include "ace/SString.h" #include "ace/CDR_Base.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/TAO_Export.h" class TAO_Protocol_Factory; class TAO_Acceptor_Registry; @@ -45,6 +36,8 @@ class TAO_Connection_Purging_Strategy; class TAO_LF_Strategy; class TAO_Codeset_Manager; +class ACE_Lock; + // **************************************************************** class TAO_Export TAO_Protocol_Item @@ -69,10 +62,9 @@ public: void factory (TAO_Protocol_Factory *factory, int owner = 0); private: - - // Disallow copying and assignment. - TAO_Protocol_Item (const TAO_Protocol_Item&); - void operator= (const TAO_Protocol_Item&); + // Prohibited + ACE_UNIMPLEMENTED_FUNC (TAO_Protocol_Item (const TAO_Protocol_Item&)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Protocol_Item&)) private: /// Protocol factory name. @@ -153,9 +145,6 @@ public: /// Return a connector to be utilized. virtual TAO_Connector_Registry *get_connector_registry (void); - /// Return the Allocator's memory pool type - virtual void use_local_memory_pool (bool); - /// @name Access the input CDR allocators. //@{ virtual ACE_Allocator* input_cdr_dblock_allocator (void); @@ -264,8 +253,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_RESOURCE_FACTORY_H */ diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 6ce7297a70f..836e592e6a1 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -1,20 +1,16 @@ -#include "tao/Resume_Handle.h" -#include "tao/ORB_Core.h" -#include "debug.h" +#include "Resume_Handle.h" +#include "ORB_Core.h" #include "ace/Reactor.h" #if !defined (__ACE_INLINE__) -# include "tao/Resume_Handle.inl" +# include "Resume_Handle.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Resume_Handle, +ACE_RCSID (tao, + Resume_Handle, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_Resume_Handle::resume_handle (void) { @@ -31,51 +27,3 @@ TAO_Resume_Handle::resume_handle (void) // Set the flag, so that we dont resume again.. this->flag_ = TAO_HANDLE_ALREADY_RESUMED; } - -void -TAO_Resume_Handle::handle_input_return_value_hook (int& return_value) -{ - // RT8248: The return value is only changed from 1 to 0 if: - // 1) the handle_input return value wants an immediate callback - // on the handle (i.e. will return "1") - // 2) this->resume_handle was already called - // 3) reactor->resume_handler was called by this->resume_handle - // The value is changed because you can't ask for an immediate callback - // on a handle that you have already given up ownership of. (RT8248) - if ( return_value == 1 && - this->flag_ == TAO_HANDLE_ALREADY_RESUMED && - this->orb_core_ && - this->orb_core_->reactor ()->resumable_handler () && - this->handle_ != ACE_INVALID_HANDLE) - { - // a return value of "1" means "call me back immediately; - // but we can't "call me back immediately" on an - // already-resumed handle - return_value = 0; - - if (TAO_debug_level > 6) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " - "overriding return value of 1 with retval = %d\n", - return_value)); - } - } - else if ( return_value == -1 ) - { - // this covers the "connection close" case, where you want - // to leave the handle suspended if you're return -1 to - // remove the handle from the Reactor. (See ChangeLog entry - // Fri Dec 16 14:40:54 2005) - this->flag_ = TAO_HANDLE_LEAVE_SUSPENDED; - - if (TAO_debug_level > 6) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " - "handle_input returning -1, so handle is not resumed.\n")); - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index 9fd1f4949e9..44aed27e266 100644 --- a/TAO/tao/Resume_Handle.h +++ b/TAO/tao/Resume_Handle.h @@ -15,16 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; /** @@ -66,19 +62,13 @@ public: /// Allow the users of this class to change the underlying flag. void set_flag (TAO_Handle_Resume_Flag fl); - /// Assignment operator + /// Equal to operator.. TAO_Resume_Handle &operator= (const TAO_Resume_Handle &rhs); /// Resume the handle in the reactor only if the ORB uses a TP - /// reactor. Else we don't resume the handle. + /// reactor. Else we dont resume the handle. void resume_handle (void); - // Hook method called at the end of a connection handler's - // handle_input function. Might override the handle_input - // return value or change the resume_handler's flag_ value. - void handle_input_return_value_hook (int& return_value); - - private: /// Our ORB Core. @@ -92,10 +82,8 @@ private: TAO_Handle_Resume_Flag flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Resume_Handle.inl" +# include "Resume_Handle.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl index e89466fd4e2..38aae6740f1 100644 --- a/TAO/tao/Resume_Handle.inl +++ b/TAO/tao/Resume_Handle.inl @@ -1,9 +1,6 @@ // -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core, ACE_HANDLE h) @@ -18,6 +15,9 @@ TAO_Resume_Handle::~TAO_Resume_Handle (void) { if (this->flag_ == TAO_HANDLE_RESUMABLE) this->resume_handle (); + + this->orb_core_ = 0; + this->handle_ = ACE_INVALID_HANDLE; } @@ -36,5 +36,3 @@ TAO_Resume_Handle::operator= (const TAO_Resume_Handle &rhs) return *this; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp index 02bc2c7f89f..89b13ea1890 100644 --- a/TAO/tao/Seq_Out_T.cpp +++ b/TAO/tao/Seq_Out_T.cpp @@ -1,12 +1,14 @@ -// $Id$ +#ifndef TAO_SEQ_OUT_T_C +#define TAO_SEQ_OUT_T_C -#ifndef TAO_SEQ_OUT_T_CPP -#define TAO_SEQ_OUT_T_CPP - -#include "tao/Seq_Out_T.h" +#include "Seq_Out_T.h" #if !defined (__ACE_INLINE__) -#include "tao/Seq_Out_T.inl" +#include "Seq_Out_T.inl" #endif /* __ACE_INLINE__ */ -#endif /* TAO_SEQUENCE_OUT_T_CPP */ +ACE_RCSID (tao, + Sequence_Out_T, + "$Id$") + +#endif /*TAO_SEQUENCE_OUT_T_C*/ diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index 1544f24c9ee..895c4f9b62b 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -18,7 +18,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Seq_Out_T @@ -83,11 +82,9 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Seq_Out_T.inl" +#include "Seq_Out_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/Seq_Out_T.inl b/TAO/tao/Seq_Out_T.inl index da3a0e8b95b..c26815ff9cb 100644 --- a/TAO/tao/Seq_Out_T.inl +++ b/TAO/tao/Seq_Out_T.inl @@ -1,9 +1,5 @@ // -*- C++ -*- -// //$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T, typename T_var, typename T_elem> ACE_INLINE TAO_Seq_Out_T<T,T_var,T_elem>::TAO_Seq_Out_T (T *& p) @@ -156,5 +152,3 @@ TAO_MngSeq_Out_T<T,T_var,T_elem>::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Seq_Var_T.cpp b/TAO/tao/Seq_Var_T.cpp index e8e38e2eddb..04d36e7dafa 100644 --- a/TAO/tao/Seq_Var_T.cpp +++ b/TAO/tao/Seq_Var_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_SEQ_VAR_T_CPP -#define TAO_SEQ_VAR_T_CPP +#ifndef TAO_SEQ_VAR_T_C +#define TAO_SEQ_VAR_T_C #include "tao/Seq_Var_T.h" @@ -9,15 +9,26 @@ #include "tao/Seq_Var_T.inl" #endif /* __ACE_INLINE__ */ -#include "ace/OS_Memory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Seq_VarOut_T, + "$Id$") + template<typename T, typename T_elem> TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T ( - const TAO_Seq_Var_Base_T<T,T_elem> & p) - : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0) + const TAO_Seq_Var_Base_T<T,T_elem> & p + ) { + if (p.ptr_) + { + ACE_NEW (this->ptr_, + T (*p.ptr_)); + } + else + { + this->ptr_ = 0; + } } // **************************************************************************** @@ -25,15 +36,34 @@ TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T ( template<typename T, typename T_elem> TAO_FixedSeq_Var_T<T,T_elem> & TAO_FixedSeq_Var_T<T,T_elem>::operator= ( - const TAO_FixedSeq_Var_T<T,T_elem> & p) + const TAO_FixedSeq_Var_T<T,T_elem> & p + ) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_FixedSeq_Var_T<T,T_elem> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T * deep_copy = 0; + ACE_NEW_RETURN ( + deep_copy, + T (*p.ptr_), + *this + ); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } return *this; } @@ -43,13 +73,13 @@ template<typename T, typename T_elem> TAO_FixedSeq_Var_T<T,T_elem> & TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_FixedSeq_Var_T<T,T_elem> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, + T (p), + *this); + } return *this; } @@ -58,15 +88,35 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p) template<typename T, typename T_elem> TAO_VarSeq_Var_T<T,T_elem> & -TAO_VarSeq_Var_T<T,T_elem>::operator= (const TAO_VarSeq_Var_T<T,T_elem> & p) +TAO_VarSeq_Var_T<T,T_elem>::operator= ( + const TAO_VarSeq_Var_T<T,T_elem> & p + ) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_VarSeq_Var_T<T,T_elem> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T * deep_copy = 0; + ACE_NEW_RETURN ( + deep_copy, + T (*p.ptr_), + *this + ); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } return *this; } @@ -79,17 +129,33 @@ TAO_MngSeq_Var_T<T,T_elem>::operator= ( const TAO_MngSeq_Var_T<T,T_elem> & p ) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_MngSeq_Var_T<T,T_elem> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T * deep_copy = 0; + ACE_NEW_RETURN ( + deep_copy, + T (*p.ptr_), + *this + ); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } return *this; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_SEQ_VAR_T_CPP */ +#endif /* TAO_SEQ_VAR_T_C */ diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 9b3e4f38193..c5c401f8f5b 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -19,9 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "ace/OS_Memory.h" /** * @class TAO_Seq_Var_Base_T @@ -86,7 +84,6 @@ public: TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T,T_elem> &); T_elem & operator[] (CORBA::ULong index); - const T_elem & operator[] (CORBA::ULong index) const; // Fixed-size base types only. TAO_FixedSeq_Var_T & operator= (const T &); @@ -111,7 +108,6 @@ public: TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T,T_elem> &); T_elem & operator[] (CORBA::ULong index); - const T_elem & operator[] (CORBA::ULong index) const; // Variable-size base types only. operator T *& (); @@ -143,10 +139,10 @@ public: T_elem operator[] (CORBA::ULong index); }; -TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) -#include "tao/Seq_Var_T.inl" +#include "Seq_Var_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl index 1d5209183fb..b625dac9a6e 100644 --- a/TAO/tao/Seq_Var_T.inl +++ b/TAO/tao/Seq_Var_T.inl @@ -1,8 +1,4 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +//$Id$ template<typename T, typename T_elem> ACE_INLINE @@ -152,35 +148,25 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) return this->ptr_->operator[] (index); } -template<typename T, typename T_elem> -ACE_INLINE -const T_elem & -TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) const -{ - return this->ptr_->operator[] (index); -} - // *************************************************************** template<typename T, typename T_elem> ACE_INLINE TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (void) -{ -} +{} template<typename T, typename T_elem> ACE_INLINE TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (T * p) : TAO_Seq_Var_Base_T<T,T_elem> (p) -{ -} +{} template<typename T, typename T_elem> TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T ( - const TAO_VarSeq_Var_T<T,T_elem> & p) + const TAO_VarSeq_Var_T<T,T_elem> & p + ) : TAO_Seq_Var_Base_T<T,T_elem> (p) -{ -} +{} template<typename T, typename T_elem> ACE_INLINE @@ -208,14 +194,6 @@ TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) return this->ptr_->operator[] (index); } -template<typename T, typename T_elem> -ACE_INLINE -const T_elem & -TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) const -{ - return this->ptr_->operator[] (index); -} - // *************************************************************** template<typename T, typename T_elem> @@ -227,15 +205,14 @@ template<typename T, typename T_elem> ACE_INLINE TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (T * p) : TAO_Seq_Var_Base_T<T,T_elem> (p) -{ -} +{} template<typename T, typename T_elem> TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T ( - const TAO_MngSeq_Var_T<T,T_elem> & p) + const TAO_MngSeq_Var_T<T,T_elem> & p + ) : TAO_Seq_Var_Base_T<T,T_elem> (p) -{ -} +{} template<typename T, typename T_elem> ACE_INLINE @@ -262,5 +239,3 @@ TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index 20c274d8a98..0529d2d48dd 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Sequence.h" +#include "Sequence.h" #if !defined (__ACE_INLINE__) #include "tao/Sequence.i" #endif /* __ACE_INLINE__ */ -#include "tao/SystemException.h" +#include "SystemException.h" #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) # include "ace/Message_Block.h" @@ -23,8 +23,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // Operations for class TAO_Base_Sequence // ************************************************************* @@ -66,7 +64,7 @@ TAO_Base_Sequence::check_bounds (char const * filename, ACE_ERROR ((LM_ERROR, "Access error in TAO_Base_Sequence file=%s, line=%u, " "idx=%u, max=%u\n", - ACE_TEXT_CHAR_TO_TCHAR (filename), + ACE_TEXT_TO_TCHAR_IN (filename), lineno, tao_idx, tao_max)); @@ -1112,5 +1110,3 @@ operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs, { return !(lhs == rhs); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 641a2c86f9d..a0e39e1838b 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -25,17 +25,13 @@ #include "tao/orbconf.h" #include "tao/default_environment.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Message_Block; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; } +class ACE_Message_Block; + /** * @class TAO_Base_Sequence * @@ -661,8 +657,6 @@ TAO_Export bool operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l, // **************************************************************** -TAO_END_VERSIONED_NAMESPACE_DECL - /** * @brief Safe assertions without including Log_Msg.h */ diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i index 1293e10fe7b..655bf0f4741 100644 --- a/TAO/tao/Sequence.i +++ b/TAO/tao/Sequence.i @@ -1,12 +1,8 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ // Operations on the unbounded sequence class. - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Base_Sequence::TAO_Base_Sequence (void) : maximum_ (0), @@ -299,5 +295,3 @@ TAO_Unbounded_Sequence<CORBA::Octet>::mb (void) const return this->mb_; } #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index 2d57569e8fd..2c5d5bea180 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -1,10 +1,10 @@ // $Id$ -#ifndef TAO_SEQUENCE_T_CPP -#define TAO_SEQUENCE_T_CPP +#ifndef TAO_SEQUENCE_T_C +#define TAO_SEQUENCE_T_C -#include "tao/Sequence_T.h" -#include "tao/Array_VarOut_T.h" +#include "Sequence_T.h" +#include "Array_VarOut_T.h" #include "ace/OS_Memory.h" @@ -14,7 +14,9 @@ #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Sequence_T, + "$Id$") template <typename T> TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence ( @@ -135,18 +137,6 @@ TAO_Unbounded_Sequence<T>::_deallocate_buffer (void) this->release_ = 0; } -template<typename T> -void -TAO_Unbounded_Sequence<T>::_shrink_buffer (CORBA::ULong nl, - CORBA::ULong ol) -{ - T * tmp = reinterpret_cast <T *> (this->buffer_); - - for (CORBA::ULong i = nl; i < ol; ++i) { - tmp[i] = T(); - } -} - template <typename T> T * TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan) @@ -331,18 +321,6 @@ TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void) this->release_ = 0; } -template<typename T, size_t MAX> -void -TAO_Bounded_Sequence<T, MAX>::_shrink_buffer (CORBA::ULong nl, - CORBA::ULong ol) -{ - T * tmp = reinterpret_cast <T *> (this->buffer_); - - for (CORBA::ULong i = nl; i < ol; ++i) { - tmp[i] = T(); - } -} - template <typename T, size_t MAX> T * TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan) @@ -2156,6 +2134,4 @@ TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length, this->release_ = release; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* tao/TAO_SEQUENCE_T_CPP */ +#endif /* TAO_SEQUENCE_T_C */ diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index 2f7964a06d0..c3fe5f797e2 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -23,8 +23,6 @@ #include "tao/Objref_VarOut_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Unbounded_Sequence * @@ -84,8 +82,6 @@ public: /// Implement the TAO_Base_Sequence methods (see Sequence.h) virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); - virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); // = orbos/98-01-11 proposed extensions. /** @@ -193,9 +189,6 @@ public: /// deallocate the buffer virtual void _deallocate_buffer (void); - virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); - // = orbos/98-01-11 proposed extensions. /** * Allows read-write access to the underlying buffer. If <orphan> @@ -1205,8 +1198,6 @@ public: CORBA::Boolean release = 0); }; -TAO_END_VERSIONED_NAMESPACE_DECL - // ************************************************************* #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i index 960c9ae687a..c1ecd508680 100644 --- a/TAO/tao/Sequence_T.i +++ b/TAO/tao/Sequence_T.i @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +// This may look like C, but it's really -*- C++ -*- // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // *************************************************** // Operations on the generic unbounded sequence class. // *************************************************** @@ -603,5 +600,3 @@ TAO_Bounded_WString_Sequence (CORBA::ULong length, : TAO_Bounded_Base_Sequence (MAX, length, value, release) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp index 7afe711cb85..d92d818b480 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp @@ -1,15 +1,14 @@ -#include "tao/ServerRequestInterceptor_Adapter.h" +#include "ServerRequestInterceptor_Adapter.h" ACE_RCSID (tao, ServerRequestInterceptorAdapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void) +namespace TAO { + ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void) + { + } } -TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index 37907fa1465..791ec6ca2f5 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/TAO_Export.h" +#include "TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,12 +27,6 @@ #include "ace/CORBA_macros.h" #include "tao/SystemException.h" -#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 -# include "tao/OctetSeqC.h" -#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace PortableInterceptor { class ServerRequestInterceptor; @@ -41,11 +35,6 @@ namespace PortableInterceptor typedef CORBA::Short ReplyStatus; } -namespace CORBA -{ - class PolicyList; -} - class TAO_ServerRequest; namespace TAO @@ -152,12 +141,6 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL) = 0; - /// Register an interceptor with policies. - virtual void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ACE_ENV_ARG_DECL) = 0; - virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0; virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0; @@ -175,11 +158,9 @@ namespace TAO TAO_ServerRequest &server_request, TAO::Upcall_Command &command ACE_ENV_ARG_DECL) = 0; - }; -} - -TAO_END_VERSIONED_NAMESPACE_DECL +}; +} #include /**/ "ace/post.h" #endif /* TAO_SERVER_REQUEST_INTERCEPTOR_ADAPTER_H */ diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp index 3408f8b97aa..3064718ded8 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp @@ -1,14 +1,10 @@ -#include "tao/ServerRequestInterceptor_Adapter_Factory.h" +#include "ServerRequestInterceptor_Adapter_Factory.h" ACE_RCSID (tao, ServerRequestInterceptorAdapterFactory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ServerRequestInterceptor_Adapter_Factory::~TAO_ServerRequestInterceptor_Adapter_Factory (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h index e97987173d6..592844d1405 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -23,9 +23,6 @@ #include "tao/SystemException.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class ServerRequestInterceptor_Adapter; @@ -45,8 +42,6 @@ public: virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVERREQUESTINTERCEPTOR_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp index 7b8c1f300c4..504b67b6224 100644 --- a/TAO/tao/Server_Strategy_Factory.cpp +++ b/TAO/tao/Server_Strategy_Factory.cpp @@ -7,9 +7,6 @@ ACE_RCSID (tao, Server_Strategy_Factory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void) : active_object_map_creation_parameters_ () { @@ -74,5 +71,3 @@ TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Objec use_active_hint_in_poa_names_ (1) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index 2e5fdc2800a..644dcf1f6d6 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,10 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "TAO_Export.h" +#include "Basic_Types.h" class TAO_ORB_Core; @@ -130,8 +128,6 @@ protected: Active_Object_Map_Creation_Parameters active_object_map_creation_parameters_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_SERVER_STRATEGY_FACTORY_H */ diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index 97653579a7f..f4b6f228d3a 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -1,16 +1,13 @@ -#include "tao/Service_Callbacks.h" -#include "tao/ORB_Constants.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/Invocation_Utils.h" +#include "Service_Callbacks.h" +#include "ORB_Constants.h" +#include "SystemException.h" +#include "Environment.h" +#include "Invocation_Utils.h" ACE_RCSID (tao, Service_Callbacks, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Service_Callbacks::~TAO_Service_Callbacks (void) { } @@ -59,13 +56,6 @@ TAO_Service_Callbacks::hash_ft (TAO_Profile *, return 0; } -CORBA::Boolean -TAO_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr, - const TAO_Service_Context &) const -{ - return false; -} - TAO::Invocation_Status TAO_Service_Callbacks::raise_comm_failure ( IOP::ServiceContextList &, @@ -93,5 +83,3 @@ TAO_Service_Callbacks::raise_transient_failure ( CORBA::COMPLETED_MAYBE), TAO::TAO_INVOKE_FAILURE); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index bf317492e76..8e68c9e15c1 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Service_Callbacks.h @@ -10,6 +8,7 @@ * of the default functionalities that the ORB provides by the * services if they have been loaded in to the ORB_Core * + * * @author Bala Natarajan <bala@cs.wustl.edu> */ //============================================================================= @@ -27,10 +26,6 @@ #include "tao/TAO_Export.h" #include "tao/Basic_Types.h" #include "tao/Invocation_Utils.h" -#include "tao/Object.h" -#include "tao/Service_Context.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Profile; class TAO_MProfile; @@ -63,14 +58,14 @@ class TAO_Export TAO_Service_Callbacks { public: - + enum Profile_Equivalence { EQUIVALENT, NOT_EQUIVALENT, DONT_KNOW }; - + /// Dtor virtual ~TAO_Service_Callbacks (void); @@ -100,12 +95,6 @@ public: virtual CORBA::ULong hash_ft (TAO_Profile *p, CORBA::ULong m); - // Verify if condition is given for LOCATION_FORWARD_PERM reply - virtual CORBA::Boolean is_permanent_forward_condition (const CORBA::Object_ptr obj, - const TAO_Service_Context &service_context) const; - - - /// Allow the service layer to decide whether the COMM_FAILURE /// exception should be thrown or a reinvocation is needed virtual TAO::Invocation_Status raise_comm_failure ( @@ -121,8 +110,6 @@ public: ACE_ENV_ARG_DECL); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_SERVICE_CALLBACK_H*/ diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index 9d0a4c1c5e6..b2708c3f4ce 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -1,4 +1,6 @@ +// // $Id$ +// #include "tao/Service_Context.h" #include "tao/CDR.h" @@ -13,9 +15,6 @@ ACE_RCSID (tao, Service_Context, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_Service_Context::set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr) @@ -220,5 +219,3 @@ TAO_Service_Context::decode (TAO_InputCDR& cdr) return 1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h index dcf9cebbc4c..348bec7c061 100644 --- a/TAO/tao/Service_Context.h +++ b/TAO/tao/Service_Context.h @@ -1,3 +1,4 @@ +// This may look like C, but it's really -*- C++ -*- // -*- C++ -*- // =================================================================== @@ -7,6 +8,7 @@ * $Id$ * * @author Balachandran Natarajan <bala@cs.wustl.edu> + * */ // =================================================================== @@ -21,16 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - class FW_Server_Request_Wrapper; - } -} - /** * @class TAO_Service_Context * @@ -60,11 +52,6 @@ namespace TAO class TAO_Export TAO_Service_Context { public: - /// Declare FW_Server_Request_Wrapper a friend - /// This friendship makes the FW_Server_Request_Wrapper be able to - /// clone the TAO_Service_Context data member in TAO_ServerRequest. - friend class TAO::CSD::FW_Server_Request_Wrapper; - /// Constructor TAO_Service_Context (void); @@ -150,8 +137,6 @@ private: IOP::ServiceContextList service_context_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Service_Context.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl index 1facf7680a7..d7540db80b7 100644 --- a/TAO/tao/Service_Context.inl +++ b/TAO/tao/Service_Context.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Service_Context::TAO_Service_Context (void) : service_context_ () @@ -39,6 +37,7 @@ TAO_Service_Context::set_context (IOP::ServiceContext &context, cdr); } + ACE_INLINE int TAO_Service_Context::is_service_id (IOP::ServiceId id) { @@ -53,5 +52,3 @@ TAO_Service_Context::is_service_id (IOP::ServiceId id) } return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index 853fbfd293f..765d9c8e576 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:288 -#include "tao/ServicesC.h" +#include "ServicesC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -351,5 +349,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.service_options) && (strm >> _tao_aggregate.service_details); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index 524b9bef015..5e24beb739a 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -63,8 +63,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -316,8 +314,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Services_Activate.cpp b/TAO/tao/Services_Activate.cpp index 22944bd9430..bd5689dc202 100644 --- a/TAO/tao/Services_Activate.cpp +++ b/TAO/tao/Services_Activate.cpp @@ -1,13 +1,12 @@ #include "tao/Services_Activate.h" +#include "ace/Dynamic_Service.h" ACE_RCSID (tao, Services_Activate, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Services_Activate::~TAO_Services_Activate (void) { + //no-op } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h index d1e1905d8f6..582d6d3b94a 100644 --- a/TAO/tao/Services_Activate.h +++ b/TAO/tao/Services_Activate.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //============================================================================= /** * @file Services_Activate.h @@ -9,6 +7,7 @@ * This is a generic interface that would be used to activate * the services that are loaded through the svc.conf file * + * * @author Bala Natarajan <bala@cs.wustl.edu> */ //============================================================================= @@ -25,8 +24,6 @@ #include "tao/SystemException.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Service_Callbacks; @@ -57,8 +54,6 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_SERVICES_ACTIVATE_H*/ diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index 4ebe8407bcb..5b4df566b26 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/ShortSeqC.h" +#include "ShortSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h index 710cff4afb9..79b6809bd5a 100644 --- a/TAO/tao/ShortSeqC.h +++ b/TAO/tao/ShortSeqC.h @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -138,8 +136,6 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */ -TAO_END_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_codegen.cpp:1028 diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp index 10707265d59..91e62e5cafc 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.cpp +++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/SmartProxies/Smart_Proxies.h" +#include "Smart_Proxies.h" ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$") #if !defined (__ACE_INLINE__) -#include "tao/SmartProxies/Smart_Proxies.inl" +#include "Smart_Proxies.inl" #endif /* defined INLINE */ // Add this line to please the AIX linker, otherwise it complains diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h index 204702f7ec9..f8810fc8d40 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.h +++ b/TAO/tao/SmartProxies/Smart_Proxies.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// $Id$ +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -17,7 +18,7 @@ #define TAO_SMARTPROXIES_H #include /**/ "ace/pre.h" -#include "tao/SmartProxies/smartproxies_export.h" +#include "smartproxies_export.h" #include "tao/Object.h" #include "tao/TAO_Singleton.h" #include "tao/LocalObject.h" @@ -26,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Smart_Proxy_Base * @@ -35,9 +34,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * Contains the _var pointer to the real proxy. */ -class TAO_SmartProxies_Export TAO_Smart_Proxy_Base - : public TAO_Local_RefCounted_Object +class TAO_SmartProxies_Export TAO_Smart_Proxy_Base : + public TAO_Local_RefCounted_Object { + public: /// Destructor virtual ~TAO_Smart_Proxy_Base (void); @@ -53,10 +53,8 @@ protected: CORBA::Object_var base_proxy_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/SmartProxies/Smart_Proxies.inl" +#include "Smart_Proxies.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl index 232cacd0f34..b75c0a5d096 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.inl +++ b/TAO/tao/SmartProxies/Smart_Proxies.inl @@ -1,9 +1,6 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void) { @@ -19,5 +16,3 @@ ACE_INLINE TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp index 771abdf72d6..ee973ea75ec 100644 --- a/TAO/tao/Special_Basic_Argument_T.cpp +++ b/TAO/tao/Special_Basic_Argument_T.cpp @@ -1,16 +1,17 @@ // $Id$ -#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_CPP -#define TAO_SPECIAL_BASIC_ARGUMENT_T_CPP +#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_C +#define TAO_SPECIAL_BASIC_ARGUMENT_T_C #include "tao/Special_Basic_Argument_T.h" -#include "tao/CDR.h" #if !defined (__ACE_INLINE__) #include "tao/Special_Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Special_Basic_Argument_T, + "$Id$") template<typename S, typename to_S, typename from_S, typename Insert_Policy> CORBA::Boolean @@ -108,7 +109,5 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_valu #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_CPP */ +#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */ diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index b3f1df89e3a..e113596d8a3 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -23,8 +23,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -150,8 +148,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Special_Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl index cf8b7b4e57e..850c2209cbb 100644 --- a/TAO/tao/Special_Basic_Argument_T.inl +++ b/TAO/tao/Special_Basic_Argument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename to_S, typename from_S, typename Insert_Policy> ACE_INLINE TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Argument_T ( @@ -87,4 +85,3 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void) return this->x_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h index ff938db4b58..49e8e16e9e6 100644 --- a/TAO/tao/Special_Basic_Arguments.h +++ b/TAO/tao/Special_Basic_Arguments.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -6,8 +6,7 @@ * * $Id$ * - * @author Jeff Parsons - * @author Carlos O'Ryan + * @authors Jeff Parsons and Carlos O'Ryan */ //============================================================================= @@ -24,9 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Special_Basic_Argument_T.h" -#include "tao/Arg_Traits_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Arg_Traits_T.h" namespace TAO { @@ -73,8 +70,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/"ace/post.h" #endif /* TAO_SPECIAL_BASIC_ARGUMENTS_H */ diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 256a3ba9f49..2f0f709b8f9 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,7 +1,6 @@ //$Id$ -project : taolib, core, core_anytypecode { - avoids += ace_for_tao // Requires Unix domain sockets and MEM stuff +project : taolib, core, acereactorlib_for_tao, acesocketslib_for_tao, acememorylib_for_tao, core_anytypecode { sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 2e527cea8ec..771ed508113 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -1,11 +1,11 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/DIOP_Acceptor.h" +#include "DIOP_Acceptor.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/debug.h" @@ -17,7 +17,7 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "tao/Strategies/DIOP_Acceptor.i" +#include "DIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" @@ -26,8 +26,6 @@ ACE_RCSID (Strategies, DIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_DIOP_PROFILE), addrs_ (0), @@ -437,7 +435,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN (this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -615,8 +613,7 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile, profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ - CORBA::Octet major; - CORBA::Octet minor = CORBA::Octet(); + CORBA::Octet major, minor; // Read the version. We just read it here. We don't*do any* // processing. @@ -721,7 +718,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())), + ACE_TEXT_TO_TCHAR_IN (opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -743,13 +740,11 @@ TAO_DIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), + ACE_TEXT_TO_TCHAR_IN (name.c_str ())), -1); } } return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 0de8b911e3d..4ff200dc543 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,13 +27,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Transport_Acceptor.h" -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO DIOP_Acceptor concrete call defination /** @@ -178,10 +176,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "tao/Strategies/DIOP_Acceptor.i" +#include "DIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Acceptor.i b/TAO/tao/Strategies/DIOP_Acceptor.i index 2603d4e7156..9aaf71a3d41 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.i +++ b/TAO/tao/Strategies/DIOP_Acceptor.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr& TAO_DIOP_Acceptor::address (void) const { @@ -24,5 +21,3 @@ TAO_DIOP_Acceptor::endpoints (void) return this->addrs_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 335567bc4e1..73c80795b50 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -16,17 +16,14 @@ #include "tao/Protocols_Hooks.h" #include "tao/Resume_Handle.h" -#include "tao/Strategies/DIOP_Transport.h" -#include "tao/Strategies/DIOP_Endpoint.h" +#include "DIOP_Transport.h" +#include "DIOP_Endpoint.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" ACE_RCSID(tao, DIOP_Connect, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_DIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -157,7 +154,7 @@ TAO_DIOP_Connection_Handler::open (void*) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -") ACE_TEXT("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number ())); } @@ -168,7 +165,7 @@ TAO_DIOP_Connection_Handler::open (void*) return -1; this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -182,7 +179,7 @@ TAO_DIOP_Connection_Handler::open_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -") ACE_TEXT("listening on %s:%d\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number () )); } @@ -301,6 +298,4 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h index 74c8702113a..933a1f4254d 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -29,12 +29,9 @@ #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" -#include "tao/Strategies/DIOP_Transport.h" +#include "DIOP_Transport.h" #include "ace/SOCK_Dgram.h" -#include "tao/Strategies/strategies_export.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "strategies_export.h" // Forward Decls class TAO_Pluggable_Messaging; @@ -49,9 +46,11 @@ class TAO_Pluggable_Messaging; * The Connection handler which is common for the Acceptor and * the Connector */ -class TAO_Strategies_Export TAO_DIOP_Connection_Handler - : public TAO_DIOP_SVC_HANDLER - , public TAO_Connection_Handler + + +class TAO_Strategies_Export TAO_DIOP_Connection_Handler : + public TAO_DIOP_SVC_HANDLER, + public TAO_Connection_Handler { public: @@ -161,8 +160,6 @@ private: int dscp_codepoint_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index a2aecebc2b4..671bac804cb 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/DIOP_Connector.h" +#include "DIOP_Connector.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -15,16 +15,13 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" ACE_RCSID (Strategies, DIOP_Connector, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_DIOP_PROFILE), lite_flag_ (flag) @@ -235,11 +232,11 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) int TAO_DIOP_Connector::cancel_svc_handler ( - TAO_Connection_Handler * /* svc_handler */) + TAO_Connection_Handler * svc_handler) { + ACE_UNUSED_ARG(svc_handler); + + // Noop return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index d1f8e139fbe..5cec9dbd0c8 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,14 +22,12 @@ #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) #include "tao/Transport_Connector.h" -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Endpoint; class TAO_DIOP_Endpoint; @@ -115,8 +113,6 @@ private: ACE_Null_Mutex > SvcHandlerIterator; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index 43657b6d783..f10fb9c0f7e 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -2,11 +2,11 @@ // $Id$ -#include "tao/Strategies/DIOP_Endpoint.h" +#include "DIOP_Endpoint.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "DIOP_Connection_Handler.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -20,13 +20,11 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/DIOP_Endpoint.i" +# include "DIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) @@ -245,7 +243,4 @@ TAO_DIOP_Endpoint::object_addr (void) const } return this->object_addr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index a654c95e94a..01a932546b7 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- + //============================================================================= /** @@ -22,14 +23,14 @@ #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_DIOP_Connection_Handler; @@ -137,10 +138,8 @@ private: TAO_DIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/DIOP_Endpoint.i" +# include "DIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Endpoint.i b/TAO/tao/Strategies/DIOP_Endpoint.i index 03c7835ffbe..3bd443220b5 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.i +++ b/TAO/tao/Strategies/DIOP_Endpoint.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const char * TAO_DIOP_Endpoint::host (void) const { @@ -21,5 +18,3 @@ TAO_DIOP_Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 8c23791d31f..ef5755dde44 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/DIOP_Factory.h" +#include "DIOP_Factory.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Acceptor.h" -#include "tao/Strategies/DIOP_Connector.h" +#include "DIOP_Acceptor.h" +#include "DIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -15,9 +15,7 @@ ACE_RCSID (Strategies, DIOP_Factory, "$Id$") -static const char the_prefix[] = "diop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "diop"; TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE), @@ -34,13 +32,13 @@ int TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) { // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); + return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); } const char * TAO_DIOP_Protocol_Factory::prefix (void) const { - return ::the_prefix; + return ::prefix_; } char @@ -94,8 +92,6 @@ TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory, ACE_TEXT ("DIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index 6add2587345..5b0313bef84 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -27,15 +27,12 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/Strategies/strategies_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "strategies_export.h" class TAO_Acceptor; class TAO_Connector; -class TAO_Strategies_Export TAO_DIOP_Protocol_Factory - : public TAO_Protocol_Factory +class TAO_Strategies_Export TAO_DIOP_Protocol_Factory : public TAO_Protocol_Factory { public: /// Constructor. @@ -76,8 +73,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_DIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 19c9432b3a0..af1c9aabad4 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -1,6 +1,7 @@ +// This may look like C, but it's really -*- C++ -*- +// // $Id$ - -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Profile.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -19,9 +20,7 @@ ACE_RCSID (Strategies, DIOP_Profile, "$Id$") -static const char the_prefix[] = "diop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +static const char prefix_[] = "diop"; const char TAO_DIOP_Profile::object_key_delimiter_ = '/'; @@ -297,7 +296,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) size_t buflen = (8 /* "corbaloc" */ + 1 /* colon separator */ + - ACE_OS::strlen (::the_prefix) + + ACE_OS::strlen (::prefix_) + 1 /* colon separator */ + 1 /* major version */ + 1 /* decimal point */ + @@ -315,7 +314,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_OS::sprintf (buf, "corbaloc:%s:%c.%c@%s:%d%c%s", - ::the_prefix, + ::prefix_, digits [this->version_.major], digits [this->version_.minor], this->endpoint_.host (), @@ -329,7 +328,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const char * TAO_DIOP_Profile::prefix (void) { - return ::the_prefix; + return ::prefix_; } void @@ -473,6 +472,4 @@ TAO_DIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index 0458ebef6dc..e51bb10e95f 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -1,4 +1,5 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- + //============================================================================= /** @@ -27,9 +28,8 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Strategies/DIOP_Endpoint.h" +#include "DIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO DIOP_Profile concrete Profile definitions /** @@ -122,8 +122,6 @@ protected: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 876fd01d111..a3a11e887bc 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -1,12 +1,13 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/DIOP_Transport.h" +#include "DIOP_Transport.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "tao/Strategies/DIOP_Connection_Handler.h" -#include "tao/Strategies/DIOP_Acceptor.h" -#include "tao/Strategies/DIOP_Profile.h" +#include "DIOP_Connection_Handler.h" +#include "DIOP_Acceptor.h" +#include "DIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/operation_details.h" #include "tao/Timeprobe.h" @@ -22,8 +23,6 @@ ACE_RCSID (tao, DIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -121,7 +120,7 @@ TAO_DIOP_Transport::recv (char *buf, ACE_DEBUG ((LM_DEBUG, "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n", n, - ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN (from_addr.get_host_name ()), from_addr.get_port_number (), errno)); } @@ -167,7 +166,7 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh, // The buffer on the stack which will be used to hold the input // messages - char buf [ACE_MAX_DGRAM_SIZE + ACE_CDR::MAX_ALIGNMENT]; + char buf [ACE_MAX_DGRAM_SIZE]; #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) (void) ACE_OS::memset (buf, @@ -212,33 +211,21 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh, // Set the write pointer in the stack buffer message_block.wr_ptr (n); - // Make a node of the message block.. - TAO_Queued_Data qd (&message_block); - size_t mesg_length; - // Parse the incoming message for validity. The check needs to be // performed by the messaging objects. - if (this->messaging_object ()->parse_next_message (message_block, - qd, - mesg_length) == -1) + if (this->parse_incoming_messages (message_block) == -1) return -1; - if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) - { - // parse/marshal error - return -1; - } - - if (message_block.length () > mesg_length) - { - // we read too much data - return -1; - } - // NOTE: We are not performing any queueing nor any checking for // missing data. We are assuming that ALL the data would be got in a // single read. + // Make a node of the message block.. + TAO_Queued_Data qd (&message_block); + + // Extract the data for the node.. + this->messaging_object ()->get_message_data (&qd); + // Process the message return this->process_parsed_messages (&qd, rh); } @@ -345,10 +332,9 @@ int TAO_DIOP_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) { - this->messaging_object_->init (major, minor); + this->messaging_object_->init (major, + minor); return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 7313639fc96..63c79700296 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -1,5 +1,5 @@ +// This may look like C, but it's really -*- C++ -*- // -*- C++ -*- - // =================================================================== /** * @file DIOP_Transport.h @@ -27,13 +27,7 @@ #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" -#include "tao/Strategies/strategies_export.h" - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "strategies_export.h" // Forward decls. class TAO_DIOP_Connection_Handler; @@ -46,6 +40,10 @@ class TAO_Acceptor; typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> TAO_DIOP_SVC_HANDLER; +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT +template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + /** * @class TAO_DIOP_Transport * @@ -137,8 +135,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp index 4a9822dc7b5..d1e9d6940b3 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h" +#include "FIFO_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum), @@ -17,10 +14,12 @@ TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy ( { } + TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void) { } + void TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { @@ -32,4 +31,4 @@ TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport) } } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h index 30ef3794a5c..b69bcff5739 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file FIFO_Connection_Purging_Strategy.h @@ -14,7 +12,7 @@ #define TAO_FIFO_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Connection_Purging_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +21,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_FIFO_Connection_Purging_Strategy * @@ -54,7 +50,5 @@ private: unsigned long order_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_FIFO_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp index eab9bc1f9e0..961ba767c8e 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp @@ -1,13 +1,10 @@ // $Id$ -#include "tao/Strategies/LFU_Connection_Purging_Strategy.h" +#include "LFU_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LFU_Connection_Purging_Strategy::TAO_LFU_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum) @@ -19,10 +16,10 @@ TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void) { } + void TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { transport->purging_order (transport->purging_order () + 1); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h index 98ea59231f9..b2b390c429f 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file LFU_Connection_Purging_Strategy.h @@ -14,7 +12,7 @@ #define TAO_LFU_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Connection_Purging_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +21,6 @@ // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LFU_Connection_Purging_Strategy * @@ -49,7 +45,5 @@ public: virtual void update_item (TAO_Transport* transport); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_LFU_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp index 67c5f5e0871..d3c740cb9de 100644 --- a/TAO/tao/Strategies/LF_Strategy_Null.cpp +++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp @@ -1,16 +1,14 @@ +// -*- C++ -*- // $Id$ -#include "tao/Strategies/LF_Strategy_Null.h" +#include "LF_Strategy_Null.h" #if !defined (__ACE_INLINE__) -# include "tao/Strategies/LF_Strategy_Null.inl" +# include "LF_Strategy_Null.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, LF_Strategy_Null, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void) { } @@ -32,5 +30,3 @@ TAO_LF_Strategy_Null::reset_event_loop_thread (int, TAO_Leader_Follower &) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h index 18ba5632ad0..746204fd3d0 100644 --- a/TAO/tao/Strategies/LF_Strategy_Null.h +++ b/TAO/tao/Strategies/LF_Strategy_Null.h @@ -14,15 +14,13 @@ #define TAO_LF_STRATEGY_NULL_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/LF_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_LF_Strategy_Null * @@ -50,10 +48,8 @@ public: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/LF_Strategy_Null.inl" +# include "LF_Strategy_Null.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp index 181be613d77..930c9c89053 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp @@ -1,32 +1,31 @@ // $Id$ -#include "tao/Strategies/NULL_Connection_Purging_Strategy.h" +#include "NULL_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_NULL_Connection_Purging_Strategy::TAO_NULL_Connection_Purging_Strategy ( int cache_maximum) : TAO_Connection_Purging_Strategy (cache_maximum) { } + TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (void) { } + void TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport) { ACE_UNUSED_ARG (transport); } + int TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const { return -1; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h index 37b5c15d268..39804305347 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // ================================================================ /** * @file NULL_Connection_Purging_Strategy.h @@ -14,7 +12,7 @@ #define TAO_NULL_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -23,8 +21,6 @@ #include "tao/Connection_Purging_Strategy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_NULL_Connection_Purging_Strategy * @@ -49,7 +45,5 @@ public: virtual int cache_maximum (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_NULL_PURGING_STRATEGY_H */ diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp deleted file mode 100644 index 96c1cf8c8b2..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// $Id$ - -#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" -#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h" -#include "ace/Log_Msg.h" -#include "tao/ORB_Core.h" -#include "ace/OS.h" - -ACE_RCSID (tao, - OC_Endpoint_Selector_Factory, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_OC_Endpoint_Selector_Factory::TAO_OC_Endpoint_Selector_Factory (void) - : oc_endpoint_selector_(0) -{ -} - -TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory (void) -{ - delete this->oc_endpoint_selector_; -} - -int -TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[]) -{ - ACE_Time_Value timeout(0,0); - - TAO_ORB_Core::set_endpoint_selector_factory ("OC_Endpoint_Selector_Factory"); - for (int count = 0; count < argc; count++) - { - if ((ACE_OS::strcasecmp (argv[count], - ACE_TEXT ("-connect_timeout")) == 0) && - count < argc-1) - { - count++; - long ms = ACE_OS::strtol(argv[count],0,10); - timeout.msec (ms); - } - } - - ACE_NEW_RETURN (this->oc_endpoint_selector_, - TAO_Optimized_Connection_Endpoint_Selector(timeout), - -1); - return 0; -} - - -TAO_Invocation_Endpoint_Selector * -TAO_OC_Endpoint_Selector_Factory::get_selector ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) -{ - // Trivial endpoint selector. Just return the default selector. - return this->oc_endpoint_selector_; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -// **************************************************************** - -ACE_STATIC_SVC_DEFINE (TAO_OC_Endpoint_Selector_Factory, - ACE_TEXT ("OC_Endpoint_Selector_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_OC_Endpoint_Selector_Factory), - ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, - 0) -ACE_FACTORY_DEFINE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h deleted file mode 100644 index c1cae879efb..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ /dev/null @@ -1,87 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file OC_Endpoint_Selector_Factory.h - * - * $Id$ - * - * Strategies for selecting profile/endpoint from an IOR for making an - * invocation. - * - * @author Phil Mesnier <mesnier_p@ociweb.com> - */ -//============================================================================= - - -#ifndef TAO_OC_ENDPOINT_SELECTOR_FACTORY_H -#define TAO_OC_ENDPOINT_SELECTOR_FACTORY_H -#include /**/ "ace/pre.h" - - -#include "tao/Strategies/strategies_export.h" - -#include "tao/Endpoint_Selector_Factory.h" -#include "ace/Service_Config.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Forward references -class TAO_Optimized_Connection_Endpoint_Selector; - -// **************************************************************** - -/** - * @class TAO_OC_Endpoint_Selector_Factory - * - * @brief Factory for initializing <Endpoint_Selection_State> and - * obtaining appropriate <Invocation_Endpoint_Selector>. - * - * Used by Invocation classes to intialize its endpoint selection - * strategy and state based on the effective policies. - * Endpoint selection strategies are stateless objects - all the - * state they need is contained by Invocation in - * <Endpoint_Selection_State>. Thus, rather than allocating an - * endpoint selection strategy object for each Invocation, the - * factory simply returns the appropriate one from the - * set preallocated in the ORB_Core. One endpoint selection - * strategy object can be used by many invocations concurrently. - */ -class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Factory - : public TAO_Endpoint_Selector_Factory -{ -public: - /// Constructor. - TAO_OC_Endpoint_Selector_Factory (void); - - /// Destructor. - virtual ~TAO_OC_Endpoint_Selector_Factory (void); - - - virtual int init (int argc, ACE_TCHAR *argv[]); - - /// Get an Invocation's endpoint selection strategy and - /// initialize the endpoint selection state instance. - virtual TAO_Invocation_Endpoint_Selector *get_selector ( - ACE_ENV_SINGLE_ARG_DECL); - -protected: - /// The possible endpoint selector strategies that can be - /// returned by this factory - - TAO_Optimized_Connection_Endpoint_Selector *oc_endpoint_selector_; -}; - - -TAO_END_VERSIONED_NAMESPACE_DECL - - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) -ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) - -#include /**/ "ace/post.h" -#endif /* TAO_OC_ENDPOINT_SELECTOR_FACTORY_H */ diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp deleted file mode 100644 index c250cd76240..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "tao/Strategies/OC_Endpoint_Selector_Loader.h" -#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" - -ACE_RCSID (tao, - OC_Endpoint_Selector_Loader, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_OC_Endpoint_Selector_Loader::TAO_OC_Endpoint_Selector_Loader (void) -{ -#if defined (TAO_AS_STATIC_LIBS) - ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory); -#endif /* TAO_AS_STATIC_LIBS */ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h deleted file mode 100644 index 5edc517027d..00000000000 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h +++ /dev/null @@ -1,62 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file OC_Endpoint_Selector_Loader.h - * - * $Id$ - * - * Strategies for selecting profile/endpoint from an IOR for making an - * invocation. - * - * @author Phil Mesnier <mesnier_p@ociweb.com> - */ -//============================================================================= - - -#ifndef TAO_OC_ENDPOINT_LOADER_H -#define TAO_OC_ENDPOINT_LOADER_H -#include /**/ "ace/pre.h" - -#include "tao/Strategies/strategies_export.h" -#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Forward references -class TAO_Optimized_Connection_Endpoint_Selector; - -// **************************************************************** - -/** - * @class TAO_OC_Endpoint_Selector_Loader - * - * @brief Static initializer used to ensure the Optimized Connector - * Endpoint Selector is available for use in static applications - * - * This class is not needed when using dynamic linking and the service - * configuratior. Statically linked applications need to include this - * header to ensure that all the necessary dependencies are met. In - * addition, the svc config directive is required for setting any - * initialization parameters for the endpoint selector. - * - */ -class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader -{ -public: - TAO_OC_Endpoint_Selector_Loader (void); -}; - - -static TAO_OC_Endpoint_Selector_Loader _TAO_oc_endpoint_selector_loader; - - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_OC_ENDPOINT_LOADER_H */ diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp deleted file mode 100644 index dae584e8152..00000000000 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// -*- C++ -*- - -#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h" - -#include "tao/debug.h" -#include "tao/Stub.h" -#include "tao/Profile.h" -#include "tao/Endpoint.h" -#include "tao/Base_Transport_Property.h" -#include "tao/ORB_Core.h" -#include "tao/Transport.h" -#include "tao/Profile_Transport_Resolver.h" - -ACE_RCSID (tao, - Invocation_Endpoint_Selectors, - "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// **************************************************************** - -ACE_Time_Value TAO_Optimized_Connection_Endpoint_Selector::timeout_; - -TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv) -{ - TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv; - if (TAO_debug_level) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector:") - ACE_TEXT ("Initializing timeout hook tv = %d sec, %d usec\n"), - tv.sec(), tv.usec())); - } - if (tv > ACE_Time_Value::zero) - { - TAO_ORB_Core::connection_timeout_hook - (TAO_Optimized_Connection_Endpoint_Selector::hook); - } -} - -TAO_Optimized_Connection_Endpoint_Selector::~TAO_Optimized_Connection_Endpoint_Selector (void) -{ -} - - -void -TAO_Optimized_Connection_Endpoint_Selector::hook (TAO_ORB_Core *, - TAO_Stub *, - bool &has_timeout, - ACE_Time_Value &tv) -{ - has_timeout = - TAO_Optimized_Connection_Endpoint_Selector:: - timeout_ > ACE_Time_Value::zero; - if (has_timeout) - tv = TAO_Optimized_Connection_Endpoint_Selector::timeout_; -} - -int -TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p, - TAO::Profile_Transport_Resolver *r) -{ - TAO_Endpoint *effective_endpoint = 0; - - r->profile(p); - effective_endpoint = p->endpoint (); - size_t endpoint_count = p->endpoint_count(); - for (size_t i = 0; i < endpoint_count; ++i) - { - TAO_Base_Transport_Property desc (effective_endpoint); - if (r->find_transport(&desc)) - return 1; - // Go to the next endpoint in this profile - effective_endpoint = effective_endpoint->next(); - } - return 0; -} - -void -TAO_Optimized_Connection_Endpoint_Selector::select_endpoint - ( TAO::Profile_Transport_Resolver *r, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL) -{ - TAO_Stub *stub = r->stub(); - TAO_Profile *p = stub->profile_in_use(); - - // first, look for the endpoints for the current profile in use. - // if that is available then go for it. - - if (this->check_profile (p, r) != 0) - return; - - // next, look for any other profiles. If the stub has any forward profiles, - // use those, otherwise look at the base profiles. This separation is - // necessary to avoid re-using a corbaloc or other previously forwarded - // profile. - - const TAO_MProfile *profiles = stub->forward_profiles(); - if (profiles != 0) - { - for (CORBA::ULong count = 0; count < profiles->profile_count(); count++) - { - p = const_cast<TAO_Profile *>(profiles->get_profile(count)); - if (this->check_profile (p, r) != 0) - { - if (stub->profile_in_use() != p) - { - // thread-safe way to coerse stub to this profile. - stub->reset_profiles(); - while (stub->profile_in_use() != p) - if (stub->next_profile_retry() == 0) - break; - } - return; - } - } - } - else - { - do - { - p = stub->profile_in_use(); - if (this->check_profile(p, r) != 0) - return; - } - while (stub->next_profile_retry () != 0); - } - - - - // at this point, we do not have an existing transport, so we must - // reset the profile list and try establishing connections via the - // connector(s). - - do - { - r->profile (r->stub ()->profile_in_use ()); - - // Check whether we need to do a blocked wait or we have a - // non-blocked wait and we support that. If this is not the - // case we can't use this profile so try the next. - if (r->blocked_connect () || - (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ())) - { - const size_t endpoint_count = - r->profile ()->endpoint_count (); - - TAO_Endpoint *ep = - r->profile ()->endpoint (); - - for (size_t i = 0; i < endpoint_count; ++i) - { - TAO_Base_Transport_Property desc (ep); - const bool retval = - r->try_connect (&desc, - max_wait_time - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Check if the connect has completed. - if (retval) - return; - - // Go to the next endpoint in this profile. - ep = ep->next (); - } - } - } - while (r->stub ()->next_profile_retry () != 0); - - // If we get here, we completely failed to find an endpoint selector - // that we know how to use, so throw an exception. - ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2, - CORBA::COMPLETED_NO)); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h deleted file mode 100644 index 818541916c6..00000000000 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ /dev/null @@ -1,80 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -//============================================================================= -/** - * @file Optimized_Connection_Endpoint_Selector.h - * - * $Id$ - * - * Strategies for selecting profile/endpoint from an IOR for making an - * invocation. - * - * @author Phil Mesnier <mesnier_p@ociweb.com> - */ -//============================================================================= - - -#ifndef TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H -#define TAO_OPTIMIZED_ENDPOINT_SELECTOR_H - -#include /**/ "ace/pre.h" - -#include "tao/corbafwd.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Strategies/strategies_export.h" - -#include "tao/Invocation_Endpoint_Selectors.h" -#include "ace/Time_Value.h" - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_GIOP_Invocation; -class TAO_ORB_Core; -class TAO_Stub; -class TAO_Profile; - -/** - * @class TAO_Optimized_Connection_Endpoint_Selector - * - * @brief More efficient connection strategy for endpoint selection. - * - * This strategy builds on the default by first querying the connection - * cache for all potential endpoints before iterating over the list to - * attempt to create new connections. - */ - -class TAO_Strategies_Export TAO_Optimized_Connection_Endpoint_Selector : -public TAO_Default_Endpoint_Selector -{ -public: - /// Constructor. - TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value& tv); - - /// Destructor. - virtual ~TAO_Optimized_Connection_Endpoint_Selector (void); - - static void hook (TAO_ORB_Core *, - TAO_Stub *, - bool &has_timeout, - ACE_Time_Value &tv); - - virtual void select_endpoint (TAO::Profile_Transport_Resolver *, - ACE_Time_Value *max_wait_time - ACE_ENV_ARG_DECL); -private: - - int check_profile (TAO_Profile *, - TAO::Profile_Transport_Resolver *); - - static ACE_Time_Value timeout_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /* TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H */ diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 03574aa5b2b..cd8b50e2502 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -11,16 +11,13 @@ #include "tao/CDR.h" #if !defined(__ACE_INLINE__) -#include "tao/Strategies/SCIOP_Acceptor.i" +#include "SCIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, SCIOP_Acceptor, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE), addrs_ (0), @@ -610,7 +607,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]), + ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -1031,6 +1028,4 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index f81492115c2..a62f9e9d395 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =================================================================== /* @@ -32,12 +30,10 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" #include "tao/Transport_Acceptor.h" -#include "tao/Strategies/SCIOP_Connection_Handler.h" +#include "SCIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO SCIOP_Acceptor concrete call defination /** @@ -222,10 +218,8 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(__ACE_INLINE__) -#include "tao/Strategies/SCIOP_Acceptor.i" +#include "SCIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.i b/TAO/tao/Strategies/SCIOP_Acceptor.i index a5f51de6042..b6e6b200890 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.i +++ b/TAO/tao/Strategies/SCIOP_Acceptor.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_INET_Addr& TAO_SCIOP_Acceptor::address (void) const { @@ -24,5 +21,3 @@ TAO_SCIOP_Acceptor::endpoints (void) return this->addrs_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 932a4e6b575..6bb68061112 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -1,4 +1,4 @@ -#include "tao/Strategies/SCIOP_Connection_Handler.h" +#include "SCIOP_Connection_Handler.h" #if TAO_HAS_SCIOP == 1 @@ -19,8 +19,8 @@ #include "tao/ORB.h" #include "tao/CDR.h" #include "tao/Server_Strategy_Factory.h" -#include "tao/Strategies/SCIOP_Transport.h" -#include "tao/Strategies/SCIOP_Endpoint.h" +#include "SCIOP_Transport.h" +#include "SCIOP_Endpoint.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Base_Transport_Property.h" @@ -32,8 +32,6 @@ ACE_RCSID (tao, SCIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Connection_Handler::TAO_SCIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SCIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0), @@ -205,7 +203,7 @@ TAO_SCIOP_Connection_Handler::open (void*) return -1; this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -317,7 +315,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list ( ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Listening port [%d] on [%s]\n"), listen_point.port, - ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()))); + ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()))); } // Construct an SCIOP_Endpoint object @@ -385,6 +383,4 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index 9cfe605b80f..741bb4762e4 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =================================================================== /** @@ -29,23 +27,23 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Connection_Handler.h" #include "tao/IIOPC.h" #include "ace/Svc_Handler.h" #include "ace/SOCK_SEQPACK_Association.h" -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Service Handler for this transport typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH> TAO_SCIOP_SVC_HANDLER; +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT +template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + + // Forward Decls class TAO_Pluggable_Messaging; @@ -139,8 +137,6 @@ private: int dscp_codepoint_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index 663bccdb60a..60ec25b6100 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/SCIOP_Connector.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Connector.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -24,9 +24,6 @@ ACE_RCSID (TAO, SCIOP_Connector, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SCIOP_PROFILE), lite_flag_ (flag), @@ -162,7 +159,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SCIOP_Connector::make_connection_i, " "to <%s:%d> which should %s\n", - ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()), + ACE_TEXT_TO_TCHAR_IN(sciop_endpoint->host()), sciop_endpoint->port(), r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock"))); @@ -425,6 +422,5 @@ TAO_SCIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 8431309099a..dd6aa57d8c2 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //============================================================================= /** @@ -30,14 +28,12 @@ #if TAO_HAS_SCIOP == 1 +class TAO_SCIOP_Endpoint; + #include "ace/Connector.h" #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" -#include "tao/Strategies/SCIOP_Connection_Handler.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_SCIOP_Endpoint; +#include "SCIOP_Connection_Handler.h" // **************************************************************** @@ -129,8 +125,6 @@ private: TAO_SCIOP_BASE_CONNECTOR base_connector_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 136d8927ff2..89ac5c3bd2c 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -1,4 +1,4 @@ -#include "tao/Strategies/SCIOP_Endpoint.h" +#include "SCIOP_Endpoint.h" #if TAO_HAS_SCIOP == 1 @@ -19,10 +19,9 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/SCIOP_Endpoint.i" +# include "SCIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses) @@ -365,6 +364,4 @@ TAO_SCIOP_Endpoint::preferred_network (void) const return this->preferred_path_.host.in (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 483d0206c36..0095ccfe186 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -29,13 +29,11 @@ #if TAO_HAS_SCIOP == 1 #include "tao/Endpoint.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" #include "tao/IIOP_EndpointsC.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_SCIOP_Connection_Handler; /** @@ -162,10 +160,9 @@ private: TAO_SCIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "tao/Strategies/SCIOP_Endpoint.i" +# include "SCIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.i b/TAO/tao/Strategies/SCIOP_Endpoint.i index 2174f62be7b..fd182741c6b 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.i +++ b/TAO/tao/Strategies/SCIOP_Endpoint.i @@ -1,8 +1,6 @@ // -*- C++ -*- // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const char * TAO_SCIOP_Endpoint::host (void) const { @@ -20,5 +18,3 @@ TAO_SCIOP_Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp index c6c0d3a271d..0383f053e2a 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Factory.cpp @@ -1,6 +1,6 @@ -#include "tao/Strategies/SCIOP_Factory.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Connector.h" +#include "SCIOP_Factory.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Connector.h" #include "ace/OS_NS_strings.h" #if TAO_HAS_SCIOP == 1 @@ -13,8 +13,6 @@ ACE_RCSID (tao, static const char prefix_[] = "sciop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Protocol_Factory::TAO_SCIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE), major_ (TAO_DEF_SCIOP_MAJOR), @@ -81,8 +79,6 @@ TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Protocol_Factory, ACE_TEXT ("SCIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index a81198ab706..7b4a30aab29 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //============================================================================= /** @@ -25,17 +23,14 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; -class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory -: public TAO_Protocol_Factory +class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory { public: TAO_SCIOP_Protocol_Factory (void); @@ -67,8 +62,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp index e71cb4dd6ce..849981f5e07 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp @@ -1,6 +1,6 @@ -#include "tao/Strategies/SCIOP_Lite_Factory.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Connector.h" +#include "SCIOP_Lite_Factory.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Connector.h" #include "ace/Dynamic_Service.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_strings.h" @@ -11,8 +11,6 @@ ACE_RCSID(tao, SCIOP_Factory, "$Id$") static const char prefix_[] = "sciop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE), major_ (TAO_DEF_SCIOP_MAJOR), @@ -85,8 +83,6 @@ TAO_SCIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Lite_Protocol_Factory, ACE_TEXT ("SCIOP_Lite_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h index c4e05a13bb9..cdade7a16e9 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ //========================================================================== /** @@ -25,11 +23,10 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Acceptor; class TAO_Connector; @@ -68,8 +65,6 @@ private: int minor_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory) diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 0a9b1da7693..7c48f8e3f8e 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // SCIOP_Profile.cpp -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -11,7 +11,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/StringSeqC.h" -#include "tao/Strategies/sciop_endpointsC.h" +#include "sciop_endpointsC.h" ACE_RCSID(Strategies, SCIOP_Profile, @@ -21,14 +21,14 @@ static const char prefix_[] = "sciop"; const char TAO_SCIOP_Profile::object_key_delimiter_ = '/'; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - char TAO_SCIOP_Profile::object_key_delimiter (void) const { return TAO_SCIOP_Profile::object_key_delimiter_; } + + TAO_SCIOP_Profile::TAO_SCIOP_Profile (const ACE_INET_Addr &addr, const TAO::ObjectKey &object_key, const TAO_GIOP_Message_Version &version, @@ -513,6 +513,4 @@ TAO_SCIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index c2abcf93a1b..5310af754b0 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -26,9 +26,8 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/SCIOP_Endpoint.h" +#include "SCIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO SCIOP_Profile concrete Profile definitions /** @@ -134,8 +133,6 @@ protected: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 72da213aa93..a5acf0d6395 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Strategies/SCIOP_Transport.h" +#include "SCIOP_Transport.h" #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/SCIOP_Connection_Handler.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Profile.h" +#include "SCIOP_Connection_Handler.h" +#include "SCIOP_Acceptor.h" +#include "SCIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/Thread_Lane_Resources.h" #include "tao/operation_details.h" @@ -25,8 +25,6 @@ ACE_RCSID (tao, SCIOP_Transport, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean ) @@ -382,6 +380,4 @@ TAO_SCIOP_Transport::get_listen_point ( return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index ad07a706b64..e51f42b5778 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - // $Id$ // =================================================================== /** @@ -25,12 +23,10 @@ #if TAO_HAS_SCIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/IIOPC.h" #include "ace/SOCK_SEQPACK_Association.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_SCIOP_Connection_Handler; class TAO_ORB_Core; @@ -141,8 +137,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SCIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 5de6670b1a1..595f3bb55db 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -1,10 +1,11 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/SHMIOP_Acceptor.h" +#include "SHMIOP_Acceptor.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Profile.h" +#include "SHMIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" @@ -19,8 +20,6 @@ ACE_RCSID (Strategies, SHMIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), @@ -206,7 +205,7 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core, return -1; // Port number must consist of digits if (port) - this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port)); + this->address_.set (ACE_TEXT_TO_TCHAR_IN(port)); return this->open_i (orb_core, reactor); @@ -331,7 +330,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_TEXT ("cannot cache hostname\n"))); return -1; } - this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host); + this->host_ = ACE_TEXT_TO_CHAR_OUT(tmp_host); } // This avoids having child processes acquire the listen socket thereby @@ -344,7 +343,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ") ACE_TEXT ("listening on : <%s:%u>\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()), + ACE_TEXT_TO_TCHAR_IN(this->host_.c_str ()), this->address_.get_port_number ())); } return 0; @@ -478,7 +477,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - ACE_TEXT_CHAR_TO_TCHAR(opt.c_str ())), + ACE_TEXT_TO_TCHAR_IN(opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -500,13 +499,11 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), + ACE_TEXT_TO_TCHAR_IN(name.c_str ())), -1); } } return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index b1db53fd947..ef369ad0f9c 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // $Id$ // ============================================================================ @@ -31,15 +31,13 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Transport_Acceptor.h" -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "ace/Acceptor.h" #include "ace/MEM_Acceptor.h" #include "tao/GIOP_Message_Version.h" // TAO SHMIOP_Acceptor concrete call definitions -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_SHMIOP_Acceptor * @@ -150,8 +148,6 @@ private: CORBA::Boolean lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 788407dfd7d..9d384859ff7 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) @@ -13,7 +13,7 @@ #include "tao/Base_Transport_Property.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" -#include "tao/Strategies/SHMIOP_Endpoint.h" +#include "SHMIOP_Endpoint.h" #include "tao/Resume_Handle.h" #include "tao/Protocols_Hooks.h" @@ -24,8 +24,6 @@ ACE_RCSID (Strategies, SHMIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_SHMIOP_SVC_HANDLER (t, 0 , 0), TAO_Connection_Handler (0) @@ -159,7 +157,7 @@ TAO_SHMIOP_Connection_Handler::open (void*) // Not needed, anyway this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -252,6 +250,4 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void) this->transport ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*(TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) */ diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 626c424920b..fbfa34bc1fc 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -28,12 +28,9 @@ #include "ace/Acceptor.h" #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" -#include "tao/Strategies/SHMIOP_Transport.h" +#include "SHMIOP_Transport.h" // **************************************************************** - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_SHMIOP_Connection_Handler * @@ -42,6 +39,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * The Connection handler which is common for the Acceptor and * the Connector */ + + class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler : public TAO_SHMIOP_SVC_HANDLER, public TAO_Connection_Handler @@ -104,8 +103,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index adba9338dc1..d1490b46eb0 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/Strategies/SHMIOP_Connector.h" +#include "SHMIOP_Connector.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Profile.h" -#include "tao/Strategies/SHMIOP_Endpoint.h" +#include "SHMIOP_Profile.h" +#include "SHMIOP_Endpoint.h" #include "tao/debug.h" #include "tao/Base_Transport_Property.h" #include "tao/ORB_Core.h" @@ -21,8 +21,6 @@ ACE_RCSID (Strategies, SHMIOP_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SHMEM_PROFILE), connect_strategy_ (), @@ -35,6 +33,7 @@ TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void) { } + int TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core) { @@ -146,7 +145,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "making a new connection to <%s:%d>\n", - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port ())); // Get the right synch options @@ -182,7 +181,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ") ACE_TEXT ("connection to <%s:%u> failed (%p)\n"), - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port (), ACE_TEXT ("errno"))); } @@ -196,7 +195,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", - ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()), shmiop_endpoint->port (), svc_handler->peer ().get_handle ())); @@ -349,6 +348,5 @@ TAO_SHMIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 95c1ef4a2f7..d4b41468c55 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -30,12 +30,10 @@ #include "ace/MEM_Connector.h" #include "ace/Connector.h" #include "tao/Transport_Connector.h" -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" #include "tao/Connector_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_SHMIOP_Endpoint; // **************************************************************** @@ -129,8 +127,6 @@ private: CORBA::Boolean lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp index cf24fcd5fba..8d2ca160b58 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp @@ -1,10 +1,12 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/SHMIOP_Endpoint.h" + +#include "SHMIOP_Endpoint.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "SHMIOP_Connection_Handler.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -17,13 +19,11 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/SHMIOP_Endpoint.i" +# include "SHMIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Endpoint::TAO_SHMIOP_Endpoint (const ACE_MEM_Addr &addr, int use_dotted_decimal_addresses) : TAO_Endpoint (TAO_TAG_SHMEM_PROFILE) @@ -260,7 +260,4 @@ TAO_SHMIOP_Endpoint::object_addr (void) const return this->object_addr_; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h index bd5b24ffb14..c44a9f6705f 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.h +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h @@ -25,13 +25,12 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/CORBA_String.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/INET_Addr.h" #include "ace/MEM_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_SHMIOP_Endpoint @@ -136,10 +135,8 @@ private: TAO_SHMIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/SHMIOP_Endpoint.i" +# include "SHMIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.i b/TAO/tao/Strategies/SHMIOP_Endpoint.i index e507b39c440..e5a11fae5ab 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.i +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const char * TAO_SHMIOP_Endpoint::host (void) const { @@ -21,5 +18,3 @@ TAO_SHMIOP_Endpoint::port (CORBA::UShort p) { return this->port_ = p; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 27cca45b226..6d49937a410 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -1,9 +1,9 @@ -#include "tao/Strategies/SHMIOP_Factory.h" +#include "SHMIOP_Factory.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Acceptor.h" -#include "tao/Strategies/SHMIOP_Connector.h" +#include "SHMIOP_Acceptor.h" +#include "SHMIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -19,8 +19,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "shmiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Protocol_Factory::TAO_SHMIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_SHMEM_PROFILE), major_ (TAO_DEF_GIOP_MAJOR), @@ -82,12 +80,12 @@ TAO_SHMIOP_Protocol_Factory::init (int argc, { const ACE_TCHAR *current_arg = 0; - if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize")))) + if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize")))) { this->min_bytes_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix")))) { this->mmap_prefix_ = ACE::strnew (current_arg); arg_shifter.consume_arg (); @@ -118,8 +116,6 @@ TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_SHMIOP_Protocol_Factory, ACE_TEXT ("SHMIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index fff404e0d98..4093b9069e6 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ // ============================================================================ // @@ -28,17 +27,14 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Protocol_Factory.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; -class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory - : public TAO_Protocol_Factory +class TAO_Strategies_Export TAO_SHMIOP_Protocol_Factory : public TAO_Protocol_Factory { public: /// Constructor. @@ -91,8 +87,6 @@ private: off_t min_bytes_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_SHMIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SHMIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 71a73c4dc7c..db66c5aa82d 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -1,4 +1,4 @@ -#include "tao/Strategies/SHMIOP_Profile.h" +#include "SHMIOP_Profile.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) @@ -20,8 +20,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "shmiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/'; char @@ -511,6 +509,4 @@ TAO_SHMIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index f71d1546cb1..b7f367aea82 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -27,11 +27,10 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Profile.h" -#include "tao/Strategies/SHMIOP_Endpoint.h" +#include "SHMIOP_Endpoint.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO SHMIOP_Profile concrete Profile definitions /** @@ -123,8 +122,6 @@ private: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 23e03b8e94b..47fe0a6c898 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -1,11 +1,12 @@ +// This may look like C, but it's really -*- C++ -*- // $Id$ -#include "tao/Strategies/SHMIOP_Transport.h" +#include "SHMIOP_Transport.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/SHMIOP_Connection_Handler.h" -#include "tao/Strategies/SHMIOP_Profile.h" +#include "SHMIOP_Connection_Handler.h" +#include "SHMIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" @@ -19,9 +20,6 @@ ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -137,135 +135,31 @@ TAO_SHMIOP_Transport::recv (char *buf, return n; } + int -TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time, - int) +TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time) { - if (TAO_debug_level > 3) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input\n", - this->id ())); - } - - // The buffer on the stack which will be used to hold the input - // messages, compensate shrink due to alignment - char buf [TAO_MAXBUFSIZE + ACE_CDR::MAX_ALIGNMENT]; - + // Calculate the actual length of the load that we are supposed to + // read which is equal to the <missing_data> + length of the buffer + // that we have.. + size_t payload = missing_data + incoming.length (); -#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) - (void) ACE_OS::memset (buf, - '\0', - sizeof buf); -#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ - - // Create a data block - ACE_Data_Block db (sizeof (buf), - ACE_Message_Block::MB_DATA, - buf, - this->orb_core_->input_cdr_buffer_allocator (), - this->orb_core_->locking_strategy (), - ACE_Message_Block::DONT_DELETE, - this->orb_core_->input_cdr_dblock_allocator ()); - - // Create a message block - ACE_Message_Block message_block (&db, - ACE_Message_Block::DONT_DELETE, - this->orb_core_->input_cdr_msgblock_allocator ()); - - - // Align the message block - ACE_CDR::mb_align (&message_block); - - const size_t missing_header_data = this->messaging_object ()->header_length (); - - if (missing_header_data == 0) - { - return -1; - } + // Grow the buffer to the size of the message + ACE_CDR::grow (&incoming, + payload); // .. do a read on the socket again. ssize_t bytes = 0; // As this used for transports where things are available in one // shot this looping should not create any problems. - for (size_t m = missing_header_data; - m != 0; - m -= bytes) - { - bytes = 0; // reset - - // We would have liked to use something like a recv_n () - // here. But at the time when the code was written, the MEM_Stream - // classes had poor support for recv_n (). Till a day when we - // get proper recv_n (), let us stick with this. The other - // argument that can be said against this is that, this is the - // bad layer in which this is being done ie. recv_n is - // simulated. But... - bytes = this->recv (message_block.wr_ptr (), - m, - max_wait_time); - - if (bytes == 0 || - bytes == -1) - { - return -1; - } - - message_block.wr_ptr (bytes); - } - - TAO_Queued_Data qd (&message_block); - size_t mesg_length; // not used - - // Parse the incoming message for validity. The check needs to be - // performed by the messaging objects. - if (this->messaging_object ()->parse_next_message (message_block, - qd, - mesg_length) == -1) - return -1; - - if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) - { - // parse/marshal error happened - return -1; - } - - if (message_block.length () > mesg_length) - { - // we read too much data - return -1; - } - - if (message_block.space () < qd.missing_data_) - { - const size_t message_size = message_block.length () - + qd.missing_data_; - - // reallocate buffer with correct size on heap - if (ACE_CDR::grow (&message_block, message_size) == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - SHMIOP_Transport[%d]::handle_input, " - "error growing message buffer\n", - this->id () )); - } - return -1; - } - - } - - // As this used for transports where things are available in one - // shot this looping should not create any problems. - for (size_t n = qd.missing_data_; + for (size_t n = missing_data; n != 0; n -= bytes) { - bytes = 0; // reset - // We would have liked to use something like a recv_n () // here. But at the time when the code was written, the MEM_Stream // classes had poor support for recv_n (). Till a day when we @@ -273,7 +167,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, // argument that can be said against this is that, this is the // bad layer in which this is being done ie. recv_n is // simulated. But... - bytes = this->recv (message_block.wr_ptr (), + bytes = this->recv (incoming.wr_ptr (), n, max_wait_time); @@ -283,24 +177,21 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, return -1; } - message_block.wr_ptr (bytes); - + incoming.wr_ptr (bytes); } - qd.missing_data_ = 0; + TAO_Queued_Data pqd (&incoming); + + // With SHMIOP we would not have any missing data... + pqd.missing_data_ = 0; + + this->messaging_object ()->get_message_data (&pqd); // Now we have a full message in our buffer. Just go ahead and // process that - if (this->process_parsed_messages (&qd, rh) == -1) - { - return -1; - } - - return 0; + return this->process_parsed_messages (&pqd, rh); } - - int TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, @@ -367,6 +258,4 @@ TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 6c90b821c4e..a8655d8c1db 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -24,17 +24,11 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Svc_Handler.h" #include "ace/MEM_Stream.h" #include "tao/Transport.h" -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_SHMIOP_Connection_Handler; class TAO_Pluggable_Messaging; class TAO_Target_Specification; @@ -43,6 +37,10 @@ class Tao_Operation_Details; typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH> TAO_SHMIOP_SVC_HANDLER; +#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT +template class TAO_Strategies_Export ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ + /** * @class TAO_SHMIOP_Transport * @@ -84,9 +82,11 @@ protected: size_t len, const ACE_Time_Value *s = 0); - virtual int handle_input (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time, - int block = 0); + virtual int consolidate_message (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time); + //@} public: @@ -116,8 +116,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 87917221593..4ec98202ca3 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -1,8 +1,8 @@ -#include "tao/Strategies/UIOP_Acceptor.h" +#include "UIOP_Acceptor.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" @@ -19,8 +19,6 @@ ACE_RCSID (Strategies, UIOP_Acceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_UIOP_PROFILE), base_acceptor_ (), @@ -479,6 +477,4 @@ TAO_UIOP_Acceptor::parse_options (const char *str) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h index 20de4591230..7610ce7f277 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.h +++ b/TAO/tao/Strategies/UIOP_Acceptor.h @@ -25,7 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Connection_Handler.h" #include "tao/Transport_Acceptor.h" #include "tao/Acceptor_Impl.h" @@ -34,8 +34,6 @@ #include "ace/Acceptor.h" #include "ace/LSOCK_Acceptor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_UIOP_Acceptor * @@ -137,8 +135,6 @@ private: const bool lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index ada81ab9075..7db6103a5d2 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Connection_Handler.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Transport.h" -#include "tao/Strategies/UIOP_Endpoint.h" +#include "UIOP_Transport.h" +#include "UIOP_Endpoint.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -23,7 +23,6 @@ ACE_RCSID (Strategies, UIOP_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t) : TAO_UIOP_SVC_HANDLER (t, 0 , 0), @@ -138,7 +137,7 @@ TAO_UIOP_Connection_Handler::open (void*) return -1; this->state_changed (TAO_LF_Event::LFS_SUCCESS, - this->orb_core ()->leader_follower ()); + this->orb_core ()->leader_follower ()); return 0; } @@ -229,6 +228,4 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void) this->transport ()); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*TAO_HAS_UIOP == 1*/ diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index c2e0078cd00..ca14c8aeb4a 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -32,9 +32,7 @@ #include "ace/Reactor.h" #include "tao/Connection_Handler.h" #include "tao/Wait_Strategy.h" -#include "tao/Strategies/UIOP_Transport.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "UIOP_Transport.h" // Forward Decls class TAO_Pluggable_Messaging; @@ -88,6 +86,7 @@ public: const void *act = 0); //@} + /// Add ourselves to Cache. int add_transport_to_cache (void); @@ -101,8 +100,6 @@ protected: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index efce00f17d2..6ce63d9709a 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -1,8 +1,8 @@ -#include "tao/Strategies/UIOP_Connector.h" +#include "UIOP_Connector.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Environment.h" @@ -21,8 +21,6 @@ ACE_RCSID(Strategies, UIOP_Connector, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_UIOP_PROFILE), connect_strategy_ (), @@ -397,7 +395,7 @@ TAO_UIOP_Connector::cancel_svc_handler ( TAO_Connection_Handler * svc_handler) { TAO_UIOP_Connection_Handler* handler= - dynamic_cast<TAO_UIOP_Connection_Handler*> (svc_handler); + dynamic_cast<TAO_UIOP_Connection_Handler*>(svc_handler); if (handler) // Cancel from the connector @@ -406,6 +404,4 @@ TAO_UIOP_Connector::cancel_svc_handler ( return -1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 1898316e91a..e53b09b3295 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -31,12 +31,10 @@ #include "ace/LSOCK_Connector.h" #include "ace/Connector.h" #include "tao/Transport_Connector.h" -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" #include "tao/Connector_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_UIOP_Endpoint; class TAO_Endpoint; @@ -75,7 +73,7 @@ public: virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len ACE_ENV_ARG_DECL); - + virtual char object_key_delimiter (void) const; /// Cancel the passed cvs handler from the connector @@ -133,8 +131,6 @@ private: const bool lite_flag_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp index f0ff4199582..d843a8b2d14 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp @@ -1,5 +1,5 @@ -#include "tao/Strategies/UIOP_Endpoint.h" -#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "UIOP_Endpoint.h" +#include "UIOP_Connection_Handler.h" #include "tao/ORB_Constants.h" @@ -15,10 +15,9 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "tao/Strategies/UIOP_Endpoint.i" +# include "UIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr, CORBA::Short priority) @@ -103,7 +102,4 @@ TAO_UIOP_Endpoint::hash (void) return this->hash_val_; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index dfff6c2a1f2..f788dc014d6 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -24,10 +24,9 @@ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/UNIX_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_UIOP_Endpoint @@ -92,10 +91,8 @@ private: TAO_UIOP_Endpoint *next_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Strategies/UIOP_Endpoint.i" +# include "UIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ # endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i index a7a01b59c3d..337bbae6a76 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.i +++ b/TAO/tao/Strategies/UIOP_Endpoint.i @@ -1,23 +1,19 @@ // -*- C++ -*- -// // $Id$ # if TAO_HAS_UIOP == 1 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE const ACE_UNIX_Addr & TAO_UIOP_Endpoint::object_addr (void) const { return this->object_addr_; } + ACE_INLINE const char * TAO_UIOP_Endpoint::rendezvous_point (void) const { return this->object_addr_.get_path_name (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index b74a464f82c..080f76eccc8 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -1,12 +1,12 @@ // -*- C++ -*- // $Id$ -#include "tao/Strategies/UIOP_Factory.h" +#include "UIOP_Factory.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Acceptor.h" -#include "tao/Strategies/UIOP_Connector.h" +#include "UIOP_Acceptor.h" +#include "UIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -20,8 +20,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "uiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE), major_ (TAO_DEF_GIOP_MAJOR), @@ -89,8 +87,6 @@ TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_UIOP_Protocol_Factory, ACE_TEXT ("UIOP_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h index d3ec7616987..6214e67f0a1 100644 --- a/TAO/tao/Strategies/UIOP_Factory.h +++ b/TAO/tao/Strategies/UIOP_Factory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ // ============================================================================ // @@ -29,11 +28,9 @@ # if TAO_HAS_UIOP == 1 #include "tao/Protocol_Factory.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; @@ -78,8 +75,6 @@ private: // compatibility with old clients. }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Protocol_Factory) diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp index 8aa707a3472..b86f8fe3856 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp @@ -1,9 +1,9 @@ -#include "tao/Strategies/UIOP_Lite_Factory.h" +#include "UIOP_Lite_Factory.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Acceptor.h" -#include "tao/Strategies/UIOP_Connector.h" +#include "UIOP_Acceptor.h" +#include "UIOP_Connector.h" #include "tao/ORB_Constants.h" @@ -18,8 +18,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "uiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void) : TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE), major_ (TAO_DEF_GIOP_MAJOR), @@ -91,8 +89,6 @@ TAO_UIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_UIOP_Lite_Protocol_Factory, ACE_TEXT ("UIOP_Lite_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h index 9199095b1cc..332506d4dbd 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ // ============================================================================ // @@ -29,14 +28,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Protocol_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Acceptor; class TAO_Connector; + class TAO_Strategies_Export TAO_UIOP_Lite_Protocol_Factory : public TAO_Protocol_Factory { @@ -80,8 +78,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_UIOP_Lite_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory) diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 853bfc83d9e..76ba5ede816 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -1,8 +1,8 @@ -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Profile.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/uiop_endpointsC.h" +#include "uiop_endpointsC.h" #include "tao/CDR.h" #include "tao/Environment.h" @@ -20,8 +20,6 @@ ACE_RCSID (Strategies, static const char prefix_[] = "uiop"; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - const char TAO_UIOP_Profile::object_key_delimiter_ = '|'; char @@ -449,6 +447,4 @@ TAO_UIOP_Profile::decode_endpoints (void) return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index fe515c4d388..069c5105965 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -27,14 +27,13 @@ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/Profile.h" -#include "tao/Strategies/UIOP_Connection_Handler.h" -#include "tao/Strategies/UIOP_Endpoint.h" +#include "UIOP_Connection_Handler.h" +#include "UIOP_Endpoint.h" #include "ace/UNIX_Addr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_UIOP_Profile @@ -121,8 +120,6 @@ private: CORBA::ULong count_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 4adc371f55a..df5a0032644 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Strategies/UIOP_Transport.h" +#include "UIOP_Transport.h" #if TAO_HAS_UIOP == 1 -#include "tao/Strategies/UIOP_Connection_Handler.h" -#include "tao/Strategies/UIOP_Profile.h" +#include "UIOP_Connection_Handler.h" +#include "UIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" @@ -20,9 +20,6 @@ ACE_RCSID (Strategies, UIOP_Transport, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core, CORBA::Boolean flag) @@ -186,6 +183,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream, return 1; } + int TAO_UIOP_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) @@ -195,6 +193,4 @@ TAO_UIOP_Transport::messaging_init (CORBA::Octet major, return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_UIOP */ diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 1a7599f45fb..aefcb26ecbc 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- // =================================================================== /** @@ -25,13 +25,11 @@ # if TAO_HAS_UIOP == 1 -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "ace/LSOCK_Acceptor.h" #include "ace/Svc_Handler.h" #include "tao/Transport.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decls. class TAO_ORB_Core; @@ -112,8 +110,6 @@ private: TAO_Pluggable_Messaging *messaging_object_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - # endif /* TAO_HAS_UIOP == 1 */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index dc6c0a5886f..62c42275c06 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -1,17 +1,17 @@ // $Id$ #include "ace/Service_Config.h" -#include "tao/Strategies/advanced_resource.h" +#include "advanced_resource.h" -#include "tao/Strategies/UIOP_Factory.h" -#include "tao/Strategies/SHMIOP_Factory.h" -#include "tao/Strategies/DIOP_Factory.h" -#include "tao/Strategies/SCIOP_Factory.h" +#include "UIOP_Factory.h" +#include "SHMIOP_Factory.h" +#include "DIOP_Factory.h" +#include "SCIOP_Factory.h" -#include "tao/Strategies/LFU_Connection_Purging_Strategy.h" -#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h" -#include "tao/Strategies/NULL_Connection_Purging_Strategy.h" +#include "LFU_Connection_Purging_Strategy.h" +#include "FIFO_Connection_Purging_Strategy.h" +#include "NULL_Connection_Purging_Strategy.h" -#include "tao/Strategies/LF_Strategy_Null.h" +#include "LF_Strategy_Null.h" #include "tao/debug.h" #include "tao/LRU_Connection_Purging_Strategy.h" @@ -37,8 +37,6 @@ ACE_RCSID(Strategies, advanced_resource, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void) { @@ -130,7 +128,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) -1); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorLock")))) { ACE_DEBUG ((LM_DEBUG, @@ -144,7 +142,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorType")))) { if (ACE_OS::strcasecmp (current_arg, @@ -186,7 +184,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBInputCDRAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -208,7 +206,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMHResponseHandlerAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -228,7 +226,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMIResponseHandlerAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -248,7 +246,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorThreadQueue")))) { if (ACE_OS::strcasecmp (current_arg, @@ -384,7 +382,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -447,7 +445,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -510,7 +508,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -573,7 +571,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to add ") ACE_TEXT("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ()))); delete item; @@ -606,7 +604,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("TAO (%P|%t) Unable to load ") ACE_TEXT("protocol <%s>, %m\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), + ACE_TEXT_TO_TCHAR_IN(name.c_str ())), -1); } @@ -614,7 +612,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) Loaded protocol <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(name.c_str ()))); } } return 0; @@ -691,6 +689,9 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> NULL_LOCK_MALLOC; typedef ACE_Allocator_Adapter<NULL_LOCK_MALLOC> NULL_LOCK_ALLOCATOR; +typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; +typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; + ACE_Allocator * TAO_Advanced_Resource_Factory::input_cdr_dblock_allocator (void) { @@ -721,9 +722,12 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void) NULL_LOCK_ALLOCATOR, 0); break; + case TAO_ALLOCATOR_THREAD_LOCK: default: - return - this->TAO_Default_Resource_Factory::input_cdr_buffer_allocator(); + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); + break; } return allocator; } @@ -874,8 +878,6 @@ TAO_Advanced_Resource_Factory::report_unsupported_error ( option_name)); } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory, diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index 98dde1143d3..17c1279003c 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -4,7 +4,7 @@ #define TAO_ADVANCED_RESOURCE_H #include /**/ "ace/pre.h" -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/default_resource.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -13,8 +13,6 @@ #include "tao/ORB_Core.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Connection_Purging_Strategy; class TAO_Strategies_Export TAO_Resource_Factory_Changer @@ -134,12 +132,10 @@ protected: }; -static TAO_Resource_Factory_Changer TAO_changer; - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_Advanced_Resource_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_Advanced_Resource_Factory) +static TAO_Resource_Factory_Changer TAO_changer; + #include /**/ "ace/post.h" #endif /* TAO_ADVANCED_RESOURCE_H */ diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp index 7b5dbd4fd68..21e65ac0c8a 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.cpp +++ b/TAO/tao/Strategies/sciop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/Strategies/sciop_endpointsC.h" +#include "sciop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -266,5 +264,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h index 4944c7276c0..4e89a5b4e47 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.h +++ b/TAO/tao/Strategies/sciop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" @@ -62,8 +62,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -185,8 +183,6 @@ TAO_Strategies_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp index a9b2ed7f462..c3728f7bf79 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.cpp +++ b/TAO/tao/Strategies/uiop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/Strategies/uiop_endpointsC.h" +#include "uiop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -46,8 +46,6 @@ // TAO_IDL - Generated from // be/be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -263,5 +261,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h index 1907a64939b..f85b1a69906 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.h +++ b/TAO/tao/Strategies/uiop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Strategies/strategies_export.h" +#include "strategies_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" @@ -62,8 +62,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -184,8 +182,6 @@ TAO_Strategies_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 426787893e4..5e3db1770bc 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/StringSeqC.h" +#include "StringSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -162,5 +160,3 @@ return false; } #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index 85a6e6bb5ac..9cfebe0ca70 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -139,8 +137,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 67807d51226..5aa6f7ab6db 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -8,18 +8,17 @@ // based implementation, and can neither be used by other kinds of // objref nor have a default implementation. -#include "tao/Stub.h" -#include "tao/Profile.h" -#include "tao/ORB_Core.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/Remote_Object_Proxy_Broker.h" -#include "tao/Transport_Queueing_Strategies.h" -#include "tao/debug.h" -#include "tao/Policy_Manager.h" -#include "tao/SystemException.h" +#include "Stub.h" +#include "Profile.h" +#include "ORB_Core.h" +#include "Client_Strategy_Factory.h" +#include "Transport_Queueing_Strategies.h" +#include "debug.h" +#include "Policy_Manager.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) -# include "tao/Stub.i" +# include "Stub.i" #endif /* ! __ACE_INLINE__ */ #include "ace/Auto_Ptr.h" @@ -29,7 +28,6 @@ ACE_RCSID (tao, TAO_Stub, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Stub::TAO_Stub (const char *repository_id, const TAO_MProfile &profiles, @@ -37,13 +35,9 @@ TAO_Stub::TAO_Stub (const char *repository_id, : type_id (repository_id) , orb_core_ (orb_core) , orb_ () - , is_collocated_ (false) , servant_orb_ () - , collocated_servant_ (0) - , object_proxy_broker_ (the_tao_remote_object_proxy_broker ()) , base_profiles_ ((CORBA::ULong) 0) , forward_profiles_ (0) - , forward_profiles_perm_ (0) , profile_in_use_ (0) , profile_lock_ptr_ (0) , profile_success_ (false) @@ -111,8 +105,7 @@ TAO_Stub::~TAO_Stub (void) } void -TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, - const CORBA::Boolean permanent_forward) +TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles) { // we assume that the profile_in_use_ is being // forwarded! Grab the lock so things don't change. @@ -120,14 +113,6 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, guard, *this->profile_lock_ptr_)); - if (permanent_forward) - { - // paranoid, reset the bookmark, then clear the forward-stack - this->forward_profiles_perm_ = 0; - - this->reset_forward (); - } - TAO_MProfile *now_pfiles = this->forward_profiles_; if (now_pfiles == 0) now_pfiles = &this->base_profiles_; @@ -135,10 +120,6 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles, ACE_NEW (this->forward_profiles_, TAO_MProfile (mprofiles)); - if (permanent_forward) - // bookmark the new element at bottom of stack - this->forward_profiles_perm_ = this->forward_profiles_; - // forwarded profile points to the new IOR (profiles) this->profile_in_use_->forward_to (this->forward_profiles_); @@ -285,25 +266,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, return 0; } -void -TAO_Stub::is_collocated (CORBA::Boolean collocated) -{ - if (this->is_collocated_ != collocated) - { - if (collocated && - _TAO_Object_Proxy_Broker_Factory_function_pointer != 0) - { - this->object_proxy_broker_ = - _TAO_Object_Proxy_Broker_Factory_function_pointer (); - } - else - { - this->object_proxy_broker_ = - the_tao_remote_object_proxy_broker (); - } - this->is_collocated_ = collocated; - } -} + // Quick'n'dirty hash of objref data, for partitioning objrefs into // sets. @@ -329,14 +292,14 @@ TAO_Stub::hash (CORBA::ULong max CORBA::Boolean TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj) { - if (CORBA::is_nil (other_obj)) - return false; + if (CORBA::is_nil (other_obj) == 1) + return 0; TAO_Profile *other_profile = other_obj->_stubobj ()->profile_in_use_; TAO_Profile *this_profile = this->profile_in_use_; if (other_profile == 0 || this_profile == 0) - return false; + return 0; // Compare the profiles return this_profile->is_equivalent (other_profile); @@ -400,6 +363,7 @@ TAO_Stub::forward_back_one (void) from->get_current_profile ()->forward_to (0); this->forward_profiles_ = from; } + } @@ -617,65 +581,3 @@ TAO_Stub::transport_queueing_strategy (void) return this->orb_core_->default_transport_queueing_strategy (); } -CORBA::Boolean -TAO_Stub::marshal (TAO_OutputCDR &cdr) -{ - // do as many outside of locked else-branch as posssible - - // STRING, a type ID hint - if ((cdr << this->type_id.in()) == 0) - return 0; - - if ( ! this->forward_profiles_perm_) - { - const TAO_MProfile& mprofile = this->base_profiles_; - - CORBA::ULong profile_count = mprofile.profile_count (); - if ((cdr << profile_count) == 0) - return 0; - - // @@ The MProfile should be locked during this iteration, is there - // anyway to achieve that? - for (CORBA::ULong i = 0; i < profile_count; ++i) - { - const TAO_Profile* p = mprofile.get_profile (i); - if (p->encode (cdr) == 0) - return 0; - } - } - else - { - ACE_MT (ACE_GUARD_RETURN (ACE_Lock, - guard, - *this->profile_lock_ptr_, - 0)); - - ACE_ASSERT(this->forward_profiles_ !=0); - - // paranoid - in case of FT the basic_profiles_ would do, too, - // but might be dated - const TAO_MProfile& mprofile = - this->forward_profiles_perm_ - ? *(this->forward_profiles_perm_) - : this->base_profiles_; - - CORBA::ULong profile_count = mprofile.profile_count (); - if ((cdr << profile_count) == 0) - return 0; - - // @@ The MProfile should be locked during this iteration, is there - // anyway to achieve that? - for (CORBA::ULong i = 0; i < profile_count; ++i) - { - const TAO_Profile* p = mprofile.get_profile (i); - if (p->encode (cdr) == 0) - return 0; - } - - // release ACE_Lock - } - - return (CORBA::Boolean) cdr.good_bit (); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 63b302b5ebc..ee0a989a50a 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -33,17 +33,13 @@ # undef IOR #endif /* HPUX && IOR */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations. -class TAO_Abstract_ServantBase; class TAO_Policy_Set; class TAO_Profile; namespace TAO { class ObjectKey; - class Object_Proxy_Broker; class Transport_Queueing_Strategy; } @@ -151,8 +147,6 @@ public: /// Obtain a pointer to the forwarded profile set const TAO_MProfile *forward_profiles (void) const; - /// True if permanent location forward occured, in this case the lock must be set and the - // Manage forward and base profiles. /** * THREAD SAFE. If forward_profiles is null then this will @@ -190,15 +184,9 @@ public: /** * THREAD SAFE. * Set the forward_profiles. This object will assume ownership of - * this TAO_MProfile object!! if permanent_forward is true, - * currently used profiles will be replaced permanently, otherwise - * stub may fallback to current profiles later. The flag - * permanent_forward=true is only valid if currently used profile - * set represents a GroupObject (IOGR), otherwise this flag will be - * ignored. + * this TAO_MProfile object!! */ - void add_forward_profiles (const TAO_MProfile &mprofiles, - const CORBA::Boolean permanent_forward=false); + void add_forward_profiles (const TAO_MProfile &mprofiles); /** * THREAD SAFE @@ -210,12 +198,6 @@ public: /// Accessor. TAO_ORB_Core* orb_core (void) const; - /// Is this stub collocated with the servant? - CORBA::Boolean is_collocated (void) const; - - /// Mutator to mark this stub as being collocated with the servant. - void is_collocated (CORBA::Boolean); - /// This returns a duplicated ORB pointer. CORBA::ORB_ptr servant_orb_ptr (void); @@ -230,22 +212,6 @@ public: */ void servant_orb (CORBA::ORB_ptr orb); - /// Mutator for setting the servant in collocated cases. - void collocated_servant (TAO_Abstract_ServantBase* servant); - - /// Accessor for the servant reference in collocated cases. - TAO_Abstract_ServantBase* collocated_servant (void) const; - - /// Mutator for setting the object proxy broker pointer. - /// CORBA::Objects using this stub will use this for standard calls - /// like is_a; get_interface; etc... - void object_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker); - - /// Accessor for getting the object proxy broker pointer. - /// CORBA::Objects using this stub use this for standard calls - /// like is_a; get_interface; etc... - TAO::Object_Proxy_Broker *object_proxy_broker (void) const; - /** * Create the IOP::IOR info. We will create the info at most once. * Get the index of the profile we are using to make the invocation. @@ -267,10 +233,6 @@ public: * collocation opportunities that are available to the ORB. */ CORBA::Boolean optimize_collocation_objects (void) const; - - // needed to avoid copying forward_profiles for thread safety - CORBA::Boolean marshal (TAO_OutputCDR&); - protected: /// Destructor is to be called only through _decr_refcnt() to @@ -311,8 +273,8 @@ private: private: // = Disallow copy construction and assignment. - TAO_Stub (const TAO_Stub &); - TAO_Stub &operator = (const TAO_Stub &); + ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &)) protected: /// Automatically manage the ORB_Core reference count @@ -338,10 +300,6 @@ protected: */ CORBA::ORB_var orb_; - /// Flag that indicates that this stub is collocated (and that it - /// belongs to an ORB for which collocation optimisation is active). - CORBA::Boolean is_collocated_; - /** * If this stub refers to a collocated object then we need to hold on to * the servant's ORB (which may be different from the client ORB) so that, @@ -351,18 +309,6 @@ protected: */ CORBA::ORB_var servant_orb_; - /// Servant pointer. It is 0 except for collocated objects. - TAO_Abstract_ServantBase *collocated_servant_; - - /// Pointer to the Proxy Broker - /** - * This cached pointer instance takes care of routing the call for - * standard calls in CORBA::Object like _is_a (), _get_component - * () etc. - */ - TAO::Object_Proxy_Broker *object_proxy_broker_; - - /// Ordered list of profiles for this object. TAO_MProfile base_profiles_; @@ -370,10 +316,6 @@ protected: /// linked list of TAO_MProfile objects. TAO_MProfile *forward_profiles_; - // The bookmark indicating permanent forward occured, - // the pointer is used to indentify bottom of stack forward_profiles_ - TAO_MProfile *forward_profiles_perm_; - /// This is the profile that we are currently sending/receiving with. TAO_Profile *profile_in_use_; @@ -441,8 +383,6 @@ protected: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Stub.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i index 51bc7a28e27..4f11130af6b 100644 --- a/TAO/tao/Stub.i +++ b/TAO/tao/Stub.i @@ -2,10 +2,6 @@ // // $Id$ -#include "tao/ORB_Core.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE void TAO_Stub::reset_base (void) { @@ -69,8 +65,7 @@ TAO_Stub::next_forward_profile (void) TAO_Profile *pfile_next = 0; while (this->forward_profiles_ - && (pfile_next = this->forward_profiles_->get_next ()) == 0 - && this->forward_profiles_ != this->forward_profiles_perm_) // do not remove permanent forward from bottom of stack + && (pfile_next = this->forward_profiles_->get_next ()) == 0) // that was the last profile. Now we clean up our forward profiles. // since we own the forward MProfiles, we must delete them when done. this->forward_back_one (); @@ -81,62 +76,23 @@ TAO_Stub::next_forward_profile (void) ACE_INLINE TAO_Profile * TAO_Stub::next_profile_i (void) { - TAO_Profile *pfile_next = 0; - - // First handle the case that a permanent forward occured - if (this->forward_profiles_perm_) // the permanent forward defined - // at bottom of stack - // forward_profiles_ - { - // In case of permanent forward the base_profiles are ingored. - - pfile_next = this->next_forward_profile (); - if (pfile_next == 0) - { - // COND: this->forward_profiles_ == this->forward_profiles_perm_ - - // reached end of list of permanent forward profiles - // now, reset forward_profiles_perm_ - - this->forward_profiles_->rewind (); - this->profile_success_ = false; - this->set_profile_in_use_i (this->forward_profiles_->get_next()); - } - else - this->set_profile_in_use_i (pfile_next); - - // We may have been forwarded to / from a collocated situation - // Check for this and apply / remove optimisation if required. - this->orb_core_->reinitialize_object (this); - - return pfile_next; - } - else + TAO_Profile *pfile_next = 0; + if (this->forward_profiles_) { - if (this->forward_profiles_) // Now do the common operation - { - pfile_next = this->next_forward_profile (); - if (pfile_next == 0) - { - // Fall back to base profiles - pfile_next = this->base_profiles_.get_next (); - } - - // We may have been forwarded to / from a collocated situation - // Check for this and apply / remove optimisation if required. - this->orb_core_->reinitialize_object (this); - } - else + pfile_next = this->next_forward_profile (); + if (pfile_next == 0) pfile_next = this->base_profiles_.get_next (); + } + else + pfile_next = this->base_profiles_.get_next (); - if (pfile_next == 0) - this->reset_base (); - else - this->set_profile_in_use_i (pfile_next); + if (pfile_next == 0) + this->reset_base (); + else + this->set_profile_in_use_i (pfile_next); - return pfile_next; - } + return pfile_next; } ACE_INLINE TAO_Profile * @@ -177,10 +133,6 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles) 0)); // first reset things so we start from scratch! - - // @note This reset forward could effect the collocation status - // but as this method is only used from the Stub ctr, when the status - // is already correctly set, we don't reinitialise here. sm. this->reset_forward (); this->base_profiles_.set (mprofiles); this->reset_base (); @@ -198,20 +150,15 @@ TAO_Stub::next_profile_retry (void) if (this->profile_success_ && this->forward_profiles_) { - // We have a forwarded reference that we have managed to *send* a message to - // previously in the remote path only (but not counting object proxy broker ops). - // @todo I can see little sense to this. It is at best highly inconsistent. sm. - - // In this case we are falling back from the forwarded IOR stright to the base IOR this->reset_profiles_i (); - return true; + return 1; } else if (this->next_profile_i ()) { - return true; + return 1; } - return false; + return 0; #if 0 else { @@ -224,10 +171,10 @@ TAO_Stub::next_profile_retry (void) // If the service is loaded and has a profile then try it. if (prof) { - return true; + return 1; } this->reset_profiles_i (); - return false; + return 0; } #endif /*If 0 */ } @@ -250,12 +197,6 @@ TAO_Stub::forward_profiles (void) const return this->forward_profiles_; } -ACE_INLINE CORBA::Boolean -TAO_Stub::is_collocated (void) const -{ - return this->is_collocated_; -} - ACE_INLINE TAO_ORB_Core* TAO_Stub::orb_core (void) const { @@ -282,30 +223,6 @@ TAO_Stub::servant_orb (CORBA::ORB_ptr orb) this->servant_orb_ = CORBA::ORB::_duplicate (orb); } -ACE_INLINE TAO_Abstract_ServantBase * -TAO_Stub::collocated_servant (void) const -{ - return collocated_servant_; -} - -ACE_INLINE void -TAO_Stub::collocated_servant (TAO_Abstract_ServantBase * servant) -{ - this->collocated_servant_ = servant; -} - -ACE_INLINE TAO::Object_Proxy_Broker * -TAO_Stub::object_proxy_broker (void) const -{ - return this->object_proxy_broker_; -} - -ACE_INLINE void -TAO_Stub::object_proxy_broker (TAO::Object_Proxy_Broker * object_proxy_broker) -{ - this->object_proxy_broker_ = object_proxy_broker; -} - ACE_INLINE void TAO_Stub::destroy (void) { @@ -396,5 +313,3 @@ TAO_Stub_Auto_Ptr::operator *() const // @@ Potential problem if this->p_ is zero! return *this->get (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp index 4c76edc15c9..8540e33e402 100644 --- a/TAO/tao/Stub_Factory.cpp +++ b/TAO/tao/Stub_Factory.cpp @@ -1,15 +1,13 @@ // $Id$ - -#include "tao/Stub_Factory.h" +#include "Stub_Factory.h" +#include "ace/Dynamic_Service.h" ACE_RCSID (tao, TAO_Stub_Factory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Stub_Factory::~TAO_Stub_Factory (void) { + // No-Op. } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h index ef42462eac1..4effc5450ac 100644 --- a/TAO/tao/Stub_Factory.h +++ b/TAO/tao/Stub_Factory.h @@ -19,19 +19,15 @@ #define TAO_STUB_FACTORY_H_ #include /**/ "ace/pre.h" - -#include "tao/TAO_Export.h" +#include "ace/CORBA_macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Service_Object.h" -#include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/TAO_Export.h" // Forward references class TAO_MProfile; @@ -56,7 +52,7 @@ namespace CORBA class TAO_Export TAO_Stub_Factory : public ACE_Service_Object { public: - /// Destructor. + // -- Ctor/Dtor -- virtual ~TAO_Stub_Factory (void); /// Creates a Stub Object. @@ -66,7 +62,5 @@ public: ACE_ENV_ARG_DECL) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_STUB_FACTORY_H_ */ diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index a3f4e5d61b2..f3fe9829901 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -1,22 +1,22 @@ // $Id$ -#include "tao/Synch_Invocation.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/Profile.h" -#include "tao/Synch_Reply_Dispatcher.h" -#include "tao/Transport.h" -#include "tao/Stub.h" -#include "tao/Bind_Dispatcher_Guard.h" -#include "tao/operation_details.h" -#include "tao/Wait_Strategy.h" -#include "tao/debug.h" -#include "tao/ORB_Constants.h" -#include "tao/Messaging_SyncScopeC.h" -#include "tao/ORB_Core.h" -#include "tao/Service_Context.h" +#include "Synch_Invocation.h" +#include "Profile_Transport_Resolver.h" +#include "Profile.h" +#include "Synch_Reply_Dispatcher.h" +#include "Transport.h" +#include "Stub.h" +#include "Bind_Dispatcher_Guard.h" +#include "operation_details.h" +#include "Wait_Strategy.h" +#include "debug.h" +#include "ORB_Constants.h" +#include "Messaging_SyncScopeC.h" +#include "ORB_Core.h" +#include "Service_Context.h" #if TAO_HAS_INTERCEPTORS == 1 -# include "tao/PortableInterceptorC.h" +# include "PortableInterceptorC.h" #endif /*TAO_HAS_INTERCEPTORS */ #include "ace/Auto_Ptr.h" @@ -24,7 +24,7 @@ #include "ace/Countdown_Time.h" #if !defined (__ACE_INLINE__) -# include "tao/Synch_Invocation.inl" +# include "Synch_Invocation.inl" #endif /* __ACE_INLINE__ */ @@ -33,8 +33,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Synch_Twoway_Invocation::Synch_Twoway_Invocation ( @@ -81,6 +79,9 @@ namespace TAO ACE_TRY { TAO_OutputCDR &cdr = this->resolver_.transport ()->out_stream (); +#if TAO_RESET_OUTPUT_CDR_AFTER_SEND == 1 + OutputCDR_Auto_Reset cdr_reset(cdr); +#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */ this->write_header (tspec, cdr @@ -337,7 +338,7 @@ namespace TAO { (void) bd.unbind_dispatcher (); this->resolver_.transport ()->close_connection (); - + ACE_TRY { return @@ -402,36 +403,6 @@ namespace TAO case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD: return this->location_forward (cdr ACE_ENV_ARG_PARAMETER); - case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM: - { - // Unmarshal the location forward object and set the - // variable this->forward_to_. - const Invocation_Status s - = this->location_forward (cdr - ACE_ENV_ARG_PARAMETER); - if (s != TAO_INVOKE_FAILURE) - { - // de-marshalling of permanent object reference was successfull - const CORBA::Boolean permanent_forward_condition = - this->orb_core ()->is_permanent_forward_condition - (this->forwarded_to_.in (), - this->request_service_context ()); - - if (!permanent_forward_condition) - { - // permanent condition not given - if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Synch_Twoway_Invocation::" - "check_reply_status: unexpected LOCATION_FORWARD_PERM reply\n")); - - ACE_THROW_RETURN (CORBA::INTERNAL (0, CORBA::COMPLETED_NO), - TAO_INVOKE_FAILURE); - } - } - - return s; - } case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION: return this->handle_user_exception (cdr ACE_ENV_ARG_PARAMETER); @@ -546,7 +517,7 @@ namespace TAO ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") ACE_TEXT ("handle_user_exception - ") ACE_TEXT ("raising exception %s\n"), - ACE_TEXT_CHAR_TO_TCHAR (buf.in ()))); + ACE_TEXT_TO_TCHAR_IN (buf.in ()))); } mon.set_status (TAO_INVOKE_USER_EXCEPTION); @@ -733,6 +704,9 @@ namespace TAO this->resolver_.transport (); TAO_OutputCDR &cdr = transport->out_stream (); +#if TAO_RESET_OUTPUT_CDR_AFTER_SEND == 1 + OutputCDR_Auto_Reset cdr_reset(cdr); +#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */ ACE_TRY { @@ -813,5 +787,3 @@ namespace TAO return s; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index e3441f6b7be..b4ff18b1a1a 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -22,15 +22,10 @@ #include "tao/SystemException.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Operation_Details; class TAO_Synch_Reply_Dispatcher; class TAO_InputCDR; +class ACE_Time_Value; class TAO_Bind_Dispatcher_Guard; namespace TAO @@ -205,7 +200,6 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/Synch_Invocation.inl" diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl index 649d3245412..ccf61f981f2 100644 --- a/TAO/tao/Synch_Invocation.inl +++ b/TAO/tao/Synch_Invocation.inl @@ -1,9 +1,5 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE @@ -26,5 +22,3 @@ namespace TAO this->status_ = s; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index bcafd9afefc..58cbf2afb3e 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -1,8 +1,8 @@ // "$Id$" -#include "tao/Synch_Queued_Message.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" +#include "Synch_Queued_Message.h" +#include "debug.h" +#include "ORB_Core.h" #include "ace/Malloc_T.h" #include "ace/Message_Block.h" @@ -11,13 +11,11 @@ ACE_RCSID (tao, Synch_Queued_Message, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Synch_Queued_Message::TAO_Synch_Queued_Message ( - const ACE_Message_Block *contents, - TAO_ORB_Core *oc, - ACE_Allocator *alloc, - int is_heap_allocated) +TAO_Synch_Queued_Message:: + TAO_Synch_Queued_Message (const ACE_Message_Block *contents, + TAO_ORB_Core *oc, + ACE_Allocator *alloc, + int is_heap_allocated) : TAO_Queued_Message (oc, alloc, is_heap_allocated) , contents_ (const_cast<ACE_Message_Block*> (contents)) , current_block_ (contents_) @@ -180,5 +178,3 @@ TAO_Synch_Queued_Message::destroy (void) } } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h index 09b96f3b6ba..f587c87e816 100644 --- a/TAO/tao/Synch_Queued_Message.h +++ b/TAO/tao/Synch_Queued_Message.h @@ -15,14 +15,12 @@ #include /**/ "ace/pre.h" -#include "tao/Queued_Message.h" +#include "Queued_Message.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Synch_Queued_Message * @@ -92,8 +90,6 @@ private: ACE_Message_Block *current_block_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_QUEUED_MESSAGE_H */ diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp index d8f7fd8df1e..d901b7b93e3 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.cpp +++ b/TAO/tao/Synch_Reply_Dispatcher.cpp @@ -1,17 +1,15 @@ // $Id$ -#include "tao/Synch_Reply_Dispatcher.h" -#include "tao/ORB_Core.h" -#include "tao/Pluggable_Messaging_Utils.h" -#include "tao/debug.h" +#include "Synch_Reply_Dispatcher.h" +#include "ORB_Core.h" +#include "Pluggable_Messaging_Utils.h" +#include "debug.h" ACE_RCSID (tao, Synch_Reply_Dispatcher, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Synch_Reply_Dispatcher::TAO_Synch_Reply_Dispatcher ( TAO_ORB_Core *orb_core, @@ -69,40 +67,30 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply ( //this->message_state_.reset (0); // Transfer the <params.input_cdr_>'s content to this->reply_cdr_ - if (ACE_BIT_DISABLED ((*params.input_cdr_).start()->data_block()->flags(), + ACE_Data_Block *db = + this->reply_cdr_.clone_from (*params.input_cdr_); + + if (db == 0) + { + if (TAO_debug_level > 2) + { + ACE_ERROR ((LM_ERROR, + "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply " + "clone_from failed \n")); + } + return -1; + } + + // See whether we need to delete the data block by checking the + // flags. We cannot be happy that we initally allocated the + // datablocks of the stack. If this method is called twice, as is in + // some cases where the same invocation object is used to make two + // invocations like forwarding, the release becomes essential. + if (ACE_BIT_DISABLED (db->flags (), ACE_Message_Block::DONT_DELETE)) - { - // Data block is on the heap, so just duplicate it. - this->reply_cdr_ = *params.input_cdr_; - this->reply_cdr_.clr_mb_flags( ACE_Message_Block::DONT_DELETE ); - } - else - { - ACE_Data_Block *db = - this->reply_cdr_.clone_from (*params.input_cdr_); - - if (db == 0) - { - if (TAO_debug_level > 2) - { - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply " - "clone_from failed \n")); - } - return -1; - } - - // See whether we need to delete the data block by checking the - // flags. We cannot be happy that we initally allocated the - // datablocks of the stack. If this method is called twice, as is in - // some cases where the same invocation object is used to make two - // invocations like forwarding, the release becomes essential. - if (ACE_BIT_DISABLED (db->flags (), - ACE_Message_Block::DONT_DELETE)) - { - db->release (); - } - } + { + db->release (); + } this->state_changed (TAO_LF_Event::LFS_SUCCESS, this->orb_core_->leader_follower ()); @@ -116,5 +104,3 @@ TAO_Synch_Reply_Dispatcher::connection_closed (void) this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED, this->orb_core_->leader_follower ()); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h index c22e515cd47..6774d5c2d87 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.h +++ b/TAO/tao/Synch_Reply_Dispatcher.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -6,7 +6,8 @@ * * $Id$ * - * Dispatch the reply appropriately. + * Dispatch the reply appropriately. + * * * @author Alexander Babu Arulanthu <alex@cs.wustl.edu> */ @@ -26,8 +27,6 @@ #include "tao/LF_Invocation_Event.h" #include "tao/CDR.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Pluggable_Reply_Params; namespace IOP @@ -88,8 +87,6 @@ private: TAO_InputCDR reply_cdr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_REPLY_DISPATCHER_H */ diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 35a47758128..02f3925f834 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/ORB_Constants.h" -#include "tao/CORBA_String.h" -#include "tao/CDR.h" -#include "tao/debug.h" -#include "tao/AnyTypeCode_Adapter.h" +#include "SystemException.h" +#include "Environment.h" +#include "ORB_Constants.h" +#include "CORBA_String.h" +#include "CDR.h" +#include "debug.h" +#include "AnyTypeCode_Adapter.h" #include "ace/Malloc.h" #include "ace/SString.h" @@ -30,8 +30,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @name @c errno Encoding * @@ -225,7 +223,7 @@ CORBA::SystemException::_tao_print_system_exception (FILE *) const { ACE_DEBUG ((LM_ERROR, ACE_TEXT("(%P|%t) system exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ()))); } ACE_CString @@ -816,11 +814,9 @@ CORBA::SystemException::_tao_get_omg_exception_description ( return "*unknown description*"; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ // List of standard/system exceptions ... used to create static // storage for their typecodes, then later to initialize that storage @@ -881,7 +877,6 @@ static const char *repo_id_array[] = { static const CORBA::ULong array_sz = (sizeof (repo_id_array) / sizeof (char const *)) - 1; -TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::excp_factory excp_array [] = { #define TAO_SYSTEM_EXCEPTION(name) \ @@ -980,5 +975,3 @@ CORBA::name ::_tao_create (void) \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 2a343346d3a..54a7b4dcf49 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -29,14 +29,12 @@ #include "tao/Exception.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_OutputCDR; class TAO_InputCDR; -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ // This is already done in orbconf.h. But this file is totally // decoupled from its contents that we have to do this here. Including @@ -238,7 +236,6 @@ namespace CORBA } // End CORBA namespace -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) # include "tao/SystemException.inl" diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl index 25409d98218..9366410df75 100644 --- a/TAO/tao/SystemException.inl +++ b/TAO/tao/SystemException.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong CORBA::SystemException::minor (void) const { @@ -112,5 +110,3 @@ CORBA::name ::_tao_any_destructor (void * x) \ TAO_STANDARD_SYSTEM_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl index db7dd9b348a..74fd3f7979c 100644 --- a/TAO/tao/TAO.pidl +++ b/TAO/tao/TAO.pidl @@ -28,9 +28,9 @@ #ifndef TAO_TAO_IDL #define TAO_TAO_IDL -#include "tao/Policy.pidl" -#include "tao/TimeBase.pidl" -#include "tao/Messaging_SyncScope.pidl" +#include "Policy.pidl" +#include "TimeBase.pidl" +#include "Messaging_SyncScope.pidl" #pragma prefix "tao" diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 11c30f3c6be..9ec2b85fff5 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -29,15 +29,13 @@ // be\be_codegen.cpp:277 -#include "tao/TAOC.h" +#include "TAOC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -208,5 +206,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.message_count) && (strm >> _tao_aggregate.message_bytes); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index b417694122b..72e9467c9ef 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -292,8 +290,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & // TAO_IDL - Generated from // be\be_codegen.cpp:1028 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 8cb753d3ea4..0a463afe0e3 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -1,24 +1,24 @@ // $Id$ -#include "tao/TAO_Internal.h" -#include "tao/default_server.h" -#include "tao/default_client.h" -#include "tao/default_resource.h" -#include "tao/IIOP_Factory.h" -#include "tao/MCAST_Parser.h" -#include "tao/CORBANAME_Parser.h" -#include "tao/CORBALOC_Parser.h" -#include "tao/FILE_Parser.h" -#include "tao/DLL_Parser.h" -#include "tao/ORB_Core.h" -#include "tao/Adapter_Factory.h" -#include "tao/Default_Stub_Factory.h" -#include "tao/Default_Endpoint_Selector_Factory.h" -#include "tao/Default_Protocols_Hooks.h" -#include "tao/Default_Thread_Lane_Resources_Manager.h" -#include "tao/Default_Collocation_Resolver.h" -#include "tao/debug.h" -#include "tao/StringSeqC.h" +#include "TAO_Internal.h" +#include "default_server.h" +#include "default_client.h" +#include "default_resource.h" +#include "IIOP_Factory.h" +#include "MCAST_Parser.h" +#include "CORBANAME_Parser.h" +#include "CORBALOC_Parser.h" +#include "FILE_Parser.h" +#include "DLL_Parser.h" +#include "ORB_Core.h" +#include "Adapter_Factory.h" +#include "Default_Stub_Factory.h" +#include "Default_Endpoint_Selector_Factory.h" +#include "Default_Protocols_Hooks.h" +#include "Default_Thread_Lane_Resources_Manager.h" +#include "Default_Collocation_Resolver.h" +#include "debug.h" +#include "StringSeqC.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" @@ -87,8 +87,6 @@ namespace TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS; } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - int TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) { @@ -102,7 +100,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) if (argc > 0 && argv != 0) { - argv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]); + argv0 = ACE_TEXT_TO_CHAR_OUT (argv[0]); } CORBA::ULong len = 0; @@ -163,7 +161,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) ACE::debug (1); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBDebugLevel")))) { TAO_debug_level = @@ -183,7 +181,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) arg_shifter.consume_arg (); } // Continue with flags that accept parameters. - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective")))) { len = svc_config_argv.length (); svc_config_argv.length (len + 2); // 2 arguments to add @@ -193,11 +191,11 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) // configuration information rather than using a svc.conf // file. Pass the "-S" to the service configurator. svc_config_argv[len] = CORBA::string_dup ("-S"); - svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg)); + svc_config_argv[len + 1] = CORBA::string_dup (current_arg); arg_shifter.consume_arg (); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf")))) { // Specify the name of the svc.conf file to be used. @@ -227,17 +225,17 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) svc_config_argv.length (len + 2); // 2 arguments to add svc_config_argv[len] = CORBA::string_dup ("-f"); - svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg)); + svc_config_argv[len + 1] = CORBA::string_dup (current_arg); arg_shifter.consume_arg(); } - else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey")))) + else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey")))) { len = svc_config_argv.length (); svc_config_argv.length (len + 2); // 2 arguments to add svc_config_argv[len] = CORBA::string_dup ("-k"); - svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg)); + svc_config_argv[len + 1] = CORBA::string_dup (current_arg); arg_shifter.consume_arg (); } @@ -280,8 +278,6 @@ TAO::ORB::default_svc_conf_entries (char const * rf_args, client_strategy_factory_args = csf_args; } -TAO_END_VERSIONED_NAMESPACE_DECL - // ----------------------------------------------------- namespace { @@ -421,23 +417,22 @@ namespace if (resource_factory_args != 0) { ACE_Service_Config::process_directive ( - ACE_TEXT_CHAR_TO_TCHAR (resource_factory_args)); + ACE_TEXT_TO_TCHAR_IN (resource_factory_args)); } if (client_strategy_factory_args != 0) { ACE_Service_Config::process_directive ( - ACE_TEXT_CHAR_TO_TCHAR (client_strategy_factory_args)); + ACE_TEXT_TO_TCHAR_IN (client_strategy_factory_args)); } if (server_strategy_factory_args != 0) { ACE_Service_Config::process_directive ( - ACE_TEXT_CHAR_TO_TCHAR (server_strategy_factory_args)); + ACE_TEXT_TO_TCHAR_IN (server_strategy_factory_args)); } return result; } } -// TAO_BEGIN_VERSIONED_NAMESPACE_DECL -- ended prior to anonymous namespace. diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h index e528980821c..f814c3a8c2d 100644 --- a/TAO/tao/TAO_Internal.h +++ b/TAO/tao/TAO_Internal.h @@ -17,14 +17,12 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" -#include "tao/Versioned_Namespace.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -65,7 +63,6 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index d49d18f228b..c7075d34bf7 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -1,24 +1,24 @@ // $Id$ -#include "tao/TAO_Server_Request.h" -#include "tao/ORB_Core.h" -#include "tao/Timeprobe.h" -#include "tao/debug.h" -#include "tao/Pluggable_Messaging.h" -#include "tao/GIOP_Utils.h" -#include "tao/Stub.h" -#include "tao/operation_details.h" -#include "tao/Transport.h" -#include "tao/CDR.h" -#include "tao/SystemException.h" +#include "TAO_Server_Request.h" +#include "ORB_Core.h" +#include "Timeprobe.h" +#include "debug.h" +#include "Pluggable_Messaging.h" +#include "GIOP_Utils.h" +#include "Stub.h" +#include "operation_details.h" +#include "Transport.h" +#include "CDR.h" +#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PortableInterceptorC.h" -#include "tao/ServerRequestInterceptor_Adapter.h" +#include "PortableInterceptorC.h" +#include "ServerRequestInterceptor_Adapter.h" #endif #if !defined (__ACE_INLINE__) -# include "tao/TAO_Server_Request.i" +# include "TAO_Server_Request.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, @@ -46,8 +46,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base, TAO_InputCDR &input, TAO_OutputCDR &output, @@ -261,14 +259,7 @@ TAO_ServerRequest::init_reply (void) // Forward exception only. if (!CORBA::is_nil (this->forward_location_.in ())) { - const CORBA::Boolean permanent_forward_condition = - this->orb_core_->is_permanent_forward_condition (this->forward_location_.in (), - this->request_service_context ()); - - reply_params.reply_status_ - = permanent_forward_condition - ? TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM - : TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD; + reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD; } // Any exception at all. else if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION) @@ -285,8 +276,7 @@ TAO_ServerRequest::init_reply (void) reply_params); // Finish the GIOP Reply header, then marshal the exception. - if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD || - reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM) + if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD) { // Marshal the forward location pointer. CORBA::Object_ptr object_ptr = this->forward_location_.in (); @@ -572,6 +562,4 @@ TAO_ServerRequest::pi_current_copy_callback (void) return this->pi_current_copy_callback_; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_INTERCEPTORS */ +#endif /*TAO_HAS_INTERCEPTORS*/ diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index c6724852e1b..288fd4a2723 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -26,28 +26,20 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Tagged_Profile.h" -#include "tao/Service_Context.h" -#include "tao/Object.h" +#include "Tagged_Profile.h" +#include "Service_Context.h" +#include "Object.h" #if TAO_HAS_INTERCEPTORS == 1 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { class PICurrent; class PICurrent_Impl; class PICurrent_Copy_Callback; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "tao/PortableInterceptorC.h" - +#include "PortableInterceptorC.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Pluggable_Messaging; class TAO_Transport; class TAO_AMH_Response_Handler; @@ -60,14 +52,6 @@ namespace CORBA class Exception; } -namespace TAO -{ - namespace CSD - { - class FW_Server_Request_Wrapper; - } -} - class TAO_Operation_Details; /** @@ -81,12 +65,6 @@ class TAO_Operation_Details; class TAO_Export TAO_ServerRequest { public: - - /// Declare FW_Server_Request_Wrapper a friend - /// This friendship makes the FW_Server_Request_Wrapper be able to - /// clone the TAO_ServerRequest. - friend class TAO::CSD::FW_Server_Request_Wrapper; - /// Declare TAO_AMH_Response_Handler a friend /** * The TAO_AMH_Response_Handler class needs to copy part of the @@ -341,7 +319,7 @@ private: /// Used to pad CDR stream if we have used DSI. ptrdiff_t dsi_nvlist_align_; - TAO_Operation_Details const * operation_details_; + TAO_Operation_Details const * const operation_details_; /** * An argument flag to indicate whether there is any data that is @@ -375,10 +353,8 @@ private: #endif /* TAO_HAS_INTERCEPTORS == 1 */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/TAO_Server_Request.i" +# include "TAO_Server_Request.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i index 5fc7f50ab9b..a75efcab263 100644 --- a/TAO/tao/TAO_Server_Request.i +++ b/TAO/tao/TAO_Server_Request.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ORB_Core * TAO_ServerRequest::orb_core (void) const { @@ -236,5 +234,3 @@ TAO_ServerRequest::reply_status (void) } #endif /* TAO_HAS_INTERCEPTORS == 1 */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp index dc8493856a9..13ea18bf273 100644 --- a/TAO/tao/TAO_Singleton.cpp +++ b/TAO/tao/TAO_Singleton.cpp @@ -21,7 +21,9 @@ #include "tao/TAO_Singleton.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + TAO_Singleton, + "$Id$") template <class TYPE, class ACE_LOCK> void TAO_Singleton<TYPE, ACE_LOCK>::dump (void) @@ -204,6 +206,4 @@ TAO_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *) TAO_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () = 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_SINGLETON_CPP */ diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h index 41d27015cb8..b4c2194f86c 100644 --- a/TAO/tao/TAO_Singleton.h +++ b/TAO/tao/TAO_Singleton.h @@ -25,13 +25,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - #include "ace/Cleanup.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Singleton * @@ -122,8 +118,6 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/TAO_Singleton.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl index bacacea205e..d1d32b6998c 100644 --- a/TAO/tao/TAO_Singleton.inl +++ b/TAO/tao/TAO_Singleton.inl @@ -1,10 +1,6 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Default constructors. // // Note: don't explicitly initialize "instance_", because TYPE may not @@ -19,5 +15,3 @@ template <class TYPE, class ACE_LOCK> ACE_INLINE TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index 829f808c51f..fcacaa78283 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -28,44 +28,19 @@ ACE_RCSID (tao, TAO_Singleton_Manager, "$Id$") - -namespace -{ - // Singleton instance pointer. - TAO_Singleton_Manager * the_instance = 0; -} - -#if (defined (ACE_HAS_VERSIONED_NAMESPACE) \ - && ACE_HAS_VERSIONED_NAMESPACE == 1) \ - && !(defined (_MSC_VER) && _MSC_VER <= 1200) -// MSVC++ 6's preprocessor can't handle macro expansions required by -// the versioned namespace support. *sigh* - -# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_Singleton_Manager_cleanup_destroyer) - -#else - -# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME TAO_Singleton_Manager_cleanup_destroyer - -#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - -// Adapter for cleanup, used to register cleanup function with the -// ACE_Object_Manager. extern "C" void -TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME (void *, void *) +TAO_Singleton_Manager_cleanup_destroyer (void *, void *) { -#if defined (TAO_HAS_VERSIONED_NAMESPACE) \ - && TAO_HAS_VERSIONED_NAMESPACE == 1 - using namespace TAO_VERSIONED_NAMESPACE_NAME; -#endif /* TAO_HAS_VERSIONED_NAMESPACE */ - - if (the_instance) + if (TAO_Singleton_Manager::instance_) { (void) TAO_Singleton_Manager::instance ()->fini (); } } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +TAO_Singleton_Manager *TAO_Singleton_Manager::instance_ = 0; + +void *TAO_Singleton_Manager::preallocated_object[ + TAO_Singleton_Manager::TAO_PREALLOCATED_OBJECTS] = { 0 }; TAO_Singleton_Manager::TAO_Singleton_Manager (void) // default_mask_ isn't initialized, because it's defined by <init>. @@ -80,9 +55,9 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void) #endif /* ACE_HAS_EXCEPTIONS */ { // Be sure that no further instances are created via instance (). - if (the_instance == 0) + if (instance_ == 0) { - the_instance = this; + instance_ = this; } // @@ This is a hack. Allow the TAO_Singleton_Manager to be registered @@ -127,14 +102,14 @@ TAO_Singleton_Manager::instance (void) // instances, or before any other threads have been created in the // process. So, it's not thread safe. - if (the_instance == 0) + if (instance_ == 0) { TAO_Singleton_Manager *instance_pointer; ACE_NEW_RETURN (instance_pointer, TAO_Singleton_Manager, 0); - ACE_ASSERT (instance_pointer == the_instance); + ACE_ASSERT (instance_pointer == instance_); instance_pointer->dynamically_allocated_ = 1; @@ -142,7 +117,7 @@ TAO_Singleton_Manager::instance (void) } else { - return the_instance; + return instance_; } } @@ -170,7 +145,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager) // initialized. this->object_manager_state_ = OBJ_MAN_INITIALIZING; - if (this == the_instance) + if (this == instance_) { # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // @@ No MT-specific pre-allocated objects. @@ -210,7 +185,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager) if (register_with_object_manager == 1 && ACE_Object_Manager::at_exit ( this, - (ACE_CLEANUP_FUNC) TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME, + (ACE_CLEANUP_FUNC) TAO_Singleton_Manager_cleanup_destroyer, 0) != 0) return -1; @@ -230,7 +205,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager) int TAO_Singleton_Manager::fini (void) { - if (the_instance == 0 || this->shutting_down_i ()) + if (instance_ == 0 || this->shutting_down_i ()) // Too late. Or, maybe too early. Either fini () has already // been called, or init () was never called. return this->object_manager_state_ == OBJ_MAN_SHUT_DOWN ? 1 : -1; @@ -254,18 +229,18 @@ TAO_Singleton_Manager::fini (void) // registration. this->exit_info_.call_hooks (); -// // Only clean up preallocated objects when the singleton Instance is being -// // destroyed. -// if (this == the_instance) -// { -// #if ! defined (ACE_HAS_STATIC_PREALLOCATION) -// // Cleanup the dynamically preallocated objects. -// # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -// // @@ No MT-specific preallocated objects yet. -// # endif /* ACE_MT_SAFE */ -// // @@ No preallocated objects yet. -// #endif /* ! ACE_HAS_STATIC_PREALLOCATION */ -// } + // Only clean up preallocated objects when the singleton Instance is being + // destroyed. + if (this == instance_) + { +#if ! defined (ACE_HAS_STATIC_PREALLOCATION) + // Cleanup the dynamically preallocated objects. +# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + // @@ No MT-specific preallocated objects yet. +# endif /* ACE_MT_SAFE */ + // @@ No preallocated objects yet. +#endif /* ! ACE_HAS_STATIC_PREALLOCATION */ + } delete this-> default_mask_; this->default_mask_ = 0; @@ -291,8 +266,8 @@ TAO_Singleton_Manager::fini (void) // Indicate that this TAO_Singleton_Manager instance has been shut down. this->object_manager_state_ = OBJ_MAN_SHUT_DOWN; - if (this == the_instance) - the_instance = 0; + if (this == instance_) + instance_ = 0; if (this->dynamically_allocated_) { @@ -305,18 +280,16 @@ TAO_Singleton_Manager::fini (void) int TAO_Singleton_Manager::starting_up (void) { - return - the_instance - ? the_instance->starting_up_i () + return TAO_Singleton_Manager::instance_ + ? instance_->starting_up_i () : 1; } int TAO_Singleton_Manager::shutting_down (void) { - return - the_instance - ? the_instance->shutting_down_i () + return TAO_Singleton_Manager::instance_ + ? instance_->shutting_down_i () : 1; } @@ -347,7 +320,7 @@ TAO_Singleton_Manager::at_exit_i (void *object, { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, - *the_instance->internal_lock_, + *instance_->internal_lock_, -1)); if (this->shutting_down_i ()) @@ -365,5 +338,3 @@ TAO_Singleton_Manager::at_exit_i (void *object, return this->exit_info_.at_exit_i (object, cleanup_hook, param); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 8d0313f6cb6..891a31ebf0e 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -28,12 +28,18 @@ #include "tao/orbconf.h" #include "ace/Object_Manager_Base.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined (ACE_HAS_EXCEPTIONS) typedef void (*TAO_unexpected_handler)(void); #endif /* ACE_HAS_EXCEPTIONS */ + +/// Adapter for cleanup, used to register cleanup function with the +/// ACE_Object_Manager. +extern "C" +void +TAO_Singleton_Manager_cleanup_destroyer (void *, void *); + + /** * @class TAO_Singleton_Manager * @@ -53,6 +59,9 @@ typedef void (*TAO_unexpected_handler)(void); */ class TAO_Export TAO_Singleton_Manager : public ACE_Object_Manager_Base { + + friend void TAO_Singleton_Manager_cleanup_destroyer (void *, void *); + public: /// Explicitly initialize. virtual int init (void); @@ -77,6 +86,24 @@ public: /// See ACE_Object_Manager::shutting_down for more information. static int shutting_down (void); + /// Unique identifiers for preallocated Objects. + enum Preallocated_Object + { +# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + /// @@ No MT-specific preallocated objects (yet). Remove the + /// below dummy enum once a preallocated object is added. + TAO_EMPTY_PREALLOCATED_OBJECT, +# else + /// Without ACE_MT_SAFE, There are no preallocated objects. + /// Make sure that the preallocated_array size is at least one + /// by declaring this dummy ... + TAO_EMPTY_PREALLOCATED_OBJECT, +# endif /* ACE_MT_SAFE */ + + /// This enum value must be last! + TAO_PREALLOCATED_OBJECTS + }; + /// Accesses a default signal set used, for example, in /// ACE_Sig_Guard methods. static sigset_t *default_mask (void); @@ -133,16 +160,13 @@ public: void _set_unexpected (TAO_unexpected_handler u); #endif /* ACE_HAS_EXCEPTIONS */ -protected: - +private: /// Force allocation on the heap. //@{ TAO_Singleton_Manager (void); ~TAO_Singleton_Manager (void); //@} -private: - /// Disallow copying by not implementing the following ... //@{ TAO_Singleton_Manager (const TAO_Singleton_Manager &); @@ -154,6 +178,11 @@ private: int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param); private: + /// Singleton instance pointer. + static TAO_Singleton_Manager *instance_; + + /// Table of preallocated objects. + static void *preallocated_object[TAO_PREALLOCATED_OBJECTS]; /// Default signal set used, for example, in ACE_Sig_Guard. sigset_t *default_mask_; @@ -186,8 +215,6 @@ private: #endif /* ACE_HAS_EXCEPTIONS */ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/TAO_Singleton_Manager.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/TAO_Singleton_Manager.inl b/TAO/tao/TAO_Singleton_Manager.inl index a9c35b8fa13..f9f0dd141ce 100644 --- a/TAO/tao/TAO_Singleton_Manager.inl +++ b/TAO/tao/TAO_Singleton_Manager.inl @@ -2,29 +2,25 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int TAO_Singleton_Manager::at_exit (ACE_Cleanup *object, - void *param) + void *param) { return TAO_Singleton_Manager::instance ()->at_exit_i ( object, - (ACE_CLEANUP_FUNC) ACE_CLEANUP_DESTROYER_NAME, + (ACE_CLEANUP_FUNC) ace_cleanup_destroyer, param); } ACE_INLINE int TAO_Singleton_Manager::at_exit (void *object, - ACE_CLEANUP_FUNC cleanup_hook, - void *param) + ACE_CLEANUP_FUNC cleanup_hook, + void *param) { return TAO_Singleton_Manager::instance ()->at_exit_i ( object, cleanup_hook, param); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp index 73ec7175070..e80f9cab0cc 100644 --- a/TAO/tao/TSS_Resources.cpp +++ b/TAO/tao/TSS_Resources.cpp @@ -1,16 +1,14 @@ // $Id$ -#include "tao/TSS_Resources.h" -#include "tao/GUIResource_Factory.h" -#include "tao/TAO_Singleton.h" +#include "TSS_Resources.h" +#include "GUIResource_Factory.h" +#include "TAO_Singleton.h" ACE_RCSID (tao, TSS_Resources, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_TSS_Resources::TAO_TSS_Resources (void) : poa_current_impl_ (0) , rtscheduler_current_impl_ (0) @@ -47,5 +45,3 @@ template TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> * TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index 251c7a26837..a33983a0dc6 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -27,8 +27,6 @@ #include "tao/Policy_Current_Impl.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward declarations namespace TAO { @@ -60,8 +58,8 @@ private: /// Do not copy TSS resources //@{ - TAO_TSS_Resources (const TAO_TSS_Resources&); - void operator= (const TAO_TSS_Resources&); + ACE_UNIMPLEMENTED_FUNC (TAO_TSS_Resources(const TAO_TSS_Resources&)) + ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_TSS_Resources&)) //@} public: @@ -107,8 +105,6 @@ public: TAO::GUIResource_Factory * gui_resource_factory_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TSS_RESOURCES_H */ diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index 172dde55018..8b2c8490649 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -13,9 +13,6 @@ ACE_RCSID (tao, Tagged_Components, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type) { @@ -341,4 +338,3 @@ TAO_Tagged_Components::decode (TAO_InputCDR& cdr) return 1; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h index 93f2a927bf3..75f756a2093 100644 --- a/TAO/tao/Tagged_Components.h +++ b/TAO/tao/Tagged_Components.h @@ -23,9 +23,6 @@ #include "tao/CONV_FRAMEC.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Profile; /// Tag for storing multiple endpoints within a single profile. @@ -34,7 +31,7 @@ class TAO_Profile; * The standard TAG_ALTERNATE_IIOP_ADDRESSES tagged component is the * portable alternative. */ -static const CORBA::ULong TAO_TAG_ENDPOINTS = 0x54414f02U; +const CORBA::ULong TAO_TAG_ENDPOINTS = 0x54414f02U; /** * @class TAO_Tagged_Components @@ -158,8 +155,6 @@ private: CORBA::Octet code_sets_set_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Tagged_Components.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i index cb61b5235b4..62ab4a40f05 100644 --- a/TAO/tao/Tagged_Components.i +++ b/TAO/tao/Tagged_Components.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Tagged_Components::TAO_Tagged_Components (void) : orb_type_ (0), @@ -78,5 +76,3 @@ TAO_Tagged_Components::components (void) { return this->components_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp index e5bed686c15..cfe643f6066 100644 --- a/TAO/tao/Tagged_Profile.cpp +++ b/TAO/tao/Tagged_Profile.cpp @@ -17,8 +17,6 @@ ACE_RCSID (tao, Tagged_Profile, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Boolean TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile) { @@ -194,5 +192,3 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i ( return hdr_status; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h index 58b0ff93167..5e9e10f8348 100644 --- a/TAO/tao/Tagged_Profile.h +++ b/TAO/tao/Tagged_Profile.h @@ -22,19 +22,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Object_KeyC.h" -#include "tao/Versioned_Namespace.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace CSD - { - class FW_Server_Request_Wrapper; - } -} - /** * @class TAO_Tagged_Profile * @@ -45,12 +34,6 @@ namespace TAO class TAO_Export TAO_Tagged_Profile { public: - - /// Declare FW_Server_Request_Wrapper a friend - /// This friendship makes the FW_Server_Request_Wrapper be able to - /// clone the TAO_Tagged_Profile data member in TAO_ServerRequest. - friend class TAO::CSD::FW_Server_Request_Wrapper; - /// Ctor TAO_Tagged_Profile (TAO_ORB_Core *orb_core); @@ -144,8 +127,6 @@ private: ACE_CString type_id_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Tagged_Profile.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i index 60249f0ef37..52e7b34fae1 100644 --- a/TAO/tao/Tagged_Profile.i +++ b/TAO/tao/Tagged_Profile.i @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core) : orb_core_ (orb_core), @@ -16,6 +13,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core) } + ACE_INLINE TAO::ObjectKey & TAO_Tagged_Profile::object_key (void) { @@ -63,5 +61,3 @@ TAO_Tagged_Profile::discriminator (void) const { return this->discriminator_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index 9f639f4b6c4..1168a525d4f 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -17,9 +17,6 @@ ACE_RCSID (tao, #include "ace/Reactor.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Thread_Lane_Resources::TAO_Thread_Lane_Resources ( TAO_ORB_Core &orb_core, TAO_New_Leader_Generator *new_leader_generator @@ -554,5 +551,3 @@ TAO_Thread_Lane_Resources::cleanup_rw_transports (void) (*handler)->transport ()->remove_reference (); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 07ec9a50edc..f0c1a61a07f 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -24,14 +24,9 @@ #include "tao/TAO_Export.h" #include "tao/orbconf.h" -#include "tao/params.h" +#include "params.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Acceptor_Registry; class TAO_Leader_Follower; @@ -212,8 +207,6 @@ private: //@} }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_THREAD_LANE_RESOURCES_H */ diff --git a/TAO/tao/Thread_Lane_Resources_Manager.cpp b/TAO/tao/Thread_Lane_Resources_Manager.cpp index 8a3465d2648..d004966c26b 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp @@ -10,8 +10,6 @@ ACE_RCSID (tao, Thread_Lane_Resources_Manager, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Thread_Lane_Resources_Manager::TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core) : orb_core_ (&orb_core), lf_strategy_ (0) @@ -35,4 +33,3 @@ TAO_Thread_Lane_Resources_Manager_Factory::~TAO_Thread_Lane_Resources_Manager_Fa { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index 47915050b97..cbd6be69009 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -23,9 +23,6 @@ #include "ace/Service_Object.h" #include "tao/TAO_Export.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; class TAO_Thread_Lane_Resources; @@ -107,14 +104,12 @@ public: virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void); /// Factory method. - virtual TAO_Thread_Lane_Resources_Manager * + virtual + TAO_Thread_Lane_Resources_Manager * create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - - #include /**/ "ace/post.h" #endif /* TAO_THREAD_LANE_RESOURCES_MANAGER_H */ diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp index 9cf61f3bfc2..6cd522c8298 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.cpp +++ b/TAO/tao/Thread_Per_Connection_Handler.cpp @@ -1,17 +1,15 @@ //$Id$ -#include "tao/Thread_Per_Connection_Handler.h" -#include "tao/Connection_Handler.h" -#include "tao/debug.h" -#include "tao/Transport.h" -#include "tao/ORB_Core.h" +#include "Thread_Per_Connection_Handler.h" +#include "Connection_Handler.h" +#include "debug.h" +#include "Transport.h" +#include "ORB_Core.h" #include "ace/Flag_Manip.h" ACE_RCSID (tao, Thread_Per_Connection_Handler, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Thread_Per_Connection_Handler::TAO_Thread_Per_Connection_Handler ( TAO_Connection_Handler *ch, TAO_ORB_Core *oc) @@ -83,5 +81,3 @@ TAO_Thread_Per_Connection_Handler::close (u_long) return 0; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h index cf51317e646..08ed211ae58 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.h +++ b/TAO/tao/Thread_Per_Connection_Handler.h @@ -1,4 +1,4 @@ -//x -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,9 +24,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/TAO_Export.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Connection_Handler; class TAO_ORB_Core; @@ -80,8 +77,6 @@ private: TAO_Connection_Handler *ch_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_THREAD_PER_CONNECTION_HANDLER_H*/ diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index 650026e6abb..aa5a1ecaaa7 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/TimeBaseC.h" +#include "TimeBaseC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -122,5 +120,3 @@ CORBA::Boolean operator>> ( (strm >> _tao_aggregate.lower_bound) && (strm >> _tao_aggregate.upper_bound); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index 4ff35b6fd42..a5846a67720 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -62,8 +62,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TimeBase { @@ -169,8 +167,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TkResource_Factory.cpp b/TAO/tao/TkResource_Factory.cpp index d9d6d3dffeb..765e7a40e02 100644 --- a/TAO/tao/TkResource_Factory.cpp +++ b/TAO/tao/TkResource_Factory.cpp @@ -9,13 +9,11 @@ ACE_RCSID( TAO_TkResource, "$Id$"); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { - TkResource_Factory::TkResource_Factory (void) - : reactor_impl_ (0) + TkResource_Factory::TkResource_Factory (): + reactor_impl_( 0 ) { } @@ -37,5 +35,3 @@ namespace TAO return this->reactor_impl_; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TkResource_Factory.h b/TAO/tao/TkResource_Factory.h index 7fe5bb140ac..e08b436d274 100644 --- a/TAO/tao/TkResource_Factory.h +++ b/TAO/tao/TkResource_Factory.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { @@ -57,8 +55,5 @@ namespace TAO TAO_SYNCH_MUTEX lock_; }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TKRESOURCE_FACTORY_H */ diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource_Loader.cpp index e8885850e0d..782fbc92bf0 100644 --- a/TAO/tao/TkResource_Loader.cpp +++ b/TAO/tao/TkResource_Loader.cpp @@ -1,19 +1,16 @@ //$Id$ -#include "tao/TkResource_Loader.h" -#include "tao/ORB_Core.h" -#include "tao/TkResource_Factory.h" +#include "TkResource_Loader.h" +#include "ORB_Core.h" +#include "TkResource_Factory.h" ACE_RCSID( TAO_TkResource, TkResource_Loader, "$Id$"); - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { - TkResource_Loader::TkResource_Loader (void) + TkResource_Loader::TkResource_Loader () { TkResource_Factory *tmp = 0; @@ -23,9 +20,7 @@ namespace TAO TAO_ORB_Core::set_gui_resource_factory( tmp ); } - TkResource_Loader::~TkResource_Loader (void) + TkResource_Loader::~TkResource_Loader () { } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h index 86122b169d1..9b20a5eac02 100644 --- a/TAO/tao/TkResource_Loader.h +++ b/TAO/tao/TkResource_Loader.h @@ -13,19 +13,13 @@ #ifndef TAO_TKRESOURCE_LOADER_H #define TAO_TKRESOURCE_LOADER_H - #include /**/ "ace/pre.h" - #include "tao/TAO_TkResource_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -44,17 +38,12 @@ namespace TAO */ class TAO_TkResource_Export TkResource_Loader { - public: - TkResource_Loader (void); - - virtual ~TkResource_Loader (void); + public: + TkResource_Loader ( ); + virtual ~TkResource_Loader (); }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_TKRESOURCE_LOADER_H */ diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 2a1f66c5a78..989fa5624ab 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -1,26 +1,26 @@ // $Id$ -#include "tao/Transport.h" - -#include "tao/LF_Follower.h" -#include "tao/Leader_Follower.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/Wait_Strategy.h" -#include "tao/Transport_Mux_Strategy.h" -#include "tao/Stub.h" -#include "tao/Transport_Queueing_Strategies.h" -#include "tao/Connection_Handler.h" -#include "tao/Pluggable_Messaging.h" -#include "tao/Synch_Queued_Message.h" -#include "tao/Asynch_Queued_Message.h" -#include "tao/Flushing_Strategy.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/Resume_Handle.h" -#include "tao/Codeset_Manager.h" -#include "tao/Codeset_Translator_Base.h" -#include "tao/debug.h" -#include "tao/CDR.h" -#include "tao/ORB_Core.h" +#include "Transport.h" + +#include "LF_Follower.h" +#include "Leader_Follower.h" +#include "Client_Strategy_Factory.h" +#include "Wait_Strategy.h" +#include "Transport_Mux_Strategy.h" +#include "Stub.h" +#include "Transport_Queueing_Strategies.h" +#include "Connection_Handler.h" +#include "Pluggable_Messaging.h" +#include "Synch_Queued_Message.h" +#include "Asynch_Queued_Message.h" +#include "Flushing_Strategy.h" +#include "Thread_Lane_Resources.h" +#include "Resume_Handle.h" +#include "Codeset_Manager.h" +#include "Codeset_Translator_Base.h" +#include "debug.h" +#include "CDR.h" +#include "ORB_Core.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdio.h" @@ -34,7 +34,7 @@ //@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK #if !defined (__ACE_INLINE__) -# include "tao/Transport.inl" +# include "Transport.inl" #endif /* __ACE_INLINE__ */ @@ -55,7 +55,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("sending %d buffers\n"), - id, ACE_TEXT_CHAR_TO_TCHAR (location), iovcnt)); + id, ACE_TEXT_TO_TCHAR_IN (location), iovcnt)); for (int i = 0; i != iovcnt && 0 < current_transfer; ++i) { @@ -70,7 +70,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("buffer %d/%d has %d bytes\n"), - id, ACE_TEXT_CHAR_TO_TCHAR(location), + id, ACE_TEXT_TO_TCHAR_IN(location), i, iovcnt, iov_len)); @@ -107,13 +107,11 @@ dump_iov (iovec *iov, int iovcnt, size_t id, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("end of data\n"), - id, ACE_TEXT_CHAR_TO_TCHAR(location))); + id, ACE_TEXT_TO_TCHAR_IN(location))); ACE_Log_Msg::instance ()->release (); } -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Transport::TAO_Transport (CORBA::ULong tag, TAO_ORB_Core *orb_core) : tag_ (tag) @@ -181,9 +179,6 @@ TAO_Transport::~TAO_Transport (void) // By the time the destructor is reached here all the connection stuff // *must* have been cleaned up. - - // The following assert is needed for the test "Bug_2494_Regression". - // See the bugzilla bug #2494 for details. ACE_ASSERT (this->head_ == 0); ACE_ASSERT (this->cache_map_entry_ == 0); @@ -290,7 +285,7 @@ TAO_Transport::register_handler (void) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_handler\n"), + "TAO (%P|%t) - Transport[%d]::register_handler\n", this->id ())); } @@ -332,8 +327,8 @@ TAO_Transport::generate_locate_request ( if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::generate_locate_request, ") - ACE_TEXT ("error while marshalling the LocateRequest header\n"), + "TAO (%P|%t) - Transport[%d]::generate_locate_request, " + "error while marshalling the LocateRequest header\n", this->id ())); } @@ -365,8 +360,8 @@ TAO_Transport::generate_request_header ( if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) - Transport[%d]::generate_request_header, ") - ACE_TEXT ("error while marshalling the Request header\n"), + "(%P|%t) - Transport[%d]::generate_request_header, " + "error while marshalling the Request header\n", this->id())); } @@ -401,7 +396,7 @@ TAO_Transport::make_idle (void) if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"), + "TAO (%P|%t) - Transport[%d]::make_idle\n", this->id ())); } @@ -425,7 +420,7 @@ TAO_Transport::handle_output (void) if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output\n"), + "TAO (%P|%t) - Transport[%d]::handle_output\n", this->id ())); } @@ -437,8 +432,8 @@ TAO_Transport::handle_output (void) if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output, ") - ACE_TEXT ("drain_queue returns %d/%d\n"), + "TAO (%P|%t) - Transport[%d]::handle_output, " + "drain_queue returns %d/%d\n", this->id (), retval, errno)); } @@ -487,14 +482,21 @@ TAO_Transport::send_message_block_chain_i (const ACE_Message_Block *mb, if (n == -1) { synch_message.remove_from_list (this->head_, this->tail_); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); return -1; // Error while sending... } else if (n == 1) { + ACE_ASSERT (synch_message.all_data_sent ()); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); bytes_transferred = total_length; return 1; // Empty queue, message was sent.. } + ACE_ASSERT (n == 0); // Some data sent, but data remains. + // Remove the temporary message from the queue... synch_message.remove_from_list (this->head_, this->tail_); @@ -514,7 +516,7 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, synch_message.push_back (this->head_, this->tail_); - int const n = + int n = this->send_synch_message_helper_i (synch_message, max_wait_time); @@ -523,6 +525,8 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, return n; } + ACE_ASSERT (n == 0); + // @todo: Check for timeouts! // if (max_wait_time != 0 && errno == ETIME) return -1; TAO_Flushing_Strategy *flushing_strategy = @@ -583,14 +587,21 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, ") - ACE_TEXT ("error while flushing message - %m\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, " + "error while flushing message - %m\n", + this->id ())); } return -1; } + else + { + ACE_ASSERT (synch_message.all_data_sent () != 0); + } + + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); return 1; } @@ -605,7 +616,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb, synch_message.push_back (this->head_, this->tail_); - int const n = + int n = this->send_synch_message_helper_i (synch_message, max_wait_time); @@ -614,12 +625,14 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb, return n; } + ACE_ASSERT (n == 0); + if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_reply_message_i, ") - ACE_TEXT ("preparing to add to queue before leaving \n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::send_reply_message_i, " + "preparing to add to queue before leaving \n", + this->id ())); } // Till this point we shouldn't have any copying and that is the @@ -638,19 +651,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb, TAO_Flushing_Strategy *flushing_strategy = this->orb_core ()->flushing_strategy (); - int result = flushing_strategy->schedule_output (this); - - if (result == -1) - { - if (TAO_debug_level > 5) - { - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::send_reply_" - "message_i dequeuing msg due to schedule_output " - "failure\n", this->id ())); - } - msg->remove_from_list (this->head_, this->tail_); - msg->destroy (); - } + (void) flushing_strategy->schedule_output (this); return 1; } @@ -665,15 +666,24 @@ TAO_Transport::send_synch_message_helper_i (TAO_Synch_Queued_Message &synch_mess if (n == -1) { synch_message.remove_from_list (this->head_, this->tail_); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); return -1; // Error while sending... } else if (n == 1) { + ACE_ASSERT (synch_message.all_data_sent ()); + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); return 1; // Empty queue, message was sent.. } + ACE_ASSERT (n == 0); // Some data sent, but data remains. + if (synch_message.all_data_sent ()) { + ACE_ASSERT (synch_message.next () == 0); + ACE_ASSERT (synch_message.prev () == 0); return 1; } @@ -693,32 +703,11 @@ TAO_Transport::schedule_output_i (void) ACE_Event_Handler *eh = this->event_handler_i (); ACE_Reactor *reactor = eh->reactor (); - // Check to see if our event handler is still registered with the - // reactor. It's possible for another thread to have run close_connection() - // since we last used the event handler. - ACE_Event_Handler *found = reactor->find_handler (eh->get_handle ()); - if (found != eh) - { - if(TAO_debug_level > 3) - { - ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Transport[%d]::schedule_output_i " - "event handler not found in reactor, returning -1\n", - this->id ())); - } - if (found) - { - found->remove_reference (); - } - return -1; - } - found->remove_reference (); - if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::schedule_output_i\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::schedule_output_i\n", + this->id ())); } return reactor->schedule_wakeup (eh, ACE_Event_Handler::WRITE_MASK); @@ -733,8 +722,8 @@ TAO_Transport::cancel_output_i (void) if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cancel_output_i\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::cancel_output_i\n", + this->id ())); } return reactor->cancel_wakeup (eh, ACE_Event_Handler::WRITE_MASK); @@ -747,9 +736,9 @@ TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */, if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, ") - ACE_TEXT ("timer expired\n"), - this->id ())); + "TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, " + "timer expired\n", + this->id ())); } /// This is the only legal ACT in the current configuration.... @@ -776,7 +765,7 @@ int TAO_Transport::drain_queue (void) { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1); - int const retval = this->drain_queue_i (); + int retval = this->drain_queue_i (); if (retval == 1) { @@ -799,7 +788,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) size_t byte_count = 0; // ... send the message ... - ssize_t const retval = + ssize_t retval = this->send (iov, iovcnt, byte_count); if (TAO_debug_level == 5) @@ -819,9 +808,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") - ACE_TEXT ("send() returns 0\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::drain_queue_helper, " + "send() returns 0\n", + this->id ())); } return -1; } @@ -830,9 +819,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") - ACE_TEXT ("error during %p\n"), - this->id (), ACE_TEXT ("send()"))); + "TAO (%P|%t) - Transport[%d]::drain_queue_helper, " + "error during %p\n", + this->id (), ACE_TEXT ("send()"))); } if (errno == EWOULDBLOCK || errno == EAGAIN) @@ -845,6 +834,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) // ... start over, how do we guarantee progress? Because if // no bytes are sent send() can only return 0 or -1 + ACE_ASSERT (byte_count != 0); // Total no. of bytes sent for a send call this->sent_byte_count_ += byte_count; @@ -852,9 +842,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ") - ACE_TEXT ("byte_count = %d, head_is_empty = %d\n"), - this->id(), byte_count, (this->head_ == 0))); + "TAO (%P|%t) - Transport[%d]::drain_queue_helper, " + "byte_count = %d, head_is_empty = %d\n", + this->id(), byte_count, (this->head_ == 0))); } return 1; @@ -896,9 +886,9 @@ TAO_Transport::drain_queue_i (void) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ") - ACE_TEXT ("helper retval = %d\n"), - this->id (), retval)); + "TAO (%P|%t) - Transport[%d]::drain_queue_i, " + "helper retval = %d\n", + this->id (), retval)); } if (retval != 1) @@ -921,9 +911,9 @@ TAO_Transport::drain_queue_i (void) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ") - ACE_TEXT ("helper retval = %d\n"), - this->id (), retval)); + "TAO (%P|%t) - Transport[%d]::drain_queue_i, " + "helper retval = %d\n", + this->id (), retval)); } if (retval != 1) @@ -954,9 +944,9 @@ TAO_Transport::cleanup_queue_i () if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ") - ACE_TEXT ("cleaning up complete queue\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::cleanup_queue_i, " + "cleaning up complete queue\n", + this->id ())); } // Cleanup all messages @@ -967,7 +957,7 @@ TAO_Transport::cleanup_queue_i () // @@ This is a good point to insert a flag to indicate that a // CloseConnection message was successfully received. i->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED, - this->orb_core_->leader_follower ()); + this->orb_core_->leader_follower ()); i->remove_from_list (this->head_, this->tail_); @@ -985,9 +975,9 @@ TAO_Transport::cleanup_queue (size_t byte_count) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ") - ACE_TEXT ("byte_count = %d\n"), - this->id (), byte_count)); + "TAO (%P|%t) - Transport[%d]::cleanup_queue, " + "byte_count = %d\n", + this->id (), byte_count)); } // Update the state of the first message @@ -996,10 +986,10 @@ TAO_Transport::cleanup_queue (size_t byte_count) if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ") - ACE_TEXT ("after transfer, bc = %d, all_sent = %d, ml = %d\n"), - this->id (), byte_count, i->all_data_sent (), - i->message_length ())); + "TAO (%P|%t) - Transport[%d]::cleanup_queue, " + "after transfer, bc = %d, all_sent = %d, ml = %d\n", + this->id (), byte_count, i->all_data_sent (), + i->message_length ())); } // ... if all the data was sent the message must be removed from @@ -1068,9 +1058,9 @@ TAO_Transport::report_invalid_event_handler (const char *caller) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::report_invalid_event_handler") - ACE_TEXT ("(%s) no longer associated with handler [tag=%d]\n"), - this->id (), ACE_TEXT_CHAR_TO_TCHAR (caller), this->tag_)); + "TAO (%P|%t) - Transport[%d]::report_invalid_event_handler" + "(%s) no longer associated with handler [tag=%d]\n", + this->id (), ACE_TEXT_TO_TCHAR_IN (caller), this->tag_)); } } @@ -1124,7 +1114,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, { // Let's figure out if the message should be queued without trying // to send first: - bool try_sending_first = true; + bool try_sending_first = 1; const bool queue_empty = (this->head_ == 0); @@ -1148,9 +1138,9 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") - ACE_TEXT ("trying to send the message (ml = %d)\n"), - this->id (), total_length)); + "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, " + "trying to send the message (ml = %d)\n", + this->id (), total_length)); } // @@ I don't think we want to hold the mutex here, however if @@ -1172,10 +1162,10 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") - ACE_TEXT ("fatal error in ") - ACE_TEXT ("send_message_block_chain_i - %m\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, " + "fatal error in " + "send_message_block_chain_i - %m\n", + this->id ())); } return -1; } @@ -1195,9 +1185,9 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") - ACE_TEXT ("partial send %d / %d bytes\n"), - this->id (), byte_count, total_length)); + "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, " + "partial send %d / %d bytes\n", + this->id (), byte_count, total_length)); } // ... part of the data was sent, need to figure out what piece @@ -1209,6 +1199,7 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, // ... at least some portion of the message block chain should // remain ... + ACE_ASSERT (message_block != 0); } // ... either the message must be queued or we need to queue it @@ -1217,18 +1208,18 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub, if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") - ACE_TEXT ("message is queued\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, " + "message is queued\n", + this->id ())); } if (this->queue_message_i(message_block) == -1) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ") - ACE_TEXT ("cannot queue message for ") - ACE_TEXT (" - %m\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, " + "cannot queue message for " + " - %m\n", + this->id ())); return -1; } @@ -1287,13 +1278,13 @@ TAO_Transport::queue_message_i(const ACE_Message_Block *message_block) int TAO_Transport::handle_input (TAO_Resume_Handle &rh, ACE_Time_Value * max_wait_time, - int /* block */ /* deprecated parameter */ ) + int /*block*/) { if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::handle_input\n", + this->id ())); } // First try to process messages of the head of the incoming queue. @@ -1306,768 +1297,853 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") - ACE_TEXT ("error while parsing the head of the queue\n"), - this->id())); - + "TAO (%P|%t) - Transport[%d]::handle_input, " + "error while parsing the head of the queue\n", + this->id())); } - return -1; } - else - { - // retval == 0 - // Processed a message in queue successfully. This - // thread must return to thread-pool now. - return 0; - } + return retval; } - TAO_Queued_Data *q_data = 0; + // If there are no messages then we can go ahead to read from the + // handle for further reading.. + + // The buffer on the stack which will be used to hold the input + // messages + char buf [TAO_MAXBUFSIZE]; + +#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) + (void) ACE_OS::memset (buf, + '\0', + sizeof buf); +#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ + + // Create a data block + ACE_Data_Block db (sizeof (buf), + ACE_Message_Block::MB_DATA, + buf, + this->orb_core_->input_cdr_buffer_allocator (), + this->orb_core_->locking_strategy (), + ACE_Message_Block::DONT_DELETE, + this->orb_core_->input_cdr_dblock_allocator ()); + + // Create a message block + ACE_Message_Block message_block (&db, + ACE_Message_Block::DONT_DELETE, + this->orb_core_->input_cdr_msgblock_allocator ()); - if (this->incoming_message_stack_.top (q_data) != -1 - && q_data->missing_data_ != TAO_MISSING_DATA_UNDEFINED) + + // Align the message block + ACE_CDR::mb_align (&message_block); + + size_t recv_size = 0; + + if (this->orb_core_->orb_params ()->single_read_optimization ()) { - /* PRE: q_data->missing_data_ > 0 as all QD on stack must be incomplete */ - if (this->handle_input_missing_data (rh, max_wait_time, q_data) == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") - ACE_TEXT ("error consolidating incoming message\n"), - this->id ())); - } - return -1; - } + recv_size = + message_block.space (); } else { - if (this->handle_input_parse_data (rh, max_wait_time) == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") - ACE_TEXT ("error parsing incoming message\n"), - this->id ())); - } - return -1; - } + recv_size = + this->messaging_object ()->header_length (); } - return 0; -} - -int -TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, - TAO_Resume_Handle &rh) -{ - // paranoid check - if (q_data->missing_data_ != 0) + // If we have a partial message, copy it into our message block + // and clear out the partial message. + if (this->partial_message_ != 0 && this->partial_message_->length () != 0) { - if (TAO_debug_level > 0) + if (message_block.copy (this->partial_message_->rd_ptr (), + this->partial_message_->length ()) == 0) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") - ACE_TEXT ("missing data\n"), - this->id ())); + recv_size -= this->partial_message_->length (); + this->partial_message_->reset (); } - return -1; - } - - if (q_data->more_fragments_ || - q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT) - { - // consolidate message on top of stack, only for fragmented messages - TAO_Queued_Data *new_q_data = 0; - - switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data)) + else { - case -1: // error - return -1; + ACE_ERROR_RETURN ((LM_ERROR, + "TAO (%P|%t) - Transport[%d]::handle_input, " + "unable to copy the partial message\n", + this->id ()), + -1); + } + } - case 0: // returning consolidated message in q_data - if (!new_q_data) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") - ACE_TEXT ("error, consolidated message is NULL\n"), - this->id ())); - } - return -1; - } + // Saving the size of the received buffer in case any one needs to + // get the size of the message thats received in the + // context. Obviously the value will be changed for each recv call + // and the user is supposed to invoke the accessor only in the + // invocation context to get meaningful information. + this->recv_buffer_size_ = recv_size; + // Read the message into the message block that we have created on + // the stack. + ssize_t n = this->recv (message_block.wr_ptr (), + recv_size, + max_wait_time); - if (this->process_parsed_messages (new_q_data, rh) == -1) - { - TAO_Queued_Data::release (new_q_data); + // If there is an error return to the reactor.. + if (n <= 0) + { + return n; + } - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") - ACE_TEXT ("error processing consolidated message\n"), - this->id ())); - } - return -1; - } + if (TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::handle_input, " + "read %d bytes\n", + this->id (), n)); + } - TAO_Queued_Data::release (new_q_data); + // Set the write pointer in the stack buffer + message_block.wr_ptr (n); - break; + // Parse the message and try consolidating the message if + // needed. + retval = this->parse_consolidate_messages (message_block, + rh, + max_wait_time); - case 1: // fragment has been stored in messaging_oject() - break; + if (retval <= 0) + { + if (retval == -1 && TAO_debug_level > 0) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::handle_input, " + "error while parsing and consolidating\n", + this->id ())); } + return retval; } - else + + if (message_block.length () > 0) { - if (this->process_parsed_messages (q_data, rh) == -1) + // Make a node of the message block.. + TAO_Queued_Data qd (&message_block, + this->orb_core_->transport_message_buffer_allocator ()); + + // Extract the data for the node.. + this->messaging_object ()->get_message_data (&qd); + + // Check whether the message was fragmented.. + if (qd.more_fragments_ || + (qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)) { - TAO_Queued_Data::release (q_data); + // Duplicate the node that we have as the node is on stack.. + TAO_Queued_Data *nqd = + TAO_Queued_Data::duplicate (qd); - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ") - ACE_TEXT ("error processing message\n"), - this->id ())); - } - return -1; + return this->consolidate_fragments (nqd, rh); } - TAO_Queued_Data::release (q_data); - + // Process the message + return this->process_parsed_messages (&qd, + rh); } return 0; } int -TAO_Transport::consolidate_enqueue_message (TAO_Queued_Data *q_data) +TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time) { - // consolidate message on top of stack, only for fragmented messages - - // paranoid check - if (q_data->missing_data_ != 0) + // Parse the incoming message for validity. The check needs to be + // performed by the messaging objects. + switch (this->parse_incoming_messages (block)) { - return -1; - } + // An error has occurred during message parsing + case -1: + return -1; - if (q_data->more_fragments_ || - q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT) - { - TAO_Queued_Data *new_q_data = 0; + // This message block does not contain enough data to + // parse the header. We do not need to grow the partial + // message block since we are guaranteed that it can hold + // at least a GIOP header plus a GIOP fragment header. + case 1: + if (this->partial_message_ == 0) + { + this->allocate_partial_message_block (); + } - switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data)) + if (this->partial_message_ != 0 && + this->partial_message_->copy (block.rd_ptr (), + block.length ()) == 0) { - case -1: // error - return -1; + block.rd_ptr (block.length ()); + return 0; + } + else + { + ACE_ERROR_RETURN ((LM_ERROR, + "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, " + "unable to save the partial message\n", + this->id ()), + -1); + } - case 0: // returning consolidated message in new_q_data - if (!new_q_data) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_enqueue_message, ") - ACE_TEXT ("error, consolidated message is NULL\n"), - this->id ())); - } - return -1; - } + case 0: // The normal case + break; - if (this->incoming_message_queue_.enqueue_tail (new_q_data) != 0) - { - TAO_Queued_Data::release (new_q_data); - return -1; - } - break; + default: + ACE_ERROR_RETURN ((LM_ERROR, + "TAO (%P|%t) - Transport[%d]::parse_consolidate_messages, " + "impossible return value from parse_incoming_messages\n", + this->id ()), + -1); + } - case 1: // fragment has been stored in messaging_oject() - break; - } + // Check whether we have a complete message for processing + const ssize_t missing_data = this->missing_data (block); + + if (missing_data < 0) + { + // If we have more than one message + return this->consolidate_extra_messages (block, + rh); } - else + else if (missing_data > 0) { - if (this->incoming_message_queue_.enqueue_tail (q_data) != 0) - { - TAO_Queued_Data::release (q_data); - return -1; - } + // If we have missing data then try doing a read or try queueing + // them. + return this->consolidate_message (block, + missing_data, + rh, + max_wait_time); } - return 0; // success + return 1; } int -TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh, - ACE_Time_Value * max_wait_time, - TAO_Queued_Data *q_data) +TAO_Transport::parse_incoming_messages (ACE_Message_Block &block) { - // paranoid check - if (q_data == 0) - { - return -1; - } + // If we have a queue and if the last message is not complete a + // complete one, then this read will get us the remaining data. So + // do not try to parse the header if we have an incomplete message + // in the queue. + if (this->incoming_message_queue_.is_tail_complete () != 0) + { + // As it looks like a new message has been read, process the + // message. Call the messaging object to do the parsing.. + int retval = + this->messaging_object ()->parse_incoming_messages (block); + + if (retval == -1 && TAO_debug_level > 2) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::parse_incoming_messages, " + "error in incoming message\n", + this->id ())); + } - if (TAO_debug_level > 3) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ") - ACE_TEXT ("enter (missing data == %d)\n"), - this->id (), q_data->missing_data_)); + return retval; } - const size_t recv_size = q_data->missing_data_; + return 0; +} - // make sure the message_block has enough space - const size_t message_size = recv_size - + q_data->msg_block_->length(); - if (q_data->msg_block_->space() < recv_size) +ssize_t +TAO_Transport::missing_data (ACE_Message_Block &incoming) +{ + // If we have a incomplete message in the queue then find out how + // much of data is required to get a complete message. + if (this->incoming_message_queue_.is_tail_complete () == 0) { - if (ACE_CDR::grow (q_data->msg_block_, message_size) == -1) - { - return -1; - } + return this->incoming_message_queue_.missing_data_tail (); } - // Saving the size of the received buffer in case any one needs to - // get the size of the message thats received in the - // context. Obviously the value will be changed for each recv call - // and the user is supposed to invoke the accessor only in the - // invocation context to get meaningful information. - this->recv_buffer_size_ = recv_size; - - // Read the message into the existing message block on heap - const ssize_t n = this->recv (q_data->msg_block_->wr_ptr(), - recv_size, - max_wait_time); + return this->messaging_object ()->missing_data (incoming); +} - if (n <= 0) +int +TAO_Transport::consolidate_message (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time) +{ + // Check whether the last message in the queue is complete.. + if (this->incoming_message_queue_.is_tail_complete () == 0) { - return n; + return this->consolidate_message_queue (incoming, + missing_data, + rh, + max_wait_time); } - if (TAO_debug_level > 3) + if (TAO_debug_level > 4) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ") - ACE_TEXT ("read bytes %d\n"), - this->id (), n)); + "TAO (%P|%t) - Transport[%d]::consolidate_message\n", + this->id ())); } - q_data->msg_block_->wr_ptr(n); - q_data->missing_data_ -= n; + // Calculate the actual length of the load that we are supposed to + // read which is equal to the <missing_data> + length of the buffer + // that we have.. + const size_t payload = missing_data + incoming.size (); + + // Grow the buffer to the size of the message + ACE_CDR::grow (&incoming, + payload); - if (q_data->missing_data_ == 0) + ssize_t n = 0; + + // As this used for transports where things are available in one + // shot this looping should not create any problems. + for (ssize_t bytes = missing_data; bytes != 0; bytes -= n) { - // paranoid check - if (this->incoming_message_stack_.pop (q_data) == -1) + // .. do a read on the socket again. + n = this->recv (incoming.wr_ptr (), + bytes, + max_wait_time); + + if (TAO_debug_level > 6) { - return -1; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message, " + "read %d bytes on attempt\n", + this->id(), n)); } - if (this->consolidate_process_message (q_data, rh) == -1) + if (n == 0 || n == -1) { - return -1; + break; } - } - - return 0; -} - -int -TAO_Transport::handle_input_parse_extra_messages (ACE_Message_Block &message_block) -{ - - // store buffer status of last extraction: -1 parse error, 0 - // incomplete message header in buffer, 1 complete messages header - // parsed - int buf_status = 0; - - TAO_Queued_Data *q_data = 0; // init + incoming.wr_ptr (n); + missing_data -= n; + } - // parse buffer until all messages have been extracted, consolidate - // and enqueue complete messages, if the last message being parsed - // has missin data, it is stays on top of incoming_message_stack. - while (message_block.length () > 0 && - (buf_status = this->messaging_object ()->extract_next_message - (message_block, q_data)) != -1 && - q_data != 0) // paranoid check + // If we got an error.. + if (n == -1) { - if (q_data->missing_data_ == 0) - { - if (this->consolidate_enqueue_message (q_data) == -1) - { - return -1; - } - } - else // incomplete message read, probably the last message in buffer + if (TAO_debug_level > 4) { - // can not fail - this->incoming_message_stack_.push (q_data); + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message, " + "error while trying to consolidate\n", + this->id ())); } - q_data = 0; // reset - } // while - - if (buf_status == -1) - { return -1; } - return 0; -} - -int -TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, - ACE_Time_Value * max_wait_time) -{ + // If we had gotten a EWOULDBLOCK n would be equal to zero. But we + // have to put the message in the queue anyway. So let us proceed + // to do that and return... - if (TAO_debug_level > 3) + // Check to see if we have messages in queue or if we have missing + // data . AT this point we cannot have have semi-complete messages + // in the queue as they would have been taken care before. Put + // ourselves in the queue and then try processing one of the + // messages.. + if (missing_data >= 0 || + this->incoming_message_queue_.queue_length () != 0) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") - ACE_TEXT ("enter\n"), - this->id ())); - } + if (missing_data == 0 || + !this->incoming_message_queue_.is_tail_fragmented ()) + { + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message, " + "queueing up the message\n", + this->id ())); + } + // Get a queued data + TAO_Queued_Data *qd = + this->make_queued_data (incoming); - // The buffer on the stack which will be used to hold the input - // messages, ACE_CDR::MAX_ALIGNMENT compensates the - // memory-alignment. This improves performance with SUN-Java-ORB-1.4 - // and higher that sends fragmented requests of size 1024 bytes. - char buf [TAO_MAXBUFSIZE + ACE_CDR::MAX_ALIGNMENT]; + // Add the missing data to the queue + qd->missing_data_ = missing_data; -#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) - (void) ACE_OS::memset (buf, - '\0', - sizeof buf); -#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ - - // Create a data block - ACE_Data_Block db (sizeof (buf), - ACE_Message_Block::MB_DATA, - buf, - this->orb_core_->input_cdr_buffer_allocator (), - this->orb_core_->locking_strategy (), - ACE_Message_Block::DONT_DELETE, - this->orb_core_->input_cdr_dblock_allocator ()); - - // Create a message block - ACE_Message_Block message_block (&db, - ACE_Message_Block::DONT_DELETE, - this->orb_core_->input_cdr_msgblock_allocator ()); + // Get the rest of the messaging data + this->messaging_object ()->get_message_data (qd); + // If this is a full GIOP fragment, then we need only + // to consolidate the fragments + if (missing_data == 0 && + (qd->more_fragments_ || + qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)) + { + this->consolidate_fragments (qd, rh); + } + else + { + // Add it to the tail of the queue.. + this->incoming_message_queue_.enqueue_tail (qd); - // Align the message block - ACE_CDR::mb_align (&message_block); + if (this->incoming_message_queue_.is_head_complete ()) + { + return this->process_queue_head (rh); + } + } + } + else + { + // This block of code will only come into play when GIOP + // message fragmentation is employed. If we have a fragment + // in the message queue, we can only chain message blocks + // onto the TAO_Queued_Data for that fragment. Unless we have + // a full GIOP fragment, and since we know we're missing data, + // we need to save what we have until we can read in some more of + // the fragment until we get it all. This bit of data could be + // larger than what the partial message block can hold, so we may + // need to grow the partial message block. + if (this->partial_message_ == 0) + { + this->allocate_partial_message_block (); + } - size_t recv_size = 0; // Note: unsigned integer + if (this->partial_message_ != 0) + { + const size_t incoming_length = incoming.length (); + ACE_CDR::grow (this->partial_message_, + incoming_length); + if (this->partial_message_->copy (incoming.rd_ptr (), + incoming_length) == 0) + { + incoming.rd_ptr (incoming_length); + } + else + { + ACE_ERROR_RETURN ((LM_ERROR, + "TAO (%P|%t) - Transport[%d]::consolidate_message, " + "unable to save the partial message\n", + this->id ()), + -1); + } + } + else + { + ACE_ERROR_RETURN ((LM_ERROR, + "TAO (%P|%t) - Transport[%d]::consolidate_message, " + "unable to allocate the partial message\n", + this->id ()), + -1); + } + } - // Pointer to newly parsed message - TAO_Queued_Data *q_data = 0; + return 0; + } - // optimizing access of constants - const size_t header_length = - this->messaging_object ()->header_length (); + // We don't have any missing data. Just make a queued_data node with + // the existing message block and send it to the higher layers of + // the ORB. + TAO_Queued_Data pqd (&incoming, + this->orb_core_->transport_message_buffer_allocator ()); + pqd.missing_data_ = missing_data; + this->messaging_object ()->get_message_data (&pqd); - // paranoid check - if (header_length > message_block.space ()) + // Check whether the message was fragmented and try to consolidate + // the fragments.. + if (pqd.more_fragments_ || + (pqd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)) { - return -1; - } + // Duplicate the queued data as it is on stack.. + TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (pqd); - if (this->orb_core_->orb_params ()->single_read_optimization ()) - { - recv_size = - message_block.space (); + return this->consolidate_fragments (nqd, rh); } - else + + // Now we have a full message in our buffer. Just go ahead and + // process that + return this->process_parsed_messages (&pqd, + rh); +} + +int +TAO_Transport::consolidate_fragments (TAO_Queued_Data *queueable_message, + TAO_Resume_Handle &rh) +{ + // Get the version numbers + CORBA::Octet major = queueable_message->major_version_; + CORBA::Octet minor = queueable_message->minor_version_; + CORBA::UShort whole = major << 8 | minor; + + switch(whole) { - // Single read optimization has been de-activated. That means - // that we need to read from transport the GIOP header first - // before the payload. This codes first checks the incoming - // stack for partial messages which needs to be - // consolidated. Otherwise we are in new cycle, reading complete - // GIOP header of new incoming message. - if (this->incoming_message_stack_.top (q_data) != -1 - && q_data->missing_data_ == TAO_MISSING_DATA_UNDEFINED) + case 0x0100: + if (!queueable_message->more_fragments_) { - // There is a partial message on incoming_message_stack_ - // whose length is unknown so far. We need to consolidate - // the GIOP header to get to know the payload size, - recv_size = header_length - q_data->msg_block_->length (); + this->incoming_message_queue_.enqueue_tail (queueable_message); } else { - // Read amount of data forming GIOP header of new incoming - // message. - recv_size = header_length; + // Fragments aren't supported in 1.0. This is an error and + // we should reject it somehow. What do we do here? Do we throw + // an exception to the receiving side? Do we throw an exception + // to the sending side? + // + // At the very least, we need to log the fact that we received + // nonsense. + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT("TAO (%P|%t) - ") + ACE_TEXT("TAO_Transport::enqueue_incoming_message ") + ACE_TEXT("detected a fragmented GIOP 1.0 message\n")), + -1); } - // POST: 0 <= recv_size <= header_length + break; + case 0x0101: + { + // One note is that TAO_Queued_Data contains version numbers, + // but doesn't indicate the actual protocol to which those + // version numbers refer. That's not a problem, though, because + // instances of TAO_Queued_Data live in a queue, and that queue + // lives in a particular instance of a Transport, and the + // transport instance has an association with a particular + // messaging_object. The concrete messaging object embodies a + // messaging protocol, and must cover all versions of that + // protocol. Therefore, we just need to cover the bases of all + // versions of that one protocol. + + // In 1.1, fragments kinda suck because they don't have they're + // own message-specific header. Therefore, we have to find the + // fragment based on the major and minor version. + TAO_Queued_Data* fragment_message_chain = + this->incoming_message_queue_.find_fragment_chain (major, minor); + + // Deal with the fragment and the queueable message + this->process_fragment (fragment_message_chain, + queueable_message, + major, minor, rh); + break; + } + case 0x0102: + { + // In 1.2, we get a little more context. There's a + // FRAGMENT message-specific header, and inside that is the + // request id with which the fragment is associated. + TAO_Queued_Data* fragment_message_chain = + this->incoming_message_queue_.find_fragment_chain ( + queueable_message->request_id_); + + // Deal with the fragment and the queueable message + this->process_fragment (fragment_message_chain, + queueable_message, + major, minor, rh); + break; + } + default: + ACE_ERROR ((LM_ERROR, + ACE_TEXT("TAO (%P|%t) - ") + ACE_TEXT("TAO_Transport::consolidate_fragments ") + ACE_TEXT("can not handle a GIOP %d.%d ") + ACE_TEXT("message\n"), major, minor)); + ACE_HEX_DUMP ((LM_DEBUG, + queueable_message->msg_block_->rd_ptr (), + queueable_message->msg_block_->length ())); + return -1; } - // POST: 0 <= recv_size <= message_block->space () - // If we have a partial message, copy it into our message block and - // clear out the partial message. - if (this->partial_message_ != 0 && this->partial_message_->length () > 0) + return 0; +} + +void +TAO_Transport::process_fragment (TAO_Queued_Data* fragment_message_chain, + TAO_Queued_Data* queueable_message, + CORBA::Octet major, + CORBA::Octet minor, + TAO_Resume_Handle &rh) +{ + // No fragment was found + if (fragment_message_chain == 0) { - // (*) Copy back the partial message into current read-buffer, - // verify that the read-strategy of "recv_size" bytes is not - // exceeded. The latter check guarantees that recv_size does not - // roll-over and keeps in range - // 0<=recv_size<=message_block->space() - if (this->partial_message_->length () <= recv_size && - message_block.copy (this->partial_message_->rd_ptr (), - this->partial_message_->length ()) == 0) + this->incoming_message_queue_.enqueue_tail (queueable_message); + } + else + { + if (fragment_message_chain->major_version_ != major || + fragment_message_chain->minor_version_ != minor) + ACE_ERROR ((LM_ERROR, + ACE_TEXT("TAO (%P|%t) - ") + ACE_TEXT("TAO_Transport::process_fragment ") + ACE_TEXT("GIOP versions do not match ") + ACE_TEXT("(%d.%d != %d.%d\n"), + fragment_message_chain->major_version_, + fragment_message_chain->minor_version_, + major, minor)); + + // Find the last message block in the continuation + ACE_Message_Block* mb = fragment_message_chain->msg_block_; + while (mb->cont () != 0) + mb = mb->cont (); + + // Add the current message block to the end of the chain + // after adjusting the read pointer to skip the header(s) + const size_t header_adjustment = + this->messaging_object ()->header_length () + + this->messaging_object ()->fragment_header_length (major, minor); + queueable_message->msg_block_->rd_ptr(header_adjustment); + mb->cont (queueable_message->msg_block_); + + // Remove our reference to the message block. At this point + // the message block of the fragment head owns it as part of a + // chain + queueable_message->msg_block_ = 0; + + if (!queueable_message->more_fragments_) { + // This is the end of the fragments for this request + fragment_message_chain->consolidate (); - recv_size -= this->partial_message_->length (); - this->partial_message_->reset (); - } - else - { - return -1; + // Process the queue head to make sure that the newly + // consolidated fragments get handled + this->process_queue_head (rh); } + + // Get rid of the queuable message + TAO_Queued_Data::release (queueable_message); } - // POST: 0 <= recv_size <= buffer_space +} - if (0 >= recv_size) // paranoid: the check above (*) guarantees recv_size>=0 +int +TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time) +{ + if (TAO_debug_level > 4) { - // This event would cause endless looping, trying frequently to - // read zero bytes from stream. This might happen, if TAOs - // protocol implementation is not correct and tries to read data - // beyond header without "single_read_optimazation" being - // activated. - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") - ACE_TEXT ("Error - endless loop detection, closing connection"), - this->id ())); - } - return -1; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message_queue\n", + this->id ())); } - // Saving the size of the received buffer in case any one needs to - // get the size of the message thats received in the - // context. Obviously the value will be changed for each recv call - // and the user is supposed to invoke the accessor only in the - // invocation context to get meaningful information. - this->recv_buffer_size_ = recv_size; - - // Read the message into the message block that we have created on - // the stack. - const ssize_t n = this->recv (message_block.wr_ptr (), - recv_size, - max_wait_time); + // If the queue did not have a complete message put this piece of + // message in the queue. We know it did not have a complete + // message. That is why we are here. + const size_t n = + this->incoming_message_queue_.copy_tail (incoming); - // If there is an error return to the reactor.. - if (n <= 0) + if (TAO_debug_level > 6) { - return n; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, " + "copied [%d] bytes to the tail\n", + this->id (), + n)); } - if (TAO_debug_level > 3) + // Update the missing data... + missing_data = + this->incoming_message_queue_.missing_data_tail (); + + if (TAO_debug_level > 6) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") - ACE_TEXT ("read %d bytes\n"), - this->id (), n)); + "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, " + "missing [%d] bytes in the tail message\n", + this->id (), + missing_data)); } - // Set the write pointer in the stack buffer - message_block.wr_ptr (n); - - // - // STACK PROCESSING OR MESSAGE CONSOLIDATION - // - - // PRE: data in buffer is aligned && message_block.length() > 0 + // Move the read pointer of the <incoming> message block to the end + // of the copied message and process the remaining portion... + incoming.rd_ptr (n); - if (this->incoming_message_stack_.top (q_data) != -1 - && q_data->missing_data_ == TAO_MISSING_DATA_UNDEFINED) + // If we have some more information left in the message block.. + if (incoming.length ()) { - // - // MESSAGE CONSOLIDATION - // + // We may have to parse & consolidate. This part of the message + // doesn't seem to be part of the last message in the queue (as + // the copy () hasn't taken away this message). + const int retval = this->parse_consolidate_messages (incoming, + rh, + max_wait_time); - // Partial message on incoming_message_stack_ needs to be - // consolidated. The message header could not be parsed so far - // and therefor the message size is unknown yet. Consolidating - // the message destroys the memory alignment of succeeding - // messages sharing the buffer, for that reason consolidation - // and stack based processing are mutial exclusive. - if (this->messaging_object ()->consolidate_node (q_data, - message_block) == -1) + // If there is an error return + if (retval == -1) { - if (TAO_debug_level > 0) + if (TAO_debug_level) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") - ACE_TEXT ("error consolidating message from input buffer\n"), - this->id () )); - } - return -1; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, " + "error while consolidating, part of the read message\n", + this->id ())); + } + return retval; } - - // Complete message are to be enqueued and later processed - if (q_data->missing_data_ == 0) + else if (retval == 1) { - if (this->incoming_message_stack_.pop (q_data) == -1) - { - return -1; - } + // If the message in the <incoming> message block has only + // one message left we need to process that seperately. + + // Get a queued data + TAO_Queued_Data *qd = this->make_queued_data (incoming); + + // Get the rest of the message data + this->messaging_object ()->get_message_data (qd); - if (this->consolidate_enqueue_message (q_data) == -1) + // Add the missing data to the queue + qd->missing_data_ = 0; + + // Check whether the message was fragmented and try to consolidate + // the fragments.. + if (qd->more_fragments_ + || (qd->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)) { - return -1; + return this->consolidate_fragments (qd, rh); } - } - if (message_block.length () > 0 - && this->handle_input_parse_extra_messages (message_block) == -1) - { - return -1; - } + // Add it to the tail of the queue.. + this->incoming_message_queue_.enqueue_tail (qd); - // In any case try to process the enqueued messages - if (this->process_queue_head (rh) == -1) - { - return -1; + // We should surely have a message in queue now. So just + // process that. + return this->process_queue_head (rh); } - } - else - { - // - // STACK PROCESSING (critical path) - // - // Process the first message in buffer on stack + // parse_consolidate_messages () would have processed one of the + // messages, so we better return as we dont want to starve other + // threads. + return 0; + } - // (PRE: first message resides in aligned memory) Make a node of - // the message-block.. + // If we still have some missing data.. + if (missing_data > 0) + { + // Get the last message from the Queue + TAO_Queued_Data *qd = + this->incoming_message_queue_.dequeue_tail (); - TAO_Queued_Data qd (&message_block, - this->orb_core_->transport_message_buffer_allocator ()); + if (TAO_debug_level > 5) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, " + "trying recv, again\n", + this->id ())); + } - size_t mesg_length = 0; + // Try to do a read again. If we have some luck it would be + // great.. + const ssize_t n = this->recv (qd->msg_block_->wr_ptr (), + missing_data, + max_wait_time); - if (this->messaging_object ()->parse_next_message (message_block, - qd, - mesg_length) == -1 - || (qd.missing_data_ == 0 - && mesg_length > message_block.length ()) ) + if (TAO_debug_level > 5) { - // extracting message failed - return -1; + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, " + "recv retval [%d]\n", + this->id (), + n)); } - // POST: qd.missing_data_ == 0 --> mesg_length <= message_block.length() - // This prevents seeking rd_ptr behind the wr_ptr - if (qd.missing_data_ != 0 || - qd.more_fragments_ || - qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT) + // Error... + if (n < 0) { - if (qd.missing_data_ == 0) - { - // Dealing with a fragment - TAO_Queued_Data *nqd = - TAO_Queued_Data::duplicate (qd); - - if (nqd == 0) - { - return -1; - } + return n; + } - // mark the end of message in new buffer - char* end_mark = nqd->msg_block_->rd_ptr () - + mesg_length; - nqd->msg_block_->wr_ptr (end_mark); + // If we get a EWOULDBLOCK ie. n==0, we should anyway put the + // message in queue before returning.. + // Move the write pointer + qd->msg_block_->wr_ptr (n); - // move the read pointer forward in old buffer - message_block.rd_ptr (mesg_length); + // Decrement the missing data + qd->missing_data_ -= n; - // enqueue the message - if (this->consolidate_enqueue_message (nqd) == -1) - { - return -1; - } + // Now put the TAO_Queued_Data back in the queue + this->incoming_message_queue_.enqueue_tail (qd); - if (message_block.length () > 0 - && this->handle_input_parse_extra_messages (message_block) == -1) - { - return -1; - } + // Any way as we have come this far and are about to return, + // just try to process a message if it is there in the queue. + if (this->incoming_message_queue_.is_head_complete ()) + { + return this->process_queue_head (rh); + } - // In any case try to process the enqueued messages - if (this->process_queue_head (rh) == -1) - { - return -1; - } - } - else if (qd.missing_data_ != TAO_MISSING_DATA_UNDEFINED) - { - // Incomplete message, must be the last one in buffer + return 0; + } - if (qd.missing_data_ != TAO_MISSING_DATA_UNDEFINED && - qd.missing_data_ > message_block.space ()) - { - // Re-Allocate correct size on heap - if (ACE_CDR::grow (qd.msg_block_, - message_block.length () - + qd.missing_data_) == -1) - { - return -1; - } - } + // Process a message in the head of the queue if we have one.. + return this->process_queue_head (rh); +} - TAO_Queued_Data *nqd = - TAO_Queued_Data::duplicate (qd); - if (nqd == 0) - { - return -1; - } +int +TAO_Transport::consolidate_extra_messages (ACE_Message_Block + &incoming, + TAO_Resume_Handle &rh) +{ + if (TAO_debug_level > 4) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages\n", + this->id ())); + } - // move read-pointer to end of buffer - message_block.rd_ptr (message_block.length()); + // Pick the tail of the queue + TAO_Queued_Data *tail = + this->incoming_message_queue_.dequeue_tail (); - this->incoming_message_stack_.push (nqd); - } - } - else + if (tail) + { + // If we have a node in the tail, checek to see whether it needs + // consolidation. If so, just consolidate it. + if (this->messaging_object ()->consolidate_node (tail, incoming) == -1) { - // - // critical path - // - - // We cant process the message on stack right now. First we - // have got to parse extra messages from message_block, - // putting them into queue. When this is done we can return - // to process this message, and notifying other threads to - // process the messages in queue. - - char * end_marker = message_block.rd_ptr () - + mesg_length; - - if (message_block.length () > mesg_length) - { - // There are more message in data stream to be parsed. - // Safe the rd_ptr to restore later. - char *rd_ptr_stack_mesg = message_block.rd_ptr (); - - // Skip parsed message, jump to next message in buffer - // PRE: mesg_length <= message_block.length () - message_block.rd_ptr (mesg_length); + return -1; + } - // Extract remaining messages and enqueue them for later - // heap processing - if (this->handle_input_parse_extra_messages (message_block) == -1) - { - return -1; - } + // .. put the tail back in queue.. + this->incoming_message_queue_.enqueue_tail (tail); + } - // correct the end_marker - end_marker = message_block.rd_ptr (); + int retval = 1; - // Restore rd_ptr - message_block.rd_ptr (rd_ptr_stack_mesg); - } + if (TAO_debug_level > 6) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages, " + "extracting extra messages\n", + this->id ())); + } - // The following if-else has been copied from - // process_queue_head(). While process_queue_head() - // processes message on heap, here we will process a message - // on stack. + // Extract messages.. + while (retval == 1) + { + TAO_Queued_Data *q_data = 0; - // Now that we have one message on stack to be processed, - // check whether we have one more message in the queue... - if (this->incoming_message_queue_.queue_length () > 0) + retval = + this->messaging_object ()->extract_next_message (incoming, + q_data); + if (q_data) + { + // If we have read a framented message then... + if (q_data->more_fragments_ || + q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT) { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ") - ACE_TEXT ("notify reactor\n"), - this->id ())); - - } - - const int retval = this->notify_reactor (); - - if (retval == 1) - { - // Let the class know that it doesn't need to resume the - // handle.. - rh.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED); - } - else if (retval < 0) - return -1; + this->consolidate_fragments (q_data, rh); } else { - // As there are no further messages in queue just resume - // the handle. Set the flag incase someone had reset the flag.. - rh.set_flag (TAO_Resume_Handle::TAO_HANDLE_RESUMABLE); - } - - // PRE: incoming_message_queue is empty - if (this->process_parsed_messages (&qd, - rh) == -1) - { - return -1; + this->incoming_message_queue_.enqueue_tail (q_data); } - - // move the rd_ptr tp position of end_marker - message_block.rd_ptr (end_marker); } } - // Now that all cases have been processed, there might be kept some data - // in buffer that needs to be safed for next "handle_input" invocations. - if (message_block.length () > 0) - { - if (this->partial_message_ == 0) - { - this->allocate_partial_message_block (); - } - - if (this->partial_message_ != 0 && - this->partial_message_->copy (message_block.rd_ptr (), - message_block.length ()) == 0) - { - message_block.rd_ptr (message_block.length ()); - } - else - { - return -1; - } - } - - return 0; -} + // In case of error return.. + if (retval == -1) + { + return retval; + } + return this->process_queue_head (rh); +} int TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, TAO_Resume_Handle &rh) { - if (TAO_debug_level > 7) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") - ACE_TEXT ("entering (missing data == %d)\n"), - this->id(), qd->missing_data_)); - } - // Get the <message_type> that we have received const TAO_Pluggable_Message_Type t = qd->msg_type_; @@ -2077,9 +2153,9 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") - ACE_TEXT ("received CloseConnection message - %m\n"), - this->id())); + "TAO (%P|%t) - Transport[%d]::process_parsed_messages, " + "received CloseConnection message - %m\n", + this->id())); // Return a "-1" so that the next stage can take care of // closing connection and the necessary memory management. @@ -2113,46 +2189,22 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") - ACE_TEXT ("error in process_reply_message - %m\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::process_parsed_messages, " + "error in process_reply_message - %m\n", + this->id ())); return -1; } } - else if (t == TAO_PLUGGABLE_MESSAGE_CANCELREQUEST) - { - // The associated request might be incomplpete residing - // fragmented in messaging object. We must make sure the - // resources allocated by fragments are released. - - if (this->messaging_object ()->discard_fragmented_message (qd) == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") - ACE_TEXT ("error processing CancelRequest\n"), - this->id ())); - } - } - - // We are not able to cancel requests being processed already; - // this is declared as optional feature by CORBA, and TAO does - // not support this currently. - - // Just continue processing, CancelRequest does not mean to cut - // off the connection. - } else if (t == TAO_PLUGGABLE_MESSAGE_MESSAGERROR) { - if (TAO_debug_level > 0) + if (TAO_debug_level) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ") - ACE_TEXT ("received MessageError, closing connection\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::process_parsed_messages, " + "received MessageError, closing connection\n", + this->id ())); } return -1; } @@ -2161,18 +2213,68 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, return 0; } +TAO_Queued_Data * +TAO_Transport::make_queued_data (ACE_Message_Block &incoming) +{ + // Get an instance of TAO_Queued_Data + TAO_Queued_Data *qd = + TAO_Queued_Data::make_queued_data ( + this->orb_core_->transport_message_buffer_allocator ()); + + // Get the flag for the details of the data block... + ACE_Message_Block::Message_Flags flg = + incoming.self_flags (); + + if (ACE_BIT_DISABLED (flg, + ACE_Message_Block::DONT_DELETE)) + { + // Duplicate the data block before putting it in the queue. + qd->msg_block_ = ACE_Message_Block::duplicate (&incoming); + } + else + { + // As we are in CORBA mode, all the data blocks would be aligned + // on an 8 byte boundary. Hence create a data block for more + // than the actual length + ACE_Data_Block *db = + this->orb_core_->create_input_cdr_data_block (incoming.length ()+ + ACE_CDR::MAX_ALIGNMENT); + + // Get the allocator.. + ACE_Allocator *alloc = + this->orb_core_->input_cdr_msgblock_allocator (); + + // Make message block.. + ACE_Message_Block mb (db, + 0, + alloc); + + // Duplicate the block.. + qd->msg_block_ = mb.duplicate (); + + // Align the message block + ACE_CDR::mb_align (qd->msg_block_); + + // Copy the data.. + qd->msg_block_->copy (incoming.rd_ptr (), + incoming.length ()); + } + + return qd; +} + int TAO_Transport::process_queue_head (TAO_Resume_Handle &rh) { if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, %d enqueued\n"), - this->id (), this->incoming_message_queue_.queue_length () )); + "TAO (%P|%t) - Transport[%d]::process_queue_head\n", + this->id ())); } - // See if message in queue ... - if (this->incoming_message_queue_.queue_length () > 0) + // See if the message in the head of the queue is complete... + if (this->incoming_message_queue_.is_head_complete () > 0) { // Get the message on the head of the queue.. TAO_Queued_Data *qd = @@ -2181,21 +2283,21 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh) if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ") - ACE_TEXT ("the size of the queue is [%d]\n"), - this->id (), - this->incoming_message_queue_.queue_length())); + "TAO (%P|%t) - Transport[%d]::process_queue_head, " + "the size of the queue is [%d]\n", + this->id (), + this->incoming_message_queue_.queue_length())); } // Now that we have pulled out out one message out of the queue, // check whether we have one more message in the queue... - if (this->incoming_message_queue_.queue_length () > 0) + if (this->incoming_message_queue_.is_head_complete () > 0) { if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ") - ACE_TEXT ("notify reactor\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::process_queue_head, " + "notify reactor\n", + this->id ())); } @@ -2248,9 +2350,9 @@ TAO_Transport::notify_reactor (void) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ") - ACE_TEXT ("notify to Reactor\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::notify_reactor, " + "notify to Reactor\n", + this->id ())); } @@ -2263,9 +2365,9 @@ TAO_Transport::notify_reactor (void) // @@todo: need to think about what is the action that // we can take when we get here. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ") - ACE_TEXT ("notify to the reactor failed..\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::notify_reactor, " + "notify to the reactor failed..\n", + this->id ())); } return 1; @@ -2366,10 +2468,10 @@ TAO_Transport::post_open (size_t id) if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_connect , ") - ACE_TEXT ("could not register the transport ") - ACE_TEXT ("in the reactor.\n"), - this->id ())); + "TAO (%P|%t) - Transport[%d]::post_connect , " + "could not register the transport " + "in the reactor.\n", + this->id ())); return false; } @@ -2384,11 +2486,7 @@ TAO_Transport::allocate_partial_message_block (void) { // This value must be at least large enough to hold a GIOP message // header plus a GIOP fragment header - const size_t partial_message_size = - this->messaging_object ()->header_length (); - // + this->messaging_object ()->fragment_header_length (); - // deprecated, conflicts with not-single_read_opt. - + const size_t partial_message_size = 16; ACE_NEW (this->partial_message_, ACE_Message_Block (partial_message_size)); } @@ -2400,5 +2498,3 @@ TAO_Transport::allocate_partial_message_block (void) */ //@@ TAO_TRANSPORT_SPL_METHODS_ADD_HOOK - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index f1a9ba45ac0..ca542ee7eb0 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/Transport_Cache_Manager.h" +#include "Transport_Cache_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,13 +26,8 @@ #include "tao/Transport_Timer.h" #include "tao/Incoming_Message_Queue.h" -#include "tao/Incoming_Message_Stack.h" #include "ace/Time_Value.h" -struct iovec; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Target_Specification; class TAO_Operation_Details; @@ -46,6 +41,7 @@ class TAO_Queued_Message; class TAO_Synch_Queued_Message; class TAO_Resume_Handle; class TAO_Stub; +struct iovec; namespace TAO { @@ -183,20 +179,18 @@ namespace TAO * * We solve the problems as follows * - * (a) First do a read with the buffer on stack. Query the underlying - * messaging object whether the message has any incomplete - * portion. If so, data will be copied into new buffer being able - * to hold full message and is queued; succeeding events will read - * data from socket and write directly into this buffer. - * Otherwise, if if the message in local buffer is complete, we free - * the handle and then send the message to the higher layers of the - * ORB for processing. + * (a) First do a read with the buffer on stack. Query the underlying + * messaging object whether the message has any incomplete + * portion. If so, we just grow the buffer for the missing size + * and read the rest of the message. We free the handle and then + * send the message to the higher layers of the ORB for + * processing. * - * (b) If buffer with incomplete message has been enqueued, while trying - * to do the above, the reactor will call us back when the handle - * becomes read ready. The read-operation will copy data directly - * into the enqueued buffer. If the message has bee read completely - * the message is sent to the higher layers of the ORB for processing. + * (b) If we block (ie. if we receive a EWOULDBLOCK) while trying to + * do the above (ie. trying to read after growing the buffer + * size) we put the message in a queue and return back to the + * reactor. The reactor would call us back when the handle + * becomes read ready. * * (c) If we get multiple messages (possible if the client connected * to the server sends oneways or AMI requests), we parse and @@ -370,7 +364,9 @@ public: * transformations of the data, such as SSLIOP or protocols that * compress the stream. * - * @param iov contains the data that must be sent. + * @param mblk contains the data that must be sent. For each + * message block in the cont() chain all the data between rd_ptr() + * and wr_ptr() should be delivered to the remote peer. * * @param timeout is the maximum time that the application is * willing to wait for the data to be sent, useful in platforms that @@ -393,8 +389,7 @@ public: * down). In that case, it returns -1 and sets errno to * <code>ENOENT</code>. */ - virtual ssize_t send (iovec *iov, - int iovcnt, + virtual ssize_t send (iovec *iov, int iovcnt, size_t &bytes_transferred, const ACE_Time_Value *timeout = 0) = 0; @@ -463,7 +458,8 @@ public: * valid certificates. There are no pre_connect_hooks () since the * transport doesn't exist before a connection establishment. :-) * - * @note The methods are not made const with a reason. + * + * @@NOTE: The methods are not made const with a reason. */ virtual bool post_connect_hook (void); @@ -647,11 +643,60 @@ public: protected: + /// Called by the handle_input_i(). This method is used to parse + /// message read by the handle_input_i() call. It also decides + /// whether the message needs consolidation before processing. + int parse_consolidate_messages (ACE_Message_Block &bl, + TAO_Resume_Handle &rh, + ACE_Time_Value *time = 0); + + + /// Method does parsing of the message if we have a fresh message in + /// the @a message_block or just returns if we have read part of the + /// previously stored message. + int parse_incoming_messages (ACE_Message_Block &message_block); + + /// Return if we have any missing data in the queue of messages + /// or determine if we have more information left out in the + /// presently read message to make it complete. + ssize_t missing_data (ACE_Message_Block &message_block); + + /// Consolidate the currently read message or consolidate the last + /// message in the queue. The consolidation of the last message in + /// the queue is done by calling consolidate_message_queue (). + virtual int consolidate_message (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time); + + /// @@Bala: Docu??? + int consolidate_fragments (TAO_Queued_Data *qd, + TAO_Resume_Handle &rh); + + /// First consolidate the message queue. If the message is still not + /// complete, try to read from the handle again to make it + /// complete. If these dont help put the message back in the queue + /// and try to check the queue if we have message to process. (the + /// thread needs to do some work anyway :-)) + int consolidate_message_queue (ACE_Message_Block &incoming, + ssize_t missing_data, + TAO_Resume_Handle &rh, + ACE_Time_Value *max_wait_time); + + /// Called by parse_consolidate_message () if we have more messages + /// in one read. Queue up the messages and try to process one of + /// them, atleast at the head of them. + int consolidate_extra_messages (ACE_Message_Block &incoming, + TAO_Resume_Handle &rh); + /// Process the message by sending it to the higher layers of the /// ORB. int process_parsed_messages (TAO_Queued_Data *qd, TAO_Resume_Handle &rh); + /// Make a queued data from the @a incoming message block + TAO_Queued_Data *make_queued_data (ACE_Message_Block &incoming); + /// Implement send_message_shared() assuming the handler_lock_ is /// held. int send_message_shared_i (TAO_Stub *stub, @@ -839,37 +884,10 @@ private: /// Print out error messages if the event handler is not valid void report_invalid_event_handler (const char *caller); - /// Is invoked by handle_input operation. It consolidate message on - /// top of incoming_message_stack. The amount of missing data is - /// known and recv operation copies data directly into message buffer, - /// as much as a single recv-invocation provides. - int handle_input_missing_data (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time, - TAO_Queued_Data *q_data); - - /// Is invoked by handle_input operation. It parses new messages from input stream - /// or consolidates messages whose header has been partially read, the message - /// size being unknown so far. It parses as much data as a single recv-invocation provides. - int handle_input_parse_data (TAO_Resume_Handle &rh, - ACE_Time_Value *max_wait_time); - - /// Is invoked by handle_input_parse_data. Parses all messages remaining - /// in @a message_block. - int handle_input_parse_extra_messages (ACE_Message_Block &message_block); - - /// @return -1 error, otherwise 0 - int consolidate_enqueue_message (TAO_Queued_Data *qd); - - /// @return -1 error, otherwise 0 - int consolidate_process_message (TAO_Queued_Data *qd, TAO_Resume_Handle &rh); - /* * Process the message that is in the head of the incoming queue. * If there are more messages in the queue, this method calls * this->notify_reactor () to wake up a thread - * @retval -1 on error - * @retval 0 if successfully processing enqueued messages - * @retval 1 if no message present in queue */ int process_queue_head (TAO_Resume_Handle &rh); @@ -882,13 +900,21 @@ private: /// Assume the lock is held void send_connection_closed_notifications_i (void); + /// Process a non-version specific fragment by either consolidating + /// the fragments or enqueuing the queueable message + void process_fragment (TAO_Queued_Data* fragment_message, + TAO_Queued_Data* queueable_message, + CORBA::Octet major, + CORBA::Octet minor, + TAO_Resume_Handle &rh); + /// Allocate a partial message block and store it in our /// partial_message_ data member. void allocate_partial_message_block (void); - // Disallow copying and assignment. - TAO_Transport (const TAO_Transport&); - void operator= (const TAO_Transport&); + /// Prohibited + ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&)) /* * Specialization hook to add concrete private methods from @@ -905,7 +931,7 @@ protected: /// Global orbcore resource. TAO_ORB_Core *orb_core_; - /// Our entry in the cache. We don't own this. It is here for our + /// Our entry in the cache. We dont own this. It is here for our /// convenience. We cannot just change things around. TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry_; @@ -943,14 +969,10 @@ protected: TAO_Queued_Message *head_; TAO_Queued_Message *tail_; - /// Queue of the consolidated, incoming messages.. + /// Queue of the incoming messages.. TAO_Incoming_Message_Queue incoming_message_queue_; - /// Stack of incoming fragments, consolidated messages - /// are going to be enqueued in "incoming_message_queue_" - TAO::Incoming_Message_Stack incoming_message_stack_; - - /// The queue will start draining no later than <queeing_deadline_> + /// The queue will start draining no later than <queing_deadline_> /// *if* the deadline is ACE_Time_Value current_deadline_; @@ -1042,10 +1064,8 @@ private: //@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Transport.inl" +# include "Transport.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index ef9faafb1ac..6c0d7d0093a 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -1,9 +1,6 @@ // -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_Transport::tag (void) const { @@ -189,4 +186,4 @@ TAO_Transport::sent_byte_count (void) const return this->sent_byte_count_; } -TAO_END_VERSIONED_NAMESPACE_DECL + diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp index 5fd09d0c402..a4825e9286c 100644 --- a/TAO/tao/Transport_Acceptor.cpp +++ b/TAO/tao/Transport_Acceptor.cpp @@ -1,18 +1,17 @@ +// -*- C++ -*- +// // $Id$ -#include "tao/Transport_Acceptor.h" +#include "Transport_Acceptor.h" #if !defined (__ACE_INLINE__) -# include "tao/Transport_Acceptor.inl" +# include "Transport_Acceptor.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, Acceptor, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag) : tag_ (tag) { @@ -25,5 +24,3 @@ TAO_Acceptor::~TAO_Acceptor (void) } //@@ TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h index f49ac1b4190..ea5df9baf97 100644 --- a/TAO/tao/Transport_Acceptor.h +++ b/TAO/tao/Transport_Acceptor.h @@ -27,13 +27,8 @@ #include "tao/Basic_Types.h" // Forward declarations. -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Addr; class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_MProfile; class TAO_Endpoint; @@ -144,7 +139,7 @@ public: private: /// IOP protocol tag. - CORBA::ULong const tag_; + CORBA::ULong tag_; /* * Hook to add data members from concrete acceptor implementations onto @@ -155,10 +150,8 @@ private: //@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Transport_Acceptor.inl" +# include "Transport_Acceptor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl index 7767ec6b43e..7d91a8330a3 100644 --- a/TAO/tao/Transport_Acceptor.inl +++ b/TAO/tao/Transport_Acceptor.inl @@ -1,13 +1,7 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::ULong TAO_Acceptor::tag (void) const { return this->tag_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index 67f196cbc05..9a44900fe59 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -1,12 +1,12 @@ //$Id$ -#include "tao/Transport_Cache_Manager.h" -#include "tao/Transport.h" -#include "tao/debug.h" -#include "tao/ORB_Core.h" -#include "tao/Connection_Purging_Strategy.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/Condition.h" -#include "tao/Wait_Strategy.h" +#include "Transport_Cache_Manager.h" +#include "Transport.h" +#include "debug.h" +#include "ORB_Core.h" +#include "Connection_Purging_Strategy.h" +#include "Client_Strategy_Factory.h" +#include "Condition.h" +#include "Wait_Strategy.h" #include "ace/ACE.h" #include "ace/Reactor.h" @@ -15,13 +15,11 @@ #endif /* __ACE_INLINE__ */ + ACE_RCSID (tao, Transport_Cache_Manager, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Transport_Cache_Manager::Transport_Cache_Manager (TAO_ORB_Core &orb_core) @@ -719,5 +717,3 @@ namespace TAO } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h index 37a3643fe3e..749cbe9492d 100644 --- a/TAO/tao/Transport_Cache_Manager.h +++ b/TAO/tao/Transport_Cache_Manager.h @@ -25,20 +25,15 @@ #include "tao/Cache_Entries.h" #include "tao/orbconf.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Handle_Set; -template <class T> class ACE_Unbounded_Set; -template <class T> class ACE_Unbounded_Set_Iterator; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Connection_Handler; class TAO_ORB_Core; class TAO_Resource_Factory; class TAO_Connection_Purging_Strategy; template <class ACE_COND_MUTEX> class TAO_Condition; +template <class T> class ACE_Unbounded_Set; +template <class T> class ACE_Unbounded_Set_Iterator; namespace TAO { @@ -264,9 +259,6 @@ namespace TAO }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Transport_Cache_Manager.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Transport_Cache_Manager.inl b/TAO/tao/Transport_Cache_Manager.inl index ed53a1a4f90..08c81369837 100644 --- a/TAO/tao/Transport_Cache_Manager.inl +++ b/TAO/tao/Transport_Cache_Manager.inl @@ -1,10 +1,5 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ //$Id$ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { ACE_INLINE int @@ -153,5 +148,3 @@ namespace TAO return this->cache_map_; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 844e29defa6..f81e882b419 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -1,37 +1,34 @@ -#include "tao/Transport_Connector.h" -#include "tao/Transport.h" -#include "tao/ORB_Core.h" -#include "tao/MProfile.h" -#include "tao/Profile.h" -#include "tao/Environment.h" -#include "tao/Thread_Lane_Resources.h" -#include "tao/debug.h" -#include "tao/Connect_Strategy.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/Connection_Handler.h" -#include "tao/Profile_Transport_Resolver.h" -#include "tao/Wait_Strategy.h" -#include "tao/SystemException.h" +#include "Transport_Connector.h" +#include "Transport.h" +#include "ORB_Core.h" +#include "MProfile.h" +#include "Profile.h" +#include "Environment.h" +#include "Thread_Lane_Resources.h" +#include "debug.h" +#include "Connect_Strategy.h" +#include "Client_Strategy_Factory.h" +#include "Connection_Handler.h" +#include "Profile_Transport_Resolver.h" +#include "Wait_Strategy.h" +#include "SystemException.h" #include "ace/OS_NS_string.h" //@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK #if !defined (__ACE_INLINE__) -# include "tao/Transport_Connector.inl" +# include "Transport_Connector.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, Connector, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Connector TAO_Connector::TAO_Connector (CORBA::ULong tag) : active_connect_strategy_ (0), - tag_ (tag), + tag_(tag), orb_core_ (0) { } @@ -105,7 +102,7 @@ TAO_Connector::make_mprofile (const char *string, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ") ACE_TEXT ("<%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (string))); + ACE_TEXT_TO_TCHAR_IN (string))); } ACE_CString ior; @@ -176,8 +173,8 @@ TAO_Connector::make_mprofile (const char *string, // `shu/arf' // `1.1@chicken/arf' - ssize_t begin = 0; - ssize_t end = ior_index - 1; + int begin = 0; + int end = ior_index - 1; // Initialize the end of the endpoint index for (CORBA::ULong j = 0; j < profile_count; ++j) @@ -193,7 +190,7 @@ TAO_Connector::make_mprofile (const char *string, end = objkey_index; // Handle last endpoint differently } - if (end < static_cast<ssize_t> (ior.length ()) && end != ior.npos) + if (end < static_cast<int> (ior.length ()) && end != ior.npos) { ACE_CString endpoint = ior.substring (begin, end - begin); @@ -530,5 +527,3 @@ TAO_Connector::check_connection_closure ( } //@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index e29d0b251b3..720aaab0e76 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -23,15 +23,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" +#include "TAO_Export.h" +#include "Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport_Descriptor_Interface; class TAO_InputCDR; class TAO_Endpoint; @@ -192,7 +187,7 @@ protected: private: /// IOP protocol tag. - CORBA::ULong const tag_; + CORBA::ULong tag_; /// Pointer to our ORB core TAO_ORB_Core *orb_core_; @@ -202,10 +197,8 @@ private: //@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Transport_Connector.inl" +# include "Transport_Connector.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl index 64683bc6a14..c25d96057fb 100644 --- a/TAO/tao/Transport_Connector.inl +++ b/TAO/tao/Transport_Connector.inl @@ -1,9 +1,5 @@ // -*- C++ -*- -// // $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_ORB_Core * TAO_Connector::orb_core (void) { @@ -21,5 +17,3 @@ TAO_Connector::tag (void) const { return this->tag_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp index a58af5ac064..6882cc3b8a6 100644 --- a/TAO/tao/Transport_Descriptor_Interface.cpp +++ b/TAO/tao/Transport_Descriptor_Interface.cpp @@ -10,15 +10,11 @@ ACE_RCSID (tao, Transport_Descriptor_Interface, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void) +TAO_Transport_Descriptor_Interface:: + ~TAO_Transport_Descriptor_Interface (void) { if (this->endpoint_from_heap_) { delete this->endpoint_; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h index 0934238d072..7eba381787f 100644 --- a/TAO/tao/Transport_Descriptor_Interface.h +++ b/TAO/tao/Transport_Descriptor_Interface.h @@ -23,8 +23,6 @@ #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Endpoint; /** @@ -86,8 +84,6 @@ protected: CORBA::Boolean endpoint_from_heap_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/Transport_Descriptor_Interface.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl index 6d1bbcb6d56..97bcf5291f4 100644 --- a/TAO/tao/Transport_Descriptor_Interface.inl +++ b/TAO/tao/Transport_Descriptor_Interface.inl @@ -1,24 +1,21 @@ -// -*- C++ -*- -// //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE -TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface ( - TAO_Endpoint *endpoint, - CORBA::Boolean flag) - : endpoint_ (endpoint), - bidir_flag_ (false), - endpoint_from_heap_ (flag) +TAO_Transport_Descriptor_Interface:: + TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint, + CORBA::Boolean flag) + : endpoint_ (endpoint), + bidir_flag_ (0), + endpoint_from_heap_ (flag) { } ACE_INLINE -TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void) - : endpoint_ (0), - bidir_flag_ (false), - endpoint_from_heap_ (false) +TAO_Transport_Descriptor_Interface:: + TAO_Transport_Descriptor_Interface (void) + : endpoint_ (0), + bidir_flag_ (0), + endpoint_from_heap_ (0) { } @@ -35,5 +32,3 @@ TAO_Transport_Descriptor_Interface::set_bidir_flag (CORBA::Boolean flag) { this->bidir_flag_ = flag; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp index beb04aba840..e11ed482657 100644 --- a/TAO/tao/Transport_Mux_Strategy.cpp +++ b/TAO/tao/Transport_Mux_Strategy.cpp @@ -6,9 +6,6 @@ ACE_RCSID (tao, Transport_Mux_Strategy, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy ( TAO_Transport *transport) : transport_ (transport) @@ -19,5 +16,3 @@ TAO_Transport_Mux_Strategy::TAO_Transport_Mux_Strategy ( TAO_Transport_Mux_Strategy::~TAO_Transport_Mux_Strategy (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 1dcc0f2ba11..9e019e5311c 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -23,15 +23,10 @@ #include "tao/Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Reply_Dispatcher; class TAO_Transport; class TAO_Pluggable_Reply_Params; +class ACE_Lock; /** * @class TAO_Transport_Mux_Strategy @@ -98,8 +93,6 @@ protected: ACE_Lock *lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TRANSPORT_MUX_STRATEGY_H */ diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp index 4de33f760dd..17235308f7a 100644 --- a/TAO/tao/Transport_Queueing_Strategies.cpp +++ b/TAO/tao/Transport_Queueing_Strategies.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/Transport_Queueing_Strategies.h" -#include "tao/Buffering_Constraint_Policy.h" -#include "tao/Stub.h" -#include "tao/debug.h" +#include "Transport_Queueing_Strategies.h" +#include "Buffering_Constraint_Policy.h" +#include "Stub.h" +#include "debug.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_time.h" @@ -12,9 +12,6 @@ ACE_RCSID (tao, Transport_Queueing_Strategies, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { Transport_Queueing_Strategy::~Transport_Queueing_Strategy (void) @@ -227,5 +224,3 @@ namespace TAO #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h index 56ba66149ee..ad572969725 100644 --- a/TAO/tao/Transport_Queueing_Strategies.h +++ b/TAO/tao/Transport_Queueing_Strategies.h @@ -27,13 +27,8 @@ #include "tao/orbconf.h" #include "tao/Basic_Types.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Stub; +class ACE_Time_Value; namespace TAO { @@ -178,8 +173,6 @@ namespace TAO } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TRANSPORT_QUEUEING_STRATEGY_H */ diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp index 6a704fbd72f..0d592fb8459 100644 --- a/TAO/tao/Transport_Timer.cpp +++ b/TAO/tao/Transport_Timer.cpp @@ -1,14 +1,13 @@ +// -*- C++ -*- // $Id$ -#include "tao/Transport_Timer.h" -#include "tao/Transport.h" +#include "Transport_Timer.h" +#include "Transport.h" ACE_RCSID (tao, Transport_Timer, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport) : transport_ (transport) { @@ -20,5 +19,3 @@ TAO_Transport_Timer::handle_timeout (const ACE_Time_Value ¤t_time, { return this->transport_->handle_timeout (current_time, act); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport_Timer.h b/TAO/tao/Transport_Timer.h index 50593fff2e4..b951456e0cb 100644 --- a/TAO/tao/Transport_Timer.h +++ b/TAO/tao/Transport_Timer.h @@ -20,10 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "TAO_Export.h" class TAO_Transport; @@ -54,8 +51,6 @@ private: TAO_Transport *transport_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TRANSPORT_TIMER_H */ diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp index 3a8f77cdb6d..e74548609e5 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/TypeCodeFactory/Recursive_TypeCode.h" +#include "Recursive_TypeCode.h" #ifndef __ACE_INLINE__ -# include "tao/TypeCodeFactory/Recursive_TypeCode.inl" +# include "Recursive_TypeCode.inl" #endif /* __ACE_INLINE__ */ #include "tao/SystemException.h" @@ -14,7 +14,6 @@ ACE_RCSID (TypeCodeFactory, Recursive_TypeCode, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal ( @@ -277,5 +276,3 @@ TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i ( return this->the_typecode_->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h index 0f92a9bdc8b..1636cb666ad 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h @@ -20,8 +20,6 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/True_RefCount_Policy.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace TypeCodeFactory @@ -120,7 +118,6 @@ namespace TAO } // End namespace TypeCodeFactory } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #ifdef __ACE_INLINE__ # include "tao/TypeCodeFactory/Recursive_TypeCode.inl" diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl index 6fa35755fad..a053fbddf5d 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl @@ -2,7 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCodeFactory::Recursive_TypeCode::Recursive_TypeCode (char const * id) @@ -27,5 +26,3 @@ TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc) mutable_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp index 5bcf47ab3d8..555d87f9b75 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp @@ -30,13 +30,11 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/TypeCodeFactory/TypeCodeFactoryC.h" +#include "TypeCodeFactoryC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -129,5 +127,3 @@ operator>>= ( _tao_elem ); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index aa97c491b4c..abf38c85ea0 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/TypeCodeFactory/TypeCodeFactoryC.h" +#include "TypeCodeFactoryC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -40,8 +40,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -188,5 +186,3 @@ CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &) { return false; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index 8548e8e4cee..a620aa9caec 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TypeCodeFactory/typecodefactory_export.h" +#include "typecodefactory_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" @@ -68,8 +68,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -456,8 +454,6 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index 29fb9ac421f..3c041038f87 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -1,8 +1,8 @@ // $Id$ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" -#include "tao/TypeCodeFactory/TypeCodeFactory_i.h" +#include "TypeCodeFactory_Adapter_Impl.h" +#include "TypeCodeFactory_i.h" #include "tao/ORB_Core.h" @@ -12,8 +12,6 @@ ACE_RCSID (TypeCodeFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void) { } @@ -409,8 +407,6 @@ TAO_TypeCodeFactory_Adapter_Impl::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Adapter_Impl); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( TAO_TypeCodeFactory_Adapter_Impl, ACE_TEXT ("Concrete_TypeCodeFactory_Adapter"), diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h index 5f20f2af5b8..b0d09a41fb4 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,7 +15,7 @@ #define TAO_TYPECODEFACTORY_ADAPTER_IMPL_H #include /**/ "ace/pre.h" -#include "tao/TypeCodeFactory/typecodefactory_export.h" +#include "typecodefactory_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,8 +25,6 @@ #include "ace/Service_Config.h" #include "tao/default_environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_TypeCodeFactory_Adapter_Impl * @@ -250,15 +248,12 @@ public: static int Initializer (void); }; -static int -TAO_Requires_TypeCodeFactory_Initializer = - TAO_TypeCodeFactory_Adapter_Impl::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl) ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl) +static int +TAO_Requires_TypeCodeFactory_Initializer = + TAO_TypeCodeFactory_Adapter_Impl::Initializer (); #include /**/ "ace/post.h" #endif /* TAO_TYPECODEFACTORY_ADAPTER_IMPL_H */ diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index 36d20aeda87..b6fcd5eb57e 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ // $Id$ // ================================================================= @@ -15,15 +14,10 @@ // // ================================================================= -#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" -#include "tao/TypeCodeFactory/TypeCodeFactory_i.h" -#include "ace/Log_Msg.h" - -ACE_RCSID(TypeCodeFactory, - TypeCodeFactory_Loader, - "$Id$") +#include "TypeCodeFactory_Loader.h" +#include "TypeCodeFactory_i.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(TypeCodeFactory, TypeCodeFactory_Loader, "$Id$") TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void) { @@ -49,9 +43,6 @@ TAO_TypeCodeFactory_Loader::Initializer (void) return ACE_Service_Config::process_directive (ace_svc_desc_TAO_TypeCodeFactory_Loader); } -TAO_END_VERSIONED_NAMESPACE_DECL - - ACE_STATIC_SVC_DEFINE ( TAO_TypeCodeFactory_Loader, ACE_TEXT ("TypeCodeFactory_Loader"), diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h index 55a524c32b8..7cef34fafe8 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -14,7 +14,7 @@ #define TAO_TYPECODEFACTORY_LOADER_H #include /**/ "ace/pre.h" -#include "tao/TypeCodeFactory/typecodefactory_export.h" +#include "typecodefactory_export.h" #include "tao/Object_Loader.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +23,6 @@ #include "ace/Service_Config.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_TypeCodeFactory_Loader * @@ -49,16 +47,14 @@ public: static int Initializer (void); }; -static int -TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer (); - -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader) ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader) +static int +TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer (); + #define TAO_TYPECODEFACTORY_SAFE_INCLUDE -#include "tao/TypeCodeFactory/TypeCodeFactoryC.h" +#include "TypeCodeFactoryC.h" #undef TAO_TYPECODEFACTORY_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 5fb6c575d65..70f43e88f16 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "tao/TypeCodeFactory/Recursive_TypeCode.h" -#include "tao/TypeCodeFactory/TypeCodeFactory_i.h" +#include "Recursive_TypeCode.h" +#include "TypeCodeFactory_i.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" @@ -44,7 +44,6 @@ ACE_RCSID (TypeCodeFactory, TypeCodeFactory_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TCF { @@ -204,7 +203,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( { // Is this a duplicate case label? If so, we have to adjust // the 'length' we encode - a member gets encoded only once. - if (ACE_OS::strcmp (member_name, members[i - 1].name) == 0) + if (ACE_OS::strcmp (member_name, members[i - 1].name.in()) == 0) { CORBA::Boolean const equiv = member.type.in ()->equivalent (members[i - 1].type.in () @@ -333,8 +332,8 @@ TAO_TypeCodeFactory_i::create_union_tc ( { // Is this a duplicate case label? If so, skip it - a member // goes into the TypeCode only once. - if (ACE_OS::strcmp (member.name, - members[index - 1].name) == 0) + if (ACE_OS::strcmp (member.name.in(), + members[index - 1].name.in()) == 0) { continue; } @@ -2098,5 +2097,3 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, return tc; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index e463d0a4169..82a138ef191 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -14,7 +14,7 @@ #define TAO_TYPECODEFACTORY_I_H #include /**/ "ace/pre.h" -#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" +#include "TypeCodeFactory_Loader.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,7 +27,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -313,8 +312,6 @@ private: TAO_TypeCodeFactory_i &operator= (const TAO_TypeCodeFactory_i &src); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 03bdcd4f455..1e6e09eb1ff 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -24,11 +24,7 @@ #include "tao/Environment.h" #include "tao/Typecode_typesC.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> class ACE_Array_Base; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -275,8 +271,6 @@ public: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_TYPECODEFACTORY_ADAPTER_H */ diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp index bf8cc72d22a..bff34272a23 100644 --- a/TAO/tao/Typecode_typesC.cpp +++ b/TAO/tao/Typecode_typesC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/Typecode_typesC.h" +#include "Typecode_typesC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -67,5 +65,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::TCKind & _tao_enumerator) return _tao_success; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index 5c6dfd896d8..3d411afc9e6 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -58,8 +58,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -135,8 +133,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &); // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp index ede48dd16e4..a84a261ed85 100644 --- a/TAO/tao/UB_String_Argument_T.cpp +++ b/TAO/tao/UB_String_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_UB_STRING_ARGUMENT_T_CPP -#define TAO_UB_STRING_ARGUMENT_T_CPP +#ifndef TAO_UB_STRING_ARGUMENT_T_C +#define TAO_UB_STRING_ARGUMENT_T_C #include "tao/UB_String_Argument_T.h" #include "tao/CDR.h" @@ -10,7 +10,9 @@ #include "tao/UB_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + UB_String_Argument_T, + "$Id$") template<typename S, typename Insert_Policy> CORBA::Boolean @@ -100,6 +102,4 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value ( #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_UB_STRING_ARGUMENT_T_CPP */ +#endif /* TAO_UB_STRING_ARGUMENT_T_C */ diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index 5b269e0a570..2b4b3d25214 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -6,8 +6,7 @@ * * $Id$ * - * @author Jeff Parsons - * @author Carlos O'Ryan + * @authors Jeff Parsons and Carlos O'Ryan */ //============================================================================= @@ -22,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -149,8 +146,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/UB_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl index 370d3931dd9..b6f6a97db6e 100644 --- a/TAO/tao/UB_String_Argument_T.inl +++ b/TAO/tao/UB_String_Argument_T.inl @@ -1,13 +1,8 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> ACE_INLINE -TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T ( - const S * x) +TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (const S * x) : x_ (x) {} @@ -82,4 +77,3 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::retn (void) return this->x_._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h index 7e78f4749fa..a5268d9a6d2 100644 --- a/TAO/tao/UB_String_Arguments.h +++ b/TAO/tao/UB_String_Arguments.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -24,8 +24,6 @@ #include "tao/Arg_Traits_T.h" #include "tao/Any_Insert_Policy_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -53,7 +51,5 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UB_STRING_ARGUMENTS_H */ diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index 08f97a96aed..9b7bed6d5f2 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/ULongLongSeqC.h" +#include "ULongLongSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ void CORBA::ULongLongSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h index b77ce3b7af6..9210eeb57fe 100644 --- a/TAO/tao/ULongLongSeqC.h +++ b/TAO/tao/ULongLongSeqC.h @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -141,8 +139,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index a474b95567f..8fc6a35358a 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:288 -#include "tao/ULongSeqC.h" +#include "ULongSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h index f0b8beb805d..07d71927c92 100644 --- a/TAO/tao/ULongSeqC.h +++ b/TAO/tao/ULongSeqC.h @@ -60,8 +60,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -146,8 +144,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index aecdf19d4a5..178d8264a70 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "tao/UShortSeqC.h" +#include "UShortSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -39,8 +39,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -157,5 +155,3 @@ CORBA::Boolean operator>> ( } #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index 883ac0591c2..33567017495 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -64,8 +64,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -162,8 +160,6 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp index 638f895b362..0e382b85985 100644 --- a/TAO/tao/UserException.cpp +++ b/TAO/tao/UserException.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/UserException.h" +#include "UserException.h" #include "ace/SString.h" #include "ace/OS_NS_string.h" @@ -14,8 +14,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Virtual. Do not inline. CORBA::UserException::~UserException (void) { @@ -46,5 +44,3 @@ CORBA::UserException::_info (void) const user_exception_info += "'"; return user_exception_info; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h index f3f2dcec89f..79aa80e8766 100644 --- a/TAO/tao/UserException.h +++ b/TAO/tao/UserException.h @@ -26,8 +26,6 @@ #include "tao/Exception.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { /** @@ -80,8 +78,6 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/UserException.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl index 0e1d3295264..ba01c46e9fd 100644 --- a/TAO/tao/UserException.inl +++ b/TAO/tao/UserException.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::UserException::UserException (void) { @@ -34,5 +32,3 @@ CORBA::UserException::_downcast (CORBA::Exception const * exception) { return dynamic_cast<const CORBA::UserException *> (exception); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp index c9c484f549c..7e6aa6c57aa 100644 --- a/TAO/tao/Utils/Encodable.cpp +++ b/TAO/tao/Utils/Encodable.cpp @@ -1,11 +1,7 @@ // $Id$ -#include "tao/Utils/Encodable.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Encodable.h" TAO_Encodable::~TAO_Encodable (void) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h index 15afe05370f..8edb09c43ef 100644 --- a/TAO/tao/Utils/Encodable.h +++ b/TAO/tao/Utils/Encodable.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -24,9 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Utils/utils_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "utils_export.h" class TAO_OutputCDR; class TAO_InputCDR; @@ -55,8 +52,6 @@ public: virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_ENCODABLE_H_ */ diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp index 9e0fb6444f9..e5d3c35d594 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.cpp +++ b/TAO/tao/Utils/Implicit_Deactivator.cpp @@ -1,12 +1,9 @@ -#include "tao/Utils/Implicit_Deactivator.h" +#include "Implicit_Deactivator.h" #include "tao/PortableServer/Servant_Base.h" ACE_RCSID (Utils, Implicit_Deactivator, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO::Utils::Implicit_Deactivation_Functor::operator () ( PortableServer::ServantBase * servant) @@ -34,5 +31,3 @@ TAO::Utils::Implicit_Deactivation_Functor::operator () ( } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h index 68077296726..bb172759571 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.h +++ b/TAO/tao/Utils/Implicit_Deactivator.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file Implicit_Deactivator.h @@ -12,7 +11,7 @@ #ifndef TAO_UTILS_IMPLICIT_DEACTIVATOR_H #define TAO_UTILS_IMPLICIT_DEACTIVATOR_H #include /**/ "ace/pre.h" -#include "tao/Utils/utils_export.h" +#include "utils_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -22,7 +21,6 @@ #include "tao/PortableServer/PortableServer.h" #include "ace/Auto_Functor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -57,7 +55,5 @@ namespace TAO } // namespace Utils } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_UTILS_IMPLICIT_DEACTIVATOR_H*/ diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp index 8b8a74220ff..c3e198c9828 100644 --- a/TAO/tao/Utils/ORB_Destroyer.cpp +++ b/TAO/tao/Utils/ORB_Destroyer.cpp @@ -1,12 +1,9 @@ -#include "tao/Utils/ORB_Destroyer.h" +#include "ORB_Destroyer.h" ACE_RCSID (Utils, ORB_Destroyer, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - void TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) ACE_THROW_SPEC (()) @@ -23,5 +20,3 @@ TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb) } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h index 920ba64d3e5..6e414d99ead 100644 --- a/TAO/tao/Utils/ORB_Destroyer.h +++ b/TAO/tao/Utils/ORB_Destroyer.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file ORB_Destroyer.h @@ -12,7 +11,7 @@ #ifndef TAO_UTILS_ORB_DESTROYER_H #define TAO_UTILS_ORB_DESTROYER_H #include /**/ "ace/pre.h" -#include "tao/Utils/utils_export.h" +#include "utils_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,8 +20,6 @@ #include "tao/ORB.h" #include "ace/Auto_Functor.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Utils @@ -56,7 +53,5 @@ namespace TAO } // namespace Utils } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_UTILS_ORB_DESTROYER_H*/ diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index 7485985f09b..08618700659 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -10,7 +10,7 @@ // // ============================================================================ -#include "tao/Utils/ORB_Manager.h" +#include "ORB_Manager.h" #include "tao/PortableServer/POAManagerC.h" #include "tao/PortableServer/IdAssignmentPolicyC.h" @@ -25,9 +25,6 @@ ACE_RCSID (PortableServer, ORB_Manager, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // constructor TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -367,5 +364,3 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void) } ACE_ENDTRY; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h index 520ca1af26e..a181e1c5d12 100644 --- a/TAO/tao/Utils/ORB_Manager.h +++ b/TAO/tao/Utils/ORB_Manager.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -14,7 +14,7 @@ #define TAO_ORB_MANAGER_H #include /**/ "ace/pre.h" -#include "tao/Utils/utils_export.h" +#include "utils_export.h" #include "tao/PortableServer/PortableServer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -23,8 +23,6 @@ #include "tao/ORB.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_ORB_Manager * @@ -251,7 +249,6 @@ protected: PortableServer::POAManager_var poa_manager_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #endif /* TAO_ORB_MANAGER_H */ diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp index 426d841991c..e2aaab09b5e 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.cpp +++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp @@ -1,16 +1,14 @@ -#include "tao/Utils/PolicyList_Destroyer.h" +#include "PolicyList_Destroyer.h" #include "tao/Environment.h" #if !defined (__ACE_INLINE__) -# include "tao/Utils/PolicyList_Destroyer.inl" +# include "PolicyList_Destroyer.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Utils, PolicyList_Deactivator, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() ACE_THROW_SPEC (()) { @@ -37,5 +35,3 @@ TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer() (*this)[i] = CORBA::Policy::_nil(); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h index ef2ef408805..7fdb607652d 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.h +++ b/TAO/tao/Utils/PolicyList_Destroyer.h @@ -11,7 +11,7 @@ #ifndef TAO_UTILS_POLICYLIST_DESTROYER_H #define TAO_UTILS_POLICYLIST_DESTROYER_H #include /**/ "ace/pre.h" -#include "tao/Utils/utils_export.h" +#include "utils_export.h" #include "tao/PolicyC.h" @@ -19,8 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Utils @@ -44,10 +42,8 @@ namespace TAO } // namespace Utils } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Utils/PolicyList_Destroyer.inl" +# include "PolicyList_Destroyer.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/PolicyList_Destroyer.inl b/TAO/tao/Utils/PolicyList_Destroyer.inl index a93e6334c87..1bc3d224276 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.inl +++ b/TAO/tao/Utils/PolicyList_Destroyer.inl @@ -1,13 +1,7 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO::Utils::PolicyList_Destroyer::PolicyList_Destroyer (CORBA::ULong length_hint) : CORBA::PolicyList(length_hint) { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index fad7ef86477..18299880b5a 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -1,15 +1,15 @@ -// $Id$ - #ifndef TAO_UTILS_RIR_NARROW_CPP #define TAO_UTILS_RIR_NARROW_CPP -#include "tao/Utils/RIR_Narrow.h" +#include "RIR_Narrow.h" #include "tao/SystemException.h" #if defined (ACE_HAS_EXCEPTIONS) #include <stdexcept> #endif -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (Utils, + RIR_Narror, + "$Id$") template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, @@ -55,6 +55,4 @@ TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object return narrowed_object._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /*TAO_UTILS_RIR_NARROW_CPP*/ diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index fdeba60f91e..24a7ad5c089 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -1,5 +1,4 @@ // -*- C++ -*- - //============================================================================= /** * @file RIR_Narrow.h @@ -24,8 +23,6 @@ #include "tao/PI/PI.h" #include "tao/ORB.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Utils @@ -63,11 +60,8 @@ namespace TAO } // namespace Utils } // namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "tao/Utils/RIR_Narrow.cpp" +# include "RIR_Narrow.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/Servant_Var.cpp b/TAO/tao/Utils/Servant_Var.cpp index 1506ae356bc..a6f63b15d51 100644 --- a/TAO/tao/Utils/Servant_Var.cpp +++ b/TAO/tao/Utils/Servant_Var.cpp @@ -1,10 +1,10 @@ #ifndef TAO_UTILS_SERVANT_VAR_CPP #define TAO_UTILS_SERVANT_VAR_CPP -#include "tao/Utils/Servant_Var.h" +#include "Servant_Var.h" #if !defined (__ACE_INLINE__) -# include "tao/Utils/Servant_Var.inl" +# include "Servant_Var.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Utils, diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h index 9fc8f6cb920..8655ddb9a07 100644 --- a/TAO/tao/Utils/Servant_Var.h +++ b/TAO/tao/Utils/Servant_Var.h @@ -21,8 +21,6 @@ #include "ace/CORBA_macros.h" #include "tao/Environment.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { namespace Utils @@ -140,7 +138,6 @@ namespace TAO T * ptr_; }; -#ifndef ACE_LACKS_MEMBER_TEMPLATES /// Compare two Servant_Vars for equivalence. template <class X, class Y> bool operator==(Servant_Var<X> const & x, @@ -150,19 +147,16 @@ namespace TAO template <class X, class Y> bool operator!=(Servant_Var<X> const & x, Servant_Var<Y> const & y); -#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */ } // namespace Utils } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Utils/Servant_Var.inl" +# include "Servant_Var.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Utils/Servant_Var.cpp" +#include "Servant_Var.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index be906d9982f..8716ed46cdf 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -5,8 +5,6 @@ #include "tao/Exception.h" #include "ace/Swap.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <class T> ACE_INLINE T * TAO::Utils::Servant_Var<T>::_duplicate (T * p) @@ -64,16 +62,8 @@ template <class T> ACE_INLINE typename TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::operator= (T * p) { - if (this->ptr_ != p) - { - // This constructor doesn't increase the reference count so we - // we must check for self-assignment. Otherwise the reference - // count would be prematurely decremented upon exiting this - // scope. - TAO::Utils::Servant_Var<T> tmp (p); - this->swap (tmp); - } - + TAO::Utils::Servant_Var<T> tmp (p); + this->swap (tmp); return *this; } @@ -127,16 +117,8 @@ template <class T> template <class Y> ACE_INLINE typename TAO::Utils::Servant_Var<T> & TAO::Utils::Servant_Var<T>::operator= (Y * p) { - if (this->ptr_ != p) - { - // This constructor doesn't increase the reference count so we - // we must check for self-assignment. Otherwise the reference - // count would be prematurely decremented upon exiting this - // scope. - TAO::Utils::Servant_Var<T> tmp (p); - this->swap (tmp); - } - + TAO::Utils::Servant_Var<T> tmp (p); + this->swap (tmp); return *this; } #endif /* ACE_LACKS_MEMBER_TEMPLATES */ @@ -205,7 +187,6 @@ TAO::Utils::Servant_Var<T>::_retn (void) return rval; } -#ifndef ACE_LACKS_MEMBER_TEMPLATES template <class X, class Y> ACE_INLINE bool operator== (typename TAO::Utils::Servant_Var<X> const & x, @@ -221,6 +202,3 @@ operator!= (typename TAO::Utils::Servant_Var<X> const & x, { return x.in () != y.in (); } -#endif /* ! ACE_LACKS_MEMBER_TEMPLATES */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index da47ec1e8df..b1e44418fae 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -15,7 +15,13 @@ #ifndef TAO_UTILS_SERVER_MAIN_T_CPP #define TAO_UTILS_SERVER_MAIN_T_CPP -#include "tao/Utils/Server_Main.h" +#include "Server_Main.h" + + +ACE_RCSID (Utils, + Server_Main, + "$Id$") + #include "tao/ORB.h" @@ -24,8 +30,6 @@ #include "ace/Time_Value.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template <typename SERVANT> TAO::Utils::Server_Main<SERVANT>::Server_Main (const char * name) : name_(name) @@ -130,6 +134,4 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) return result; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif //TAO_UTILS_SERVER_MAIN_T_CPP diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h index c5d3ea2d825..99016b8052c 100644 --- a/TAO/tao/Utils/Server_Main.h +++ b/TAO/tao/Utils/Server_Main.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Server_Main.h @@ -50,18 +49,12 @@ #ifndef TAO_UTILS_SERVANTMAIN_H #define TAO_UTILS_SERVANTMAIN_H -#include /**/ "ace/pre.h" - -#include "ace/ACE.h" - +#include <ace/ACE.h> #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/orbconf.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +#include /**/ <ace/pre.h> namespace TAO { namespace Utils @@ -85,16 +78,14 @@ namespace TAO } // namespace UTILS } // namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "tao/Utils/Server_Main.cpp" +# include "Server_Main.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) # pragma implementation "Server_Main.cpp" #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#include /**/ "ace/post.h" +#include /**/ <ace/post.h> #endif //TAO_UTILS_SERVANTMAIN_H diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp index 4b132799b70..2b79deb80e0 100644 --- a/TAO/tao/Utils/Synch_Refcountable.cpp +++ b/TAO/tao/Utils/Synch_Refcountable.cpp @@ -1,7 +1,7 @@ -#include "tao/Utils/Synch_Refcountable.h" +#include "Synch_Refcountable.h" #if !defined (__ACE_INLINE__) -# include "tao/Utils/Synch_Refcountable.inl" +# include "Synch_Refcountable.inl" #endif /* __ACE_INLINE__ */ #include "ace/Log_Msg.h" @@ -10,9 +10,6 @@ ACE_RCSID (Utils, Synch_Refcountable, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount) : ACE_Refcountable (refcount) @@ -25,5 +22,3 @@ TAO_Synch_Refcountable::~TAO_Synch_Refcountable (void) ACE_ASSERT (this->refcount_ == 0); delete this->refcount_lock_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Synch_Refcountable.h b/TAO/tao/Utils/Synch_Refcountable.h index 3e77a70c4c3..0e18e9402eb 100644 --- a/TAO/tao/Utils/Synch_Refcountable.h +++ b/TAO/tao/Utils/Synch_Refcountable.h @@ -1,3 +1,4 @@ +// This may look like C, but it's really // -*- C++ -*- //============================================================================= @@ -22,14 +23,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Utils/utils_export.h" -#include "tao/Versioned_Namespace.h" +#include "utils_export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Synch_Refcountable @@ -52,10 +48,9 @@ protected: ACE_Lock *refcount_lock_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "tao/Utils/Synch_Refcountable.inl" +# include "Synch_Refcountable.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/Synch_Refcountable.inl b/TAO/tao/Utils/Synch_Refcountable.inl index 2139918ab50..2f4cc32778d 100644 --- a/TAO/tao/Utils/Synch_Refcountable.inl +++ b/TAO/tao/Utils/Synch_Refcountable.inl @@ -1,11 +1,8 @@ // -*- C++ -*- -// //$Id$ #include "ace/Guard_T.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int TAO_Synch_Refcountable::increment (void) { @@ -25,5 +22,3 @@ TAO_Synch_Refcountable::refcount (void) const { return ACE_Refcountable::refcount (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 2af762b5c00..e8f0d633759 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -1,8 +1,8 @@ // "$Id$" -#include "tao/Valuetype/AbstractBase.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/ValueFactory.h" +#include "AbstractBase.h" +#include "ValueBase.h" +#include "ValueFactory.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" @@ -10,15 +10,13 @@ #include "tao/CDR.h" #if !defined (__ACE_INLINE__) -# include "tao/Valuetype/AbstractBase.inl" +# include "AbstractBase.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (Valuetype, AbstractBase, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************ // These are in CORBA namespace @@ -427,5 +425,3 @@ CORBA::AbstractBase::equivalent_objref (void) return this->equivalent_obj_.in (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index cc00f37a969..a57c18bf05d 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/Valuetype/valuetype_export.h" +#include "valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -29,8 +29,6 @@ #include "tao/Pseudo_VarOut_T.h" #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Stub; class TAO_Abstract_ServantBase; @@ -167,10 +165,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Valuetype/AbstractBase.inl" +# include "AbstractBase.inl" #endif /* __ACE_INLINE__) */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl index a983ded4ec8..8bc52ccfce3 100644 --- a/TAO/tao/Valuetype/AbstractBase.inl +++ b/TAO/tao/Valuetype/AbstractBase.inl @@ -4,8 +4,6 @@ #include "ace/OS_NS_string.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::AbstractBase_ptr CORBA::AbstractBase::_nil (void) @@ -54,5 +52,3 @@ CORBA::AbstractBase::_is_local (void) const { return this->is_local_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp index a0212ddde94..fc1ea235c85 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp @@ -1,13 +1,11 @@ //$Id$ -#include "tao/Valuetype/AbstractBase_Invocation_Adapter.h" -#include "tao/Valuetype/AbstractBase.h" +#include "AbstractBase_Invocation_Adapter.h" +#include "AbstractBase.h" ACE_RCSID (Valuetype, AbstractBase_Invocation_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { AbstractBase_Invocation_Adapter::AbstractBase_Invocation_Adapter ( @@ -30,5 +28,3 @@ namespace TAO { } } // End namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h index afac495a54f..cb510f0ded5 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h @@ -13,7 +13,7 @@ #define TAO_ABSTRACTBASE_INVOCATION_ADAPTER_H #include /**/ "ace/pre.h" -#include "tao/Valuetype/valuetype_export.h" +#include "valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -21,8 +21,6 @@ #include "tao/Invocation_Adapter.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class AbstractBase; @@ -56,19 +54,14 @@ namespace TAO TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION); private: - // Don't allow default initializations - AbstractBase_Invocation_Adapter (void); - - // Disallow copying and assignment. - AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &); - AbstractBase_Invocation_Adapter & operator= ( - const AbstractBase_Invocation_Adapter &); + /// Dont allow default initializations + ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter (void)) + ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter & operator= ( + const AbstractBase_Invocation_Adapter &)) }; } // End namespace TAO -TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" - -#endif /* TAO_INVOCATION_ADAPTER_H */ +#endif /*TAO_INVOCATION_ADAPTER_H*/ diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp index 6b80c96b8b3..03308da8ae6 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.cpp +++ b/TAO/tao/Valuetype/AbstractBase_T.cpp @@ -1,14 +1,14 @@ // $Id$ +#ifndef TAO_ABSTRACT_BASE_T_C +#define TAO_ABSTRACT_BASE_T_C -#ifndef TAO_ABSTRACT_BASE_T_CPP -#define TAO_ABSTRACT_BASE_T_CPP - -#include "tao/Valuetype/AbstractBase_T.h" -#include "tao/Valuetype/AbstractBase.h" +#include "AbstractBase_T.h" +#include "AbstractBase.h" #include "tao/Stub.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +ACE_RCSID (Valuetype, + Abstractbase_T, + "$Id$") namespace TAO { template<typename T> T * @@ -102,7 +102,6 @@ namespace TAO collocated ? 1 : 0, obj->_servant ()), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (proxy); } else { @@ -114,6 +113,4 @@ namespace TAO } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_ABSTRACT_BASE_T_CPP */ +#endif /*TAO_ABSTRACT_BASE_T_C*/ diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h index dced03cf334..e7ec925f828 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.h +++ b/TAO/tao/Valuetype/AbstractBase_T.h @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class AbstractBase; @@ -51,10 +49,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Valuetype/AbstractBase_T.cpp" +#include "AbstractBase_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp index d69116d7704..a7c0b243a3b 100644 --- a/TAO/tao/Valuetype/Sequence_T.cpp +++ b/TAO/tao/Valuetype/Sequence_T.cpp @@ -1,21 +1,18 @@ // $Id$ -#ifndef TAO_VALUETYPE_SEQUENCE_T_CPP -#define TAO_VALUETYPE_SEQUENCE_T_CPP +#ifndef TAO_VALUETYPE_SEQUENCE_T_C +#define TAO_VALUETYPE_SEQUENCE_T_C -#include "tao/Valuetype/Sequence_T.h" +#include "Sequence_T.h" #if !defined (__ACE_INLINE__) -#include "tao/Valuetype/Sequence_T.inl" +#include "Sequence_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Valuetype, Sequence_T, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // class TAO_Valuetype_Manager // ************************************************************* @@ -499,6 +496,4 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_VALUETYPE_SEQUENCE_T_CPP */ +#endif /* TAO_VALUETYPE_SEQUENCE_T_C */ diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h index a893546ac7b..47e9a8274ef 100644 --- a/TAO/tao/Valuetype/Sequence_T.h +++ b/TAO/tao/Valuetype/Sequence_T.h @@ -16,14 +16,11 @@ #include /**/ "ace/pre.h" #include "tao/Sequence.h" -#include "tao/Valuetype/Value_VarOut_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename T, typename T_var> class TAO_Unbounded_Valuetype_Sequence; @@ -236,10 +233,8 @@ public: CORBA::ULong old_length); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Valuetype/Sequence_T.inl" +#include "Sequence_T.inl" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -248,7 +243,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Valuetype/Sequence_T.cpp" +#include "Sequence_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl index 503beaa3ad9..4eb80326837 100644 --- a/TAO/tao/Valuetype/Sequence_T.inl +++ b/TAO/tao/Valuetype/Sequence_T.inl @@ -6,8 +6,6 @@ #include "ace/Log_Msg.h" // for ACE_ASSERT -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // ************************************************************* // Inline operations for class TAO_Valuetype_Manager // ************************************************************* @@ -167,5 +165,3 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] ( T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp index 836192bc71a..bb93ab70c34 100644 --- a/TAO/tao/Valuetype/StringValueC.cpp +++ b/TAO/tao/Valuetype/StringValueC.cpp @@ -39,7 +39,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -#include "tao/Valuetype/StringValueC.h" +#include "StringValueC.h" #include "tao/Valuetype/ValueFactory.h" #include "tao/CDR.h" @@ -48,14 +48,12 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "tao/Valuetype/StringValueC.inl" +#include "StringValueC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // .\be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -80,16 +78,18 @@ namespace CORBA &_tao_tc_CORBA_StringValue; } -// TAO_IDL - Generated from -// c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63 -CORBA::StringValue::~StringValue (void) -{ -} +// TAO_IDL - Generated from +// c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63 CORBA::StringValue * CORBA::StringValue::_downcast (CORBA::ValueBase *v) { + if (v == 0) + { + return 0; + } + return dynamic_cast< ::CORBA::StringValue * > (v); } @@ -166,13 +166,14 @@ namespace CORBA // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63 -CORBA::WStringValue::~WStringValue (void) -{ -} - CORBA::WStringValue * CORBA::WStringValue::_downcast (CORBA::ValueBase *v) { + if (v == 0) + { + return 0; + } + return dynamic_cast< ::CORBA::WStringValue * > (v); } @@ -401,4 +402,3 @@ operator>> ( return CORBA::WStringValue::_tao_unmarshal (strm, _tao_valuebox); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/StringValueC.h b/TAO/tao/Valuetype/StringValueC.h index a0b9b69b3a8..19a0ffd5d62 100644 --- a/TAO/tao/Valuetype/StringValueC.h +++ b/TAO/tao/Valuetype/StringValueC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Valuetype/valuetype_export.h" +#include "valuetype_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/CDR.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" @@ -66,8 +66,6 @@ // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -307,10 +305,8 @@ TAO_Valuetype_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WStringVa // TAO_IDL - Generated from // .\be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Valuetype/StringValueC.inl" +#include "StringValueC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/Valuetype/StringValueC.inl b/TAO/tao/Valuetype/StringValueC.inl index adf7b097030..493e7c34af6 100644 --- a/TAO/tao/Valuetype/StringValueC.inl +++ b/TAO/tao/Valuetype/StringValueC.inl @@ -29,13 +29,15 @@ // TAO_IDL - Generated from // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:332 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::StringValue::StringValue (void) {} ACE_INLINE +CORBA::StringValue::~StringValue (void) +{} + +ACE_INLINE CORBA::StringValue::StringValue (CORBA::Char * val) { this->_pd_value = val; @@ -168,6 +170,10 @@ CORBA::WStringValue::WStringValue (void) {} ACE_INLINE +CORBA::WStringValue::~WStringValue (void) +{} + +ACE_INLINE CORBA::WStringValue::WStringValue (CORBA::WChar * val) { this->_pd_value = val; @@ -291,4 +297,3 @@ CORBA::WStringValue::_tao_unmarshal_v (TAO_InputCDR & ) } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index d7c325203d8..b7496f3e6cb 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -5,8 +5,8 @@ #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/ValueFactory.h" +#include "ValueBase.h" +#include "ValueFactory.h" #include "tao/CDR.h" #include "tao/ORB.h" @@ -15,7 +15,7 @@ #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -# include "tao/Valuetype/ValueBase.inl" +# include "ValueBase.inl" #endif /* ! __ACE_INLINE__ */ @@ -24,8 +24,6 @@ ACE_RCSID (Valuetype, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Static operations in namespace CORBA. void @@ -175,6 +173,7 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm, // new_object->_tao_unmarshal_v () // new_object->_tao_unmarshal_post () +// CORBA::ValueBase *base = 0; CORBA::ValueFactory_var factory; CORBA::Boolean retval = CORBA::ValueBase::_tao_unmarshal_pre (strm, @@ -193,14 +192,14 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm, if (new_object == 0) { - return false; // %! except.? + return 0; // %! except.? } retval = new_object->_tao_unmarshal_v (strm); if (retval == 0) { - return false; + return 0; } } @@ -240,7 +239,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag)) { valuetype = 0; - return true; + return 1; // ok, null reference unmarshaled } // 2. Now at this point it must be a <value-tag> (error else). @@ -285,11 +284,11 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, { CORBA::String_var repo_id_stream; - CORBA::ULong length = 0; + CORBA::ULong length; if (!strm.read_ulong (length)) { - return false; + return 0; } // 'length' may not be the repo id length - it could be the @@ -301,7 +300,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, // Read the negative byte offset if (!strm.read_long (offset) || offset >= 0) { - return false; + return 0; } // Cribbed from tc_demarshal_indirection in Typecode_CDR_Extraction.cpp @@ -311,7 +310,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, if (!indir_stream.good_bit ()) { - return false; + return 0; } indir_stream.read_string(repo_id_stream.inout ()); @@ -325,7 +324,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, 0); if (!strm.read_char_array (repo_id_stream.inout (), length)) { - return false; + return 0; } } else if (length == 0) @@ -337,7 +336,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, } else { - return false; + return 0; } } @@ -345,17 +344,11 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, orb_core->orb ()->lookup_value_factory (repo_id_stream.in ()); } - if (factory == 0) + if (factory == 0) // %! except.! { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%N:%l) ERROR: OBV factory is null for <%s>!\n"), - repo_id)); - } - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::OMGVMCID | 1, - CORBA::COMPLETED_MAYBE), - false); + ACE_DEBUG ((LM_ERROR, + ACE_TEXT ("(%N:%l) OBV factory is null !!!\n"))); + return false; } return retval; @@ -616,5 +609,3 @@ namespace TAO CORBA::remove_ref (p); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 55360627f05..745bfad5d53 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -41,8 +41,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Valuetype_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class ValueFactoryBase; @@ -233,6 +231,7 @@ namespace TAO { }; + template<> struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase> { @@ -245,10 +244,8 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Valuetype/ValueBase.inl" +# include "ValueBase.inl" #endif /* __ACE_INLINE__*/ #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl index 2d15b4a0d19..3b7d66658b5 100644 --- a/TAO/tao/Valuetype/ValueBase.inl +++ b/TAO/tao/Valuetype/ValueBase.inl @@ -4,8 +4,6 @@ // Detection of flags in the CDR Stream -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE CORBA::Boolean TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag) { @@ -71,5 +69,3 @@ TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag) { return (0x80000000L < tag); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index 473780b8790..37a8bf6cb79 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -1,12 +1,10 @@ -#include "tao/Valuetype/ValueFactory.h" +#include "ValueFactory.h" #include "ace/Guard_T.h" ACE_RCSID (Valuetype, ValueFactory, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Static operations in namespace CORBA. void @@ -83,5 +81,3 @@ namespace TAO CORBA::remove_ref (p); } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 0935bba77a4..678a86be8ac 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -15,15 +15,14 @@ #include /**/ "ace/pre.h" -#include "tao/Valuetype/valuetype_export.h" +#include "valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Valuetype/Value_VarOut_T.h" +#include "Value_VarOut_T.h" -#include "tao/Environment.h" #include "tao/Basic_Types.h" #include "tao/orbconf.h" #include "ace/Synch_Traits.h" @@ -31,8 +30,7 @@ #include "ace/Null_Mutex.h" #include "ace/CORBA_macros.h" #include "ace/Atomic_Op.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/Environment.h" namespace CORBA { @@ -51,6 +49,7 @@ namespace CORBA typedef ValueFactoryBase_var ValueFactory_var; + class TAO_Valuetype_Export ValueFactoryBase { public: @@ -94,10 +93,7 @@ namespace TAO static void release (CORBA::ValueFactoryBase *); }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - -// Use this macro for writing code that is independent from +// Use this macro for writing code that is independend from // the compiler support of covariant return types of pointers to // virtual inherited classes. // (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented) diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp index 674c1764bab..520c35c9288 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.cpp +++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp @@ -1,5 +1,5 @@ -#include "tao/Valuetype/ValueFactory_Map.h" -#include "tao/Valuetype/ValueFactory.h" +#include "ValueFactory_Map.h" +#include "ValueFactory.h" #include "tao/CORBA_String.h" #include "tao/TAO_Singleton.h" @@ -9,8 +9,6 @@ ACE_RCSID (Valuetype, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ValueFactory_Map::TAO_ValueFactory_Map (void) : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE) { @@ -117,8 +115,6 @@ TAO_ValueFactory_Map::instance (void) TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::instance (); } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h index 69966836589..715f41cb3b6 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.h +++ b/TAO/tao/Valuetype/ValueFactory_Map.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,10 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "valuetype_export.h" + #include "ace/Hash_Map_Manager_T.h" #include "ace/RW_Thread_Mutex.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { @@ -33,7 +34,7 @@ namespace CORBA typedef ValueFactoryBase *ValueFactory; } -class TAO_ValueFactory_Map +class TAO_Valuetype_Export TAO_ValueFactory_Map { public: @@ -89,8 +90,6 @@ private: */ typedef TAO_ValueFactory_Map TAO_VALUEFACTORY_MAP; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_VALUEFACTORY_MAP_H */ diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h index 352c981ac76..e54e1262de7 100644 --- a/TAO/tao/Valuetype/Value_CORBA_methods.h +++ b/TAO/tao/Valuetype/Value_CORBA_methods.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "tao/Valuetype/valuetype_export.h" +#include "valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,8 +30,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Valuetype_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class ValueBase; @@ -48,8 +46,6 @@ namespace CORBA } -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_VALUETYPE_CORBA_METHODS_H */ diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index 5e5049b099f..884ec566468 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -6,9 +6,6 @@ #include "tao/Valuetype/Value_VarOut_T.h" #include "tao/Valuetype/Value_CORBA_methods.h" -#include <algorithm> /* For std::swap<>() */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> void @@ -73,25 +70,23 @@ template <typename T> TAO_Value_Var_T<T> & TAO_Value_Var_T<T>::operator= (T * p) { - if (this->ptr_ != p) - { - // This constructor doesn't increase the reference count so we - // we must check for self-assignment. Otherwise the reference - // count would be prematurely decremented upon exiting this - // scope. - TAO_Value_Var_T<T> tmp (p); - std::swap (this->ptr_, tmp.ptr_); - } - + TAO::Value_Traits<T>::remove_ref (this->ptr_); + this->ptr_ = p; + TAO::Value_Traits<T>::add_ref (p); return *this; } template <typename T> TAO_Value_Var_T<T> & -TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T<T> & p) +TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p) { - TAO_Value_Var_T<T> tmp (p); - std::swap (this->ptr_, tmp.ptr_); + if (this != &p) + { + TAO::Value_Traits<T>::remove_ref (this->ptr_); + T * tmp = p.ptr (); + TAO::Value_Traits<T>::add_ref (tmp); + this->ptr_ = tmp; + } return *this; } @@ -215,6 +210,4 @@ TAO_Value_Out_T<T>::operator-> (void) return this->ptr_; } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_VALUE_VAROUT_T_CPP */ diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index fcc36464fdf..9813e89452c 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -23,8 +23,6 @@ #include "tao/varbase.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -121,10 +119,8 @@ private: T *& ptr_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Valuetype/Value_VarOut_T.cpp" +#include "Value_VarOut_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp index 19a2ec7f52f..279d75c5fc3 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "tao/Valuetype/AbstractBase.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/ValueFactory_Map.h" +#include "Valuetype_Adapter_Impl.h" +#include "AbstractBase.h" +#include "ValueBase.h" +#include "ValueFactory_Map.h" #include "tao/ORB_Core.h" @@ -12,7 +12,11 @@ ACE_RCSID (Valuetype, Valuetype_Adapter_Impl, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + +TAO_Valuetype_Adapter_Impl::TAO_Valuetype_Adapter_Impl (void) +{ + +} TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void) { @@ -92,8 +96,6 @@ TAO_Valuetype_Adapter_Impl::Initializer (void) ); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE ( TAO_Valuetype_Adapter_Impl, ACE_TEXT ("Concrete_Valuetype_Adapter"), diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h index e868321588c..a72771e6972 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -22,12 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Valuetype/valuetype_export.h" +#include "valuetype_export.h" #include "tao/Valuetype_Adapter.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Valuetype_Adapter_Impl * @@ -41,7 +39,7 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl : public TAO_Valuetype_Adapter { public: - + TAO_Valuetype_Adapter_Impl (void); virtual ~TAO_Valuetype_Adapter_Impl (void); virtual CORBA::Object_ptr abstractbase_to_object ( @@ -69,14 +67,12 @@ public: static int Initializer (void); }; +ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl) +ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl) + static int TAO_Requires_Valuetype_Initializer = TAO_Valuetype_Adapter_Impl::Initializer (); -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl) -ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl) - #include /**/ "ace/post.h" #endif /* TAO_VALUETYPE_ADAPTER_IMPL_H */ diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp index 42cf8207876..62594d81764 100644 --- a/TAO/tao/Valuetype_Adapter.cpp +++ b/TAO/tao/Valuetype_Adapter.cpp @@ -1,4 +1,4 @@ -// $Id$ +// @(#) $Id$ #include "tao/Valuetype_Adapter.h" @@ -6,10 +6,7 @@ ACE_RCSID (tao, Valuetype_Adapter, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void) { } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h index 3dff9f15929..a0386ccf7e6 100644 --- a/TAO/tao/Valuetype_Adapter.h +++ b/TAO/tao/Valuetype_Adapter.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -23,8 +23,6 @@ #include "tao/TAO_Export.h" #include "tao/Basic_Types.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Object; @@ -78,7 +76,5 @@ public: virtual CORBA::ValueFactory vf_map_find (const char *) = 0; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_VALUETYPE_ADAPTER_H */ diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp index 85a31f687e4..618198edfad 100644 --- a/TAO/tao/VarOut_T.cpp +++ b/TAO/tao/VarOut_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_VAROUT_T_CPP -#define TAO_VAROUT_T_CPP +#ifndef TAO_VAROUT_T_C +#define TAO_VAROUT_T_C #include "tao/VarOut_T.h" @@ -9,12 +9,22 @@ #include "tao/VarOut_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + VarOut_T, + "$Id$") template<typename T> TAO_Var_Base_T<T>::TAO_Var_Base_T (const TAO_Var_Base_T<T> & p) - : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0) { + if (p.ptr_) + { + ACE_NEW (this->ptr_, + T (*p.ptr_)); + } + else + { + this->ptr_ = 0; + } } // ************************************************************* @@ -23,13 +33,29 @@ template<typename T> TAO_Fixed_Var_T<T> & TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_Fixed_Var_T<T> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T * deep_copy = 0; + ACE_NEW_RETURN (deep_copy, + T (*p.ptr_), + *this); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } return *this; } @@ -39,13 +65,13 @@ template<typename T> TAO_Fixed_Var_T<T> & TAO_Fixed_Var_T<T>::operator= (const T & p) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_Fixed_Var_T<T> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, + T (p), + *this); + } return *this; } @@ -56,17 +82,31 @@ template<typename T> TAO_Var_Var_T<T> & TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p) { - // Strongly exception safe assignment using copy and non-throwing - // swap technique. - TAO_Var_Var_T<T> tmp (p); - - T * old_ptr = this->ptr_; - this->ptr_ = tmp.ptr_; - tmp.ptr_ = old_ptr; + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T *deep_copy = 0; + ACE_NEW_RETURN (deep_copy, + T (*p.ptr_), + *this); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } return *this; } -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_VAROUT_T_CPP */ +#endif /* TAO_VAROUT_T_C */ diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index 8602661bf48..709f8ba5ddb 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Var_Base_T @@ -153,8 +152,6 @@ private: void operator= (const T_var &); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/VarOut_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl index 5368b31ee2f..c1e7af81406 100644 --- a/TAO/tao/VarOut_T.inl +++ b/TAO/tao/VarOut_T.inl @@ -1,8 +1,4 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +//$Id$ template<typename T> ACE_INLINE @@ -263,4 +259,3 @@ TAO_Out_T<T,T_var>::operator-> (void) return this->ptr_; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index e1ad6bdd0ae..97d0b014e02 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_VAR_ARRAY_ARGUMENT_T_CPP -#define TAO_VAR_ARRAY_ARGUMENT_T_CPP +#ifndef TAO_VAR_ARRAY_ARGUMENT_T_C +#define TAO_VAR_ARRAY_ARGUMENT_T_C #include "tao/Var_Array_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/Var_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Var_Array_Argument_T, + "$Id$") template<typename S, typename S_slice, @@ -160,6 +162,4 @@ interceptor_value (CORBA::Any *any) const #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_VAR_ARRAY_ARGUMENT_T_CPP */ +#endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */ diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index 8b7ecbbf3c2..75cb050ecc2 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -188,8 +186,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Var_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index ce041fd3fb0..072b68039fc 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename S_slice, typename S_forany, @@ -131,5 +129,3 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::ret { return this->x_._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp index addbd7f9a2d..290c17b4909 100644 --- a/TAO/tao/Var_Size_Argument_T.cpp +++ b/TAO/tao/Var_Size_Argument_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef TAO_VAR_SIZE_ARGUMENT_T_CPP -#define TAO_VAR_SIZE_ARGUMENT_T_CPP +#ifndef TAO_VAR_SIZE_ARGUMENT_T_C +#define TAO_VAR_SIZE_ARGUMENT_T_C #include "tao/Var_Size_Argument_T.h" @@ -9,7 +9,9 @@ #include "tao/Var_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID (tao, + Var_Size_Argument_T, + "$Id$") template<typename S, typename Insert_Policy> @@ -115,6 +117,4 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::interceptor_value (CORBA::A #endif /* TAO_HAS_INTERCEPTORS */ -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_VAR_SIZE_ARGUMENT_T_CPP */ +#endif /* TAO_VAR_SIZE_ARGUMENT_T_C */ diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index 29941828854..fa1afc31536 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { /** @@ -149,8 +147,6 @@ namespace TAO }; } -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "tao/Var_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index e20150b11c7..b5c240dfa8a 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -1,9 +1,5 @@ -// -*- C++ -*- -// // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - template<typename S, typename Insert_Policy> ACE_INLINE @@ -100,4 +96,3 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::retn (void) return this->x_._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h index eb2e501ca95..6f49378a923 100644 --- a/TAO/tao/Version.h +++ b/TAO/tao/Version.h @@ -1,9 +1,7 @@ -// -*- C++ -*- // $Id$ - -// This is file was automatically generated by $ACE_ROOT/bin/make_release. +// This is an automatically generated file. #define TAO_MAJOR_VERSION 1 -#define TAO_MINOR_VERSION 5 -#define TAO_BETA_VERSION 0 -#define TAO_VERSION "1.5" +#define TAO_MINOR_VERSION 4 +#define TAO_BETA_VERSION 7 +#define TAO_VERSION "1.4.7" diff --git a/TAO/tao/Versioned_Namespace.h b/TAO/tao/Versioned_Namespace.h deleted file mode 100644 index 723bd5f10ef..00000000000 --- a/TAO/tao/Versioned_Namespace.h +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Versioned_Namespace.h - * - * $Id$ - * - * Versioned namespace support. - * - * Useful for preventing conflicts when using a third party library. - * - * @author Ossama Othman <ossama@dre.vanderbilt.edu> - */ -//============================================================================= - -#ifndef TAO_VERSIONED_NAMESPACE_H -#define TAO_VERSIONED_NAMESPACE_H - -#if !defined (TAO_ORBCONF_H) && !defined (ACE_CONFIG_MACROS_H) -# error This header is only meant to be included after "tao/orbconf.h". -#endif /* !TAO_ORBCONF_H */ - - -#if !defined (TAO_HAS_VERSIONED_NAMESPACE) \ - && defined (ACE_HAS_VERSIONED_NAMESPACE) \ - && ACE_HAS_VERSIONED_NAMESPACE == 1 -# define TAO_HAS_VERSIONED_NAMESPACE 1 -#endif /* !TAO_HAS_VERSIONED_NAMESPACE - && ACE_HAS_VERSIONED_NAMESPACE == 1*/ - -#if defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1 \ - && !(defined (_MSC_VER) && _MSC_VER <= 1200) - -# ifndef TAO_VERSIONED_NAMESPACE_NAME -# include "tao/Version.h" - -// Preprocessor symbols will not be expanded if they are -// concatenated. Force the preprocessor to expand them during the -// argument prescan by calling a macro that itself calls another that -// performs the actual concatenation. -# define TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) TAO_ ## MAJOR ## _ ## MINOR ## _ ## BETA -# define TAO_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,BETA) TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) -# define TAO_VERSIONED_NAMESPACE_NAME TAO_MAKE_VERSIONED_NAMESPACE_NAME(TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION) -# endif /* !TAO_VERSIONED_NAMESPACE_NAME */ - -# define TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_VERSIONED_NAMESPACE_NAME { -# define TAO_END_VERSIONED_NAMESPACE_DECL } \ - using namespace TAO_VERSIONED_NAMESPACE_NAME; - -#else - -# define TAO_VERSIONED_NAMESPACE_NAME - -# define TAO_BEGIN_VERSIONED_NAMESPACE_DECL -# define TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* TAO_HAS_VERSIONED_NAMESPACE */ - -#endif /* !TAO_VERSIONED_NAMESPACE_H */ diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index 6de54e5b49f..7ea50940e52 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/WCharSeqC.h" +#include "WCharSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -153,5 +151,3 @@ void CORBA::WCharSeq::_tao_any_destructor ( } #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h index 387004f7c3c..53b046ae900 100644 --- a/TAO/tao/WCharSeqC.h +++ b/TAO/tao/WCharSeqC.h @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -141,8 +139,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index 12ab5b23d1b..1021460a5e3 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -29,14 +29,12 @@ // be\be_codegen.cpp:277 -#include "tao/WStringSeqC.h" +#include "WStringSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -162,5 +160,3 @@ return false; } #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h index 04adbf29512..7a434302f87 100644 --- a/TAO/tao/WStringSeqC.h +++ b/TAO/tao/WStringSeqC.h @@ -55,8 +55,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -139,8 +137,6 @@ TAO_Export ::CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_codegen.cpp:1040 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp index 1a039a0b089..00075a77b84 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.cpp +++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp @@ -5,14 +5,12 @@ #include "tao/Transport.h" #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" -#include "tao/debug.h" +#include "debug.h" ACE_RCSID(tao, Wait_On_LF_No_Upcall, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Transport; namespace TAO { @@ -58,13 +56,10 @@ namespace TAO private: - Nested_Upcall_Guard (void) {} - - /// Disallow copying and assignment. - Nested_Upcall_Guard (const Nested_Upcall_Guard&); - Nested_Upcall_Guard & operator= (const Nested_Upcall_Guard&); + ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (void)) - private: + ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard ( + const Nested_Upcall_Guard&)) /// Pointer to the transport that we plan to use. TAO_Transport* t_; @@ -105,5 +100,3 @@ namespace TAO return true; } } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h index 8c839eba3bc..d2ea3b899f8 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.h +++ b/TAO/tao/Wait_On_LF_No_Upcall.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -13,7 +13,6 @@ #ifndef TAO_WAIT_ON_LF_NO_UPCALL_H #define TAO_WAIT_ON_LF_NO_UPCALL_H - #include /**/ "ace/pre.h" #include "tao/Wait_On_Leader_Follower.h" @@ -22,10 +21,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { + /** * @class TAO_Wait_On_LF_No_Upcall * @@ -56,9 +54,5 @@ namespace TAO virtual bool can_process_upcalls (void) const; }; } - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" - #endif /* TAO_WAIT_ON_LF_NO_UPCALL_H */ diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp index b8935c80af6..82ac698e591 100644 --- a/TAO/tao/Wait_On_Leader_Follower.cpp +++ b/TAO/tao/Wait_On_Leader_Follower.cpp @@ -11,8 +11,6 @@ ACE_RCSID (tao, Wait_On_Leader_Follower, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport) : TAO_Wait_Strategy (transport) { @@ -70,5 +68,3 @@ TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h index f775c66d9c0..5db60e5808b 100644 --- a/TAO/tao/Wait_On_Leader_Follower.h +++ b/TAO/tao/Wait_On_Leader_Follower.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Wait_On_Leader_Follower * @@ -57,8 +55,6 @@ public: virtual bool can_process_upcalls (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_WAIT_ON_LEADER_FOLLOWER_H */ diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp index 9eaf0efcbd2..9168df03344 100644 --- a/TAO/tao/Wait_On_Reactor.cpp +++ b/TAO/tao/Wait_On_Reactor.cpp @@ -12,8 +12,6 @@ ACE_RCSID (tao, Wait_On_Reactor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Wait_On_Reactor::TAO_Wait_On_Reactor (TAO_Transport *transport) : TAO_Wait_Strategy (transport) { @@ -117,5 +115,3 @@ TAO_Wait_On_Reactor::can_process_upcalls (void) const { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h index 212590b4d56..566a419efd1 100644 --- a/TAO/tao/Wait_On_Reactor.h +++ b/TAO/tao/Wait_On_Reactor.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Wait_On_Reactor * @@ -49,8 +47,6 @@ public: virtual bool can_process_upcalls (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_WAIT_ON_REACTOR_H */ diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp index 7cd1115fe39..3d17ac729a3 100644 --- a/TAO/tao/Wait_On_Read.cpp +++ b/TAO/tao/Wait_On_Read.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "tao/Wait_On_Read.h" -#include "tao/Transport.h" -#include "tao/Resume_Handle.h" -#include "tao/Synch_Reply_Dispatcher.h" -#include "tao/Client_Strategy_Factory.h" -#include "tao/ORB_Core.h" +#include "Wait_On_Read.h" +#include "Transport.h" +#include "Resume_Handle.h" +#include "Synch_Reply_Dispatcher.h" +#include "Client_Strategy_Factory.h" +#include "ORB_Core.h" #include "ace/Reactor.h" #include "ace/Countdown_Time.h" @@ -13,8 +13,6 @@ ACE_RCSID (tao, Wait_On_Read, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Wait_On_Read::TAO_Wait_On_Read (TAO_Transport *transport) : TAO_Wait_Strategy (transport) @@ -125,7 +123,7 @@ TAO_Wait_On_Read::register_handler (void) bool TAO_Wait_On_Read::non_blocking (void) const { - return false; + return 0; } bool @@ -138,5 +136,3 @@ TAO_Wait_On_Read::can_process_upcalls (void) const /* * End copy hook. */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h index c691a668200..e946f07d4a3 100644 --- a/TAO/tao/Wait_On_Read.h +++ b/TAO/tao/Wait_On_Read.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Wait_On_Read * @@ -48,8 +46,6 @@ public: virtual bool can_process_upcalls (void) const; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_WAIT_ON_READ_H */ diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp index efbcc303399..15a48b36b79 100644 --- a/TAO/tao/Wait_Strategy.cpp +++ b/TAO/tao/Wait_Strategy.cpp @@ -7,12 +7,9 @@ ACE_RCSID (tao, "$Id$") #if !defined (__ACE_INLINE__) -# include "tao/Wait_Strategy.inl" +# include "Wait_Strategy.inl" #endif /* __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Constructor. TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport) : transport_ (transport), @@ -37,5 +34,3 @@ TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */, * Hook to specialize the Wait Strategy */ //@@ TAO_WAIT_STRATEGY_SPL_ADD_HOOK - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index d2818275714..88e80011167 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -23,12 +23,7 @@ #include "tao/TAO_Export.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_ORB_Core; class TAO_Transport; class TAO_Synch_Reply_Dispatcher; @@ -96,11 +91,9 @@ protected: int is_registered_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/Wait_Strategy.inl" +# include "Wait_Strategy.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index c051cb19370..3ca279cf001 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -29,13 +29,12 @@ // be\be_codegen.cpp:291 -#include "tao/WrongTransactionC.h" +#include "WrongTransactionC.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" #include "tao/AnyTypeCode_Adapter.h" #include "ace/Dynamic_Service.h" -#include "ace/Log_Msg.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -44,8 +43,6 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { @@ -189,5 +186,3 @@ CORBA::Boolean operator>> ( { return true; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index e64c9dedb4d..a872bfdfaf2 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -61,8 +61,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -133,8 +131,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &) // TAO_IDL - Generated from // be\be_codegen.cpp:955 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/XtResource_Factory.cpp b/TAO/tao/XtResource_Factory.cpp index c6afc35a325..5ca19fba0f0 100644 --- a/TAO/tao/XtResource_Factory.cpp +++ b/TAO/tao/XtResource_Factory.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/XtResource_Factory.h" -#include "tao/debug.h" +#include "XtResource_Factory.h" +#include "debug.h" #include "ace/XtReactor.h" ACE_RCSID( TAO_XtResource, diff --git a/TAO/tao/XtResource_Loader.cpp b/TAO/tao/XtResource_Loader.cpp index 5fdc64af074..d2350ddcc00 100644 --- a/TAO/tao/XtResource_Loader.cpp +++ b/TAO/tao/XtResource_Loader.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/XtResource_Loader.h" -#include "tao/ORB_Core.h" -#include "tao/XtResource_Factory.h" +#include "XtResource_Loader.h" +#include "ORB_Core.h" +#include "XtResource_Factory.h" ACE_RCSID( TAO_XtResource, XtResource_Loader, diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index fe1bb730e4f..a21cdf54427 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp new file mode 100644 index 00000000000..bb988ed34ba --- /dev/null +++ b/TAO/tao/corbafwd.cpp @@ -0,0 +1,7 @@ +// $Id$ + +#include "corbafwd.h" + +ACE_RCSID (tao, + corbafwd, + "$Id$") diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp index 3b2fdad7cb4..d1cfdd93b16 100644 --- a/TAO/tao/debug.cpp +++ b/TAO/tao/debug.cpp @@ -11,8 +11,4 @@ ACE_RCSID (tao, debug, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Export unsigned int TAO_debug_level = 0; - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h index 6bd37a2341c..1ca35af44d1 100644 --- a/TAO/tao/debug.h +++ b/TAO/tao/debug.h @@ -22,10 +22,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // These are global to simplify is use by other code, very much in // particular by getopt and related argument-parsing code // @@ -38,7 +34,5 @@ extern TAO_Export unsigned int TAO_debug_level; // debug messages on (1) or off (0) extern TAO_Export unsigned int TAO_orbdebug; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DEBUG_H */ diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index bc6d38cf6ab..e2d4b28f9d1 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "tao/default_client.h" -#include "tao/Wait_On_Read.h" -#include "tao/Wait_On_Reactor.h" -#include "tao/Wait_On_Leader_Follower.h" -#include "tao/Wait_On_LF_No_Upcall.h" -#include "tao/Exclusive_TMS.h" -#include "tao/Muxed_TMS.h" -#include "tao/Blocked_Connect_Strategy.h" -#include "tao/Reactive_Connect_Strategy.h" -#include "tao/LF_Connect_Strategy.h" -#include "tao/orbconf.h" +#include "default_client.h" +#include "Wait_On_Read.h" +#include "Wait_On_Reactor.h" +#include "Wait_On_Leader_Follower.h" +#include "Wait_On_LF_No_Upcall.h" +#include "Exclusive_TMS.h" +#include "Muxed_TMS.h" +#include "Blocked_Connect_Strategy.h" +#include "Reactive_Connect_Strategy.h" +#include "LF_Connect_Strategy.h" +#include "orbconf.h" #include "ace/Lock_Adapter_T.h" #include "ace/Recursive_Thread_Mutex.h" @@ -23,8 +23,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void) : profile_lock_type_ (TAO_THREAD_LOCK) , transport_mux_strategy_ (TAO_MUXED_TMS) @@ -106,8 +104,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (name, ACE_TEXT("null")) == 0) this->profile_lock_type_ = TAO_NULL_LOCK; - else - this->report_option_value_error (ACE_TEXT("-ORBIIOPProfileLock"), name); } } @@ -212,14 +208,9 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[]) { ACE_TCHAR* name = argv[curarg]; - if (ACE_OS::strcmp (name, ACE_TEXT("0")) == 0 || - ACE_OS::strcasecmp (name, ACE_TEXT("false")) == 0) + if (ACE_OS::strcasecmp (name, + ACE_TEXT("false")) == 0) this->use_cleanup_options_ = false; - else if (ACE_OS::strcmp (name, ACE_TEXT("1")) == 0 || - ACE_OS::strcasecmp (name, ACE_TEXT("true")) == 0) - this->use_cleanup_options_ = true; - else - this->report_option_value_error (ACE_TEXT("-ORBConnectionHandlerCleanup"), name); } } else if (ACE_OS::strncmp (argv[curarg], ACE_TEXT("-ORB"), 4) == 0) @@ -392,8 +383,6 @@ TAO_Default_Client_Strategy_Factory::use_cleanup_options (void) const return this->use_cleanup_options_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index db6544d166d..0da7020d23a 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -23,8 +23,6 @@ #include "tao/Client_Strategy_Factory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Default_Client_Strategy_Factory * @@ -117,8 +115,6 @@ private: bool use_cleanup_options_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory) diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h index a535b1fa05a..45ded1f6f06 100644 --- a/TAO/tao/default_environment.h +++ b/TAO/tao/default_environment.h @@ -21,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { class Environment; @@ -36,8 +34,6 @@ namespace CORBA */ TAO_Export CORBA::Environment& TAO_default_environment (void); -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DEFAULT_ENVIRONMENT_H */ diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 59f2cd93332..bae6bf7ab3d 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -31,8 +31,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) : use_locked_data_blocks_ (1) , parser_names_count_ (0) @@ -46,11 +44,6 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) , dynamically_allocated_reactor_ (0) , options_processed_ (0) , factory_disabled_ (0) -#if TAO_USE_LOCAL_MEMORY_POOL == 1 - , use_local_memory_pool_ (true) -#else - , use_local_memory_pool_ (false) -#endif , cached_connection_lock_type_ (TAO_THREAD_LOCK) , object_key_table_lock_type_ (TAO_THREAD_LOCK) , corba_object_lock_type_ (TAO_THREAD_LOCK) @@ -165,7 +158,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { TAO_Protocol_Item *item = 0; ACE_NEW_RETURN (item, - TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])), + TAO_Protocol_Item (ACE_TEXT_TO_CHAR_IN(argv[curarg])), -1); if (pset->insert (item) == -1) ACE_ERROR ((LM_ERROR, @@ -319,7 +312,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) if (curarg < argc) { - this->add_to_ior_parser_names (ACE_TEXT_ALWAYS_CHAR(argv[curarg])); + this->add_to_ior_parser_names (ACE_TEXT_TO_CHAR_IN(argv[curarg])); } } @@ -631,7 +624,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to add ") ACE_TEXT ("<%s> to protocol factory set.\n"), - ACE_TEXT_CHAR_TO_TCHAR (item->protocol_name ().c_str ()))); + ACE_TEXT_TO_TCHAR_IN (item->protocol_name ().c_str ()))); delete item; @@ -672,7 +665,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Unable to load ") ACE_TEXT ("protocol <%s>, %p\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), + ACE_TEXT_TO_TCHAR_IN(name.c_str ()), ACE_TEXT ("")), -1); } @@ -681,7 +674,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()))); + ACE_TEXT_TO_TCHAR_IN(name.c_str ()))); } } @@ -771,32 +764,20 @@ TAO_Default_Resource_Factory::reclaim_reactor (ACE_Reactor *reactor) } +#if TAO_USE_LOCAL_MEMORY_POOL == 1 typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,TAO_SYNCH_MUTEX> LOCKED_MALLOC; -typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR_POOL; -typedef ACE_New_Allocator LOCKED_ALLOCATOR_NO_POOL; - -void -TAO_Default_Resource_Factory::use_local_memory_pool (bool flag) -{ - use_local_memory_pool_ = flag; -} +typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR; +#else +typedef ACE_New_Allocator LOCKED_ALLOCATOR; +#endif ACE_Allocator * TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -805,18 +786,9 @@ ACE_Allocator * TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -825,18 +797,9 @@ ACE_Allocator * TAO_Default_Resource_Factory::input_cdr_msgblock_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -851,19 +814,9 @@ ACE_Allocator* TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } - + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -871,19 +824,9 @@ ACE_Allocator * TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } - + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -891,19 +834,9 @@ ACE_Allocator* TAO_Default_Resource_Factory::output_cdr_msgblock_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } - + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -911,19 +844,9 @@ ACE_Allocator* TAO_Default_Resource_Factory::amh_response_handler_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } - + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -931,19 +854,9 @@ ACE_Allocator* TAO_Default_Resource_Factory::ami_response_handler_allocator (void) { ACE_Allocator *allocator = 0; - if (use_local_memory_pool_) - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_POOL, - 0); - } - else - { - ACE_NEW_RETURN (allocator, - LOCKED_ALLOCATOR_NO_POOL, - 0); - } - + ACE_NEW_RETURN (allocator, + LOCKED_ALLOCATOR, + 0); return allocator; } @@ -1170,8 +1083,6 @@ TAO_Default_Resource_Factory::drop_replies_during_shutdown (void) const return this->drop_replies_; } -TAO_END_VERSIONED_NAMESPACE_DECL - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 2189a8ca7d7..8cbc1344a40 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -24,16 +24,11 @@ #include "tao/Resource_Factory.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor_Impl; -ACE_END_VERSIONED_NAMESPACE_DECL - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Object_Adapter; class TAO_IOR_Parser; class TAO_LF_Strategy; class TAO_Codeset_Descriptor_Base; +class ACE_Reactor_Impl; /** * @class TAO_Default_Resource_Factory @@ -108,7 +103,6 @@ public: virtual void reclaim_reactor (ACE_Reactor *); virtual TAO_Acceptor_Registry *get_acceptor_registry (void); virtual TAO_Connector_Registry *get_connector_registry (void); - virtual void use_local_memory_pool (bool); virtual ACE_Allocator* input_cdr_dblock_allocator (void); virtual ACE_Allocator* input_cdr_buffer_allocator (void); virtual ACE_Allocator* input_cdr_msgblock_allocator (void); @@ -213,10 +207,6 @@ protected: /// were processed before (or later). int factory_disabled_; - /// This flag is used to determine whether the cdr allocators - /// should use the local memory pool or not. - bool use_local_memory_pool_; - private: void init_codeset_descriptors (void); @@ -257,8 +247,6 @@ private: bool drop_replies_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory) diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index 3ebc4dadc7f..c74c5065ef7 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -9,8 +9,6 @@ ACE_RCSID (tao, default_server, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) : activate_server_connections_ (0), thread_flags_ (THR_BOUND | THR_DETACHED), @@ -382,8 +380,6 @@ TAO_Default_Server_Strategy_Factory::report_option_value_error ( option_value, option_name)); } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory, ACE_TEXT ("Server_Strategy_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index e346b7eaca2..f8304d430da 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -25,7 +25,6 @@ #include "ace/Service_Config.h" #include "ace/Time_Value.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Default_Server_Strategy_Factory @@ -86,8 +85,6 @@ protected: ACE_Time_Value thread_per_connection_timeout_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory) ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory) diff --git a/TAO/tao/PI_Server/diffs/ServerRequestInterceptor.diff b/TAO/tao/diffs/ServerRequestInterceptor.diff index f3fc423c81a..f3fc423c81a 100644 --- a/TAO/tao/PI_Server/diffs/ServerRequestInterceptor.diff +++ b/TAO/tao/diffs/ServerRequestInterceptor.diff diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb index 704c1ed5f3b..8d7542b0509 100644 --- a/TAO/tao/extra_core.mpb +++ b/TAO/tao/extra_core.mpb @@ -3,6 +3,8 @@ feature(!minimum_corba) { Source_Files(TAO_COMPONENTS) { + ClientRequestInterceptor_Adapter.cpp + ServerRequestInterceptor_Adapter.cpp ServicesC.cpp Dynamic_Adapter.cpp } diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h index 40d8f6cad7d..f1be2f0615e 100644 --- a/TAO/tao/objectid.h +++ b/TAO/tao/objectid.h @@ -23,10 +23,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /* * * This file is a break away from orbconf.h. Basically orbconf.h is @@ -107,7 +103,5 @@ namespace TAO /// No. of services locatable through multicast. #define TAO_NO_OF_MCAST_SERVICES 4 -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /*TAO_OBJECTID_H*/ diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index faccd9fe89c..c75ced2a83f 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -1,11 +1,11 @@ //$Id$ -#include "tao/operation_details.h" -#include "tao/Stub.h" -#include "tao/ORB_Constants.h" -#include "tao/Exception_Data.h" -#include "tao/SystemException.h" -#include "tao/Argument.h" +#include "operation_details.h" +#include "Stub.h" +#include "ORB_Constants.h" +#include "Exception_Data.h" +#include "SystemException.h" +#include "Argument.h" #include "ace/OS_NS_string.h" @@ -17,8 +17,6 @@ ACE_RCSID (tao, operation_details, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Exception * TAO_Operation_Details::corba_exception (const char *id ACE_ENV_ARG_DECL) @@ -77,4 +75,3 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr) return true; } -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index bc44c92e5f9..8748d0f6147 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** * @file operation_details.h @@ -14,19 +14,16 @@ #include /**/ "ace/pre.h" -#include "tao/SystemException.h" +#include "SystemException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Service_Context.h" -#include "tao/TimeBaseC.h" -#include "tao/target_specification.h" +#include "Service_Context.h" +#include "target_specification.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /// Forward declarations namespace Dynamic { @@ -40,14 +37,6 @@ namespace TAO struct Exception_Data; } -namespace TAO -{ - namespace CSD - { - class FW_Server_Request_Wrapper; - } -} - /** * @class TAO_Operation_Details * @@ -64,11 +53,6 @@ class TAO_Export TAO_Operation_Details { public: - /// Declare FW_Server_Request_Wrapper a friend - /// This friendship makes the FW_Server_Request_Wrapper be able to - /// clone the TAO_Operation_Details data member in TAO_ServerRequest. - friend class TAO::CSD::FW_Server_Request_Wrapper; - /// Constructor TAO_Operation_Details (const char *name, CORBA::ULong len, @@ -156,12 +140,6 @@ public: TAO::Exception_Data const * ex_data (void) const; - void ft_expiration_time (TimeBase::TimeT time); - TimeBase::TimeT ft_expiration_time (void) const; - - void ft_retention_id (CORBA::Long request_id); - CORBA::Long ft_retention_id (void) const; - private: /// Name of the operation being invoked. @@ -203,19 +181,10 @@ private: /// Count of the exceptions that operations can throw. CORBA::ULong ex_count_; -#if TAO_HAS_INTERCEPTORS == 1 - /// FT request expiration time (absolute gregorian) - TimeBase::TimeT ft_expiration_time_; - - /// FT request retention id - CORBA::Long ft_retention_id_; -#endif /*TAO_HAS_INTERCEPTORS == 1*/ }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "tao/operation_details.i" +# include "operation_details.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i index a570229cf4b..599d37c767b 100644 --- a/TAO/tao/operation_details.i +++ b/TAO/tao/operation_details.i @@ -2,8 +2,6 @@ // //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE TAO_Operation_Details::TAO_Operation_Details (const char *name, CORBA::ULong len, @@ -22,10 +20,6 @@ TAO_Operation_Details::TAO_Operation_Details (const char *name, , num_args_ (num) , ex_data_ (data) , ex_count_ (count) -#if TAO_HAS_INTERCEPTORS == 1 - , ft_expiration_time_ (0) - , ft_retention_id_ (0) -#endif /*TAO_HAS_INTERCEPTORS == 1*/ { } @@ -170,31 +164,3 @@ TAO_Operation_Details::args_num (void) const { return this->num_args_; } - -#if TAO_HAS_INTERCEPTORS == 1 -ACE_INLINE void -TAO_Operation_Details::ft_expiration_time (TimeBase::TimeT time) -{ - this->ft_expiration_time_ = time; -} - -ACE_INLINE TimeBase::TimeT -TAO_Operation_Details::ft_expiration_time (void) const -{ - return this->ft_expiration_time_; -} - -ACE_INLINE void -TAO_Operation_Details::ft_retention_id (CORBA::Long request_id) -{ - this->ft_retention_id_ = request_id; -} - -ACE_INLINE CORBA::Long -TAO_Operation_Details::ft_retention_id (void) const -{ - return this->ft_retention_id_; -} -#endif /*TAO_HAS_INTERCEPTORS == 1*/ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp index b4bd2cb6e1c..168eeabc2fb 100644 --- a/TAO/tao/orb_typesC.cpp +++ b/TAO/tao/orb_typesC.cpp @@ -29,18 +29,14 @@ // be\be_codegen.cpp:288 -#include "tao/orb_typesC.h" +#include "orb_typesC.h" #include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:70 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Arg traits specializations. namespace TAO { } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h index 14555b5a451..17a295fddf6 100644 --- a/TAO/tao/orb_typesC.h +++ b/TAO/tao/orb_typesC.h @@ -57,8 +57,6 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace CORBA { @@ -105,8 +103,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:1062 -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index ccc3c2259a1..a4bcbd98704 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -19,20 +19,18 @@ #include /**/ "ace/pre.h" +// "ace/OS.h" is overkill. "ace/Basic_Types.h" is enough. In +// particular, it is needed for the definition of ACE_LITTLE_ENDIAN. #include "ace/Basic_Types.h" #include "ace/Global_Macros.h" #include "ace/Synch_Traits.h" +#define TAO_INVALID_PRIORITY -1 + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -#define TAO_INVALID_PRIORITY -1 - #if !defined (TAO_REACTOR) #define TAO_REACTOR ACE_Select_Reactor #endif /* TAO_REACTOR */ @@ -161,10 +159,36 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; #define TAO_MAXBUFSIZE 1024 #endif /* TAO_MAXBUFSIZE */ +/*! + + The number of times the transport will try to re-read before + returning control to the reactor when it has an uncompleted + message (see TAO_Transport::handle_input()). + + The idea behind re-reading is that more data may have arrived + while the transport was busy deciding what to do with the bytes + it got, so we should probably try to re-read. + + This value shouldn't be too large, lest the transport starve + out other transports while trying to complete its message. + + When choosing a value, think of the type of this as 'unsigned int'. + */ +#if !defined(TAO_MAX_TRANSPORT_REREAD_ATTEMPTS) +#define TAO_MAX_TRANSPORT_REREAD_ATTEMPTS 2 +#endif + +// This controls the alignment for TAO structs. It supports built-in +// types up to and including 16 bytes (128 bits) in size. +#if !defined (TAO_MAXIMUM_NATIVE_TYPE_SIZE) +# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128 +#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */ + #if !defined (TAO_CONNECTION_PURGING_STRATEGY) # define TAO_CONNECTION_PURGING_STRATEGY TAO_Resource_Factory::LRU #endif /* TAO_CONNECTION_PURGING_STRATEGY */ + #if !defined (TAO_PURGE_PERCENT) # define TAO_PURGE_PERCENT 20 #endif /* TAO_PURGE_PERCENT */ @@ -186,6 +210,10 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS # endif +// Instead of replacing this with the ACE macro +// in 20+ files, define it conditionally. +// The TAO_OutputCDR class uses the ACE macro, which +// is defined by default. #if !defined(TAO_NO_COPY_OCTET_SEQUENCES) # define TAO_NO_COPY_OCTET_SEQUENCES 1 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */ @@ -215,7 +243,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; // byte first. // @todo It seems to be that this definition of TAO_ENCAP_BYTE_ORDER -// should be removed. We have an equivalent ACE definition in +// should be removed. We have an equivalent ACE definition in // ACE_CDR_BYTE_ORDER. Today both of them are consistent. It would be // a havoc if oneday this consistency is gone.. #if defined (ACE_LITTLE_ENDIAN) @@ -260,6 +288,36 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # pragma warning (disable:4355) /* disable C4355 warning */ #endif /* defined (_MSC_VER) */ +// The IDL compiler can generate the classes corresponding to IDL +// sequences in two ways: +// + Use the TAO templates for sequences, +// i.e. TAO_{Unb,B}ounded_Sequence<> +// + Explicitly generate code for the sequence. +// +// The first approach can (potentially) produce smaller code, because +// the code for a sequence over a particular type (say sequence<long>) +// can be shared across multiple IDL files. +// Unfortunately it is hard to manage the template instantiations on +// platforms that do not automatically generate them, mainly because +// it is hard to decide on which generated file are the templates +// instantiated. Thus the second approach is more convenient for most +// applications. +// +// On platforms that support automatic template instantiation we use +// the first approach. +// On platforms that require explicit template instantiations we use +// explicitly generated code for sequences if the platform does not. +// If the application requires it (such as embedded systems) the +// default can be changed, but then the application developer is +// responsible for instantiating the templates. +// +#if defined (AIX) || \ + (!defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \ + (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \ + (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS)))) +#define TAO_USE_SEQUENCE_TEMPLATES +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // The Root POA default name. #if !defined (TAO_DEFAULT_ROOTPOA_NAME) #define TAO_DEFAULT_ROOTPOA_NAME "RootPOA" @@ -814,7 +872,14 @@ enum TAO_Policy_Scope # define TAO_USE_LOCAL_MEMORY_POOL 1 #endif /* TAO_USE_LOCAL_MEMORY_POOL */ -TAO_END_VERSIONED_NAMESPACE_DECL +#if !defined (TAO_RESET_OUTPUT_CDR_AFTER_SEND) +#define TAO_RESET_OUTPUT_CDR_AFTER_SEND 0 +#endif /* TAO_RESET_OUTPUT_CDR_AFTER_SEND */ + +/// By default at this moment we use the deprecated exception holder +/// when the new version is ready we will remove this define. +#define TAO_HAS_DEPRECATED_EXCEPTION_HOLDER + #include /**/ "ace/post.h" diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index a20fec5bb2b..7da35340277 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -15,8 +15,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_ORB_Parameters::TAO_ORB_Parameters (void) : endpoints_map_ (10) , mcast_discovery_endpoint_ () @@ -24,7 +22,6 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void) , sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ) , sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ) , nodelay_ (1) - , sock_keepalive_ (0) , cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF) , use_lite_protocol_ (0) , use_dotted_decimal_addresses_ (0) @@ -305,5 +302,3 @@ TAO_ORB_Parameters::connect_ipv6_only (void) const return this->connect_ipv6_only_; } #endif /* ACE_HAS_IPV6 */ - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 3d5d51ff3ef..ef7593e3ab3 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -24,10 +24,8 @@ #include "ace/SString.h" -#include "tao/objectid.h" -#include "tao/CORBA_String.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "objectid.h" +#include "CORBA_String.h" // Forward decls. @@ -40,6 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet; typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator; + // ------------------------------------------------------------------- /** @@ -85,10 +84,6 @@ public: int nodelay (void) const; void nodelay (int); - /// Set/Get whether we should set SO_KEEPALIVE on the socket or not. - int sock_keepalive (void); - void sock_keepalive (int); - /** * Octet sequences are marshalled without doing any copies, we * simply append a block to the CDR message block chain. When the @@ -231,9 +226,6 @@ private: /// 1 if we're using TCP_NODELAY and 0 otherwise. int nodelay_; - /// 1 if we're using SO_KEEPALIV and 0 otherwise (default 0). - int sock_keepalive_; - /// Control the strategy for copying vs. appeding octet sequences in /// CDR streams. int cdr_memcpy_tradeoff_; @@ -321,8 +313,6 @@ private: bool negotiate_codesets_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) # include "tao/params.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/params.i b/TAO/tao/params.i index f9c2d3e889c..92a8a9e936a 100644 --- a/TAO/tao/params.i +++ b/TAO/tao/params.i @@ -2,8 +2,6 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE int TAO_ORB_Parameters::sock_rcvbuf_size (void) const { @@ -139,18 +137,6 @@ TAO_ORB_Parameters::nodelay (int x) } ACE_INLINE int -TAO_ORB_Parameters::sock_keepalive (void) -{ - return this->sock_keepalive_; -} - -ACE_INLINE void -TAO_ORB_Parameters::sock_keepalive (int x) -{ - this->sock_keepalive_ = x; -} - -ACE_INLINE int TAO_ORB_Parameters::ace_sched_policy (void) const { return this->ace_sched_policy_; @@ -242,5 +228,3 @@ TAO_ORB_Parameters::negotiate_codesets (bool x) { this->negotiate_codesets_ = x; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index ffdd877612b..b54ca557854 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -29,7 +29,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Cleanup_Func_Registry.cpp Client_Strategy_Factory.cpp ClientRequestInterceptor_Adapter_Factory.cpp - ClientRequestInterceptor_Adapter.cpp Codeset_Manager.cpp Codeset_Manager_Factory_Base.cpp Codeset_Translator_Base.cpp @@ -91,7 +90,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { IIOP_Transport.cpp IIOPC.cpp Incoming_Message_Queue.cpp - Incoming_Message_Stack.cpp Invocation_Adapter.cpp Invocation_Base.cpp Invocation_Endpoint_Selectors.cpp @@ -178,7 +176,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Resume_Handle.cpp Sequence.cpp Server_Strategy_Factory.cpp - ServerRequestInterceptor_Adapter.cpp ServerRequestInterceptor_Adapter_Factory.cpp Service_Callbacks.cpp Service_Context.cpp @@ -347,7 +344,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { IIOP_Profile.h IIOP_Transport.h Incoming_Message_Queue.h - Incoming_Message_Stack.h Invocation_Adapter.h Invocation_Base.h Invocation_Endpoint_Selectors.h @@ -514,7 +510,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { VarOut_T.h Var_Size_Argument_T.h Version.h - Versioned_Namespace.h Wait_On_Leader_Follower.h Wait_On_LF_No_Upcall.h Wait_On_Reactor.h diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp index ca77495c883..d72faa3c200 100644 --- a/TAO/tao/target_specification.cpp +++ b/TAO/tao/target_specification.cpp @@ -4,7 +4,7 @@ #include "tao/target_specification.h" #if !defined (__ACE_INLINE__) -#include "tao/target_specification.i" +#include "target_specification.i" #endif /* !defined INLINE */ ACE_RCSID (tao, diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 60c997f0e3c..4a352a6b333 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -35,7 +35,6 @@ # undef IOR #endif /* HPUX && IOR */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace IOP { @@ -128,10 +127,8 @@ private: CORBA::ULong profile_index_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/target_specification.i" +#include "target_specification.i" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/target_specification.i b/TAO/tao/target_specification.i index dd1265bf0df..e427b1dd9be 100644 --- a/TAO/tao/target_specification.i +++ b/TAO/tao/target_specification.i @@ -1,8 +1,6 @@ -// -*- C++ -*- -// +//-*- C++ -*- //$Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Target_Specification::TAO_Target_Specification (void) @@ -83,5 +81,3 @@ TAO_Target_Specification::specifier (void) { return this->specifier_; } - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h index 58b1a595c87..f2ba8aea77f 100644 --- a/TAO/tao/varbase.h +++ b/TAO/tao/varbase.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// This may look like C, but it's really -*- C++ -*- //============================================================================= /** @@ -17,10 +17,6 @@ #define TAO_VARBASE_H #include /**/ "ace/pre.h" -#include "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Base_var * @@ -43,7 +39,5 @@ private: }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_VARBASE_H */ |