diff options
Diffstat (limited to 'ace/Activation_Queue.h')
| -rw-r--r-- | ace/Activation_Queue.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/ace/Activation_Queue.h b/ace/Activation_Queue.h index 9a370d2cdf6..26d51c9dcf1 100644 --- a/ace/Activation_Queue.h +++ b/ace/Activation_Queue.h @@ -16,13 +16,7 @@ #include /**/ "ace/pre.h" -#ifdef ACE_THREADS_BUILD_DLL -# include "ace/ACE_Threads_export.h" -#else -# include "ace/ACE_export.h" -# define ACE_Threads_Export ACE_Export -#endif /* ACE_THREADS_BUILD_DLL */ - +#include "ace/ACE_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -34,8 +28,9 @@ /// Define to be compatible with the terminology in the POSA2 book! #define ACE_Activation_List ACE_Activation_Queue -class ACE_Method_Request; +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Method_Request; /** * @class ACE_Activation_Queue @@ -52,7 +47,7 @@ class ACE_Method_Request; * * @sa ACE_Method_Request */ -class ACE_Threads_Export ACE_Activation_Queue +class ACE_Export ACE_Activation_Queue { public: // = Initialization and termination methods. @@ -116,7 +111,8 @@ public: * earlier, however, if queue is closed, deactivated, or when * a signal occurs. * - * @retval 0 on success. + * @retval >0 The number of method requests on the queue after adding + * the specified request. * @retval -1 if an error occurs; errno contains further information. If * the specified timeout elapses, errno will be @c EWOULDBLOCK. */ @@ -144,7 +140,14 @@ public: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; +private: + + // = Prevent copying and assignment. + ACE_Activation_Queue (const ACE_Activation_Queue &); + void operator= (const ACE_Activation_Queue &); + protected: + /// Stores the Method_Requests. ACE_Message_Queue<ACE_SYNCH> *queue_; @@ -152,21 +155,20 @@ protected: int delete_queue_; private: + /// Allocation strategy of the queue. ACE_Allocator *allocator_; /// Allocation strategy of the message blocks. ACE_Allocator *data_block_allocator_; - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &)) }; +ACE_END_VERSIONED_NAMESPACE_DECL + #if defined (__ACE_INLINE__) #include "ace/Activation_Queue.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_ACTIVATION_QUEUE_H */ - |