diff options
Diffstat (limited to 'ace/Thread_Adapter.h')
| -rw-r--r-- | ace/Thread_Adapter.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/ace/Thread_Adapter.h b/ace/Thread_Adapter.h index 046d21b238f..78dfa4b96e4 100644 --- a/ace/Thread_Adapter.h +++ b/ace/Thread_Adapter.h @@ -1,4 +1,3 @@ -// -*- C++ -*- //============================================================================= /** @@ -22,8 +21,6 @@ #include "ace/Base_Thread_Adapter.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - // Forward decl. class ACE_Thread_Manager; class ACE_Thread_Descriptor; @@ -49,7 +46,7 @@ public: /// Constructor. ACE_Thread_Adapter (ACE_THR_FUNC user_func, void *arg, - ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ACE_THREAD_ADAPTER_NAME, + ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter, ACE_Thread_Manager *thr_mgr = 0, ACE_Thread_Descriptor *td = 0 # if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) @@ -68,26 +65,23 @@ public: /// Accessor for the optional <Thread_Manager>. ACE_Thread_Manager *thr_mgr (void); -protected: - +private: /// Ensure that this object must be allocated on the heap. ~ACE_Thread_Adapter (void); -private: - /// Called by invoke, mainly here to separate the SEH stuff because /// SEH on Win32 doesn't compile with local vars with destructors. virtual ACE_THR_FUNC_RETURN invoke_i (void); private: - /// Optional thread manager. ACE_Thread_Manager *thr_mgr_; + /// Friend declaration to avoid compiler warning: only defines a private + /// destructor and has no friends. + friend class ACE_Thread_Adapter_Has_Private_Destructor; }; -ACE_END_VERSIONED_NAMESPACE_DECL - # if defined (ACE_HAS_INLINED_OSCALLS) # if defined (ACE_INLINE) # undef ACE_INLINE |