summaryrefslogtreecommitdiff
path: root/ace/OS_Thread_Adapter.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/OS_Thread_Adapter.h')
-rw-r--r--ace/OS_Thread_Adapter.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/ace/OS_Thread_Adapter.h b/ace/OS_Thread_Adapter.h
index 3776339b2a7..73ad99989e6 100644
--- a/ace/OS_Thread_Adapter.h
+++ b/ace/OS_Thread_Adapter.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
//=============================================================================
/**
@@ -22,8 +21,6 @@
#include "ace/ACE_export.h"
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
/**
* @class ACE_OS_Thread_Adapter
*
@@ -45,7 +42,7 @@ public:
/// Constructor.
ACE_OS_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
# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
, ACE_SEH_EXCEPT_HANDLER selector = 0
, ACE_SEH_EXCEPT_HANDLER handler = 0
@@ -59,14 +56,15 @@ public:
*/
virtual ACE_THR_FUNC_RETURN invoke (void);
-protected:
-
- /// Ensure that this object is allocated on the heap.
+private:
+ /// Ensure that this object must be allocated on the heap.
~ACE_OS_Thread_Adapter (void);
+private:
+ /// 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
-
#include /**/ "ace/post.h"
#endif /* ACE_THREAD_ADAPTER_H */