diff options
Diffstat (limited to 'TAO/tao/Resource_Factory.h')
| -rw-r--r-- | TAO/tao/Resource_Factory.h | 27 |
1 files changed, 7 insertions, 20 deletions
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 */ |