diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Thread_Hook.h | |
parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Thread_Hook.h')
-rw-r--r-- | dep/acelite/ace/Thread_Hook.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dep/acelite/ace/Thread_Hook.h b/dep/acelite/ace/Thread_Hook.h index 7bc3bcce492..df0d0293cc4 100644 --- a/dep/acelite/ace/Thread_Hook.h +++ b/dep/acelite/ace/Thread_Hook.h @@ -4,13 +4,12 @@ /** * @file Thread_Hook.h * - * $Id: Thread_Hook.h 80826 2008-03-04 14:51:23Z wotte $ + * $Id: Thread_Hook.h 94054 2011-05-11 18:28:20Z johnnyw $ * * @author Carlos O'Ryan <coryan@uci.edu> */ //============================================================================= - #ifndef ACE_THREAD_HOOK_H #define ACE_THREAD_HOOK_H #include /**/ "ace/pre.h" @@ -34,9 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_Export ACE_Thread_Hook { - public: - /// Destructor. virtual ~ACE_Thread_Hook (void); @@ -51,7 +48,7 @@ public: virtual ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func, void *arg); - /// sets the system wide thread hook, returns the previous thread + /// Sets the system wide thread hook, returns the previous thread /// hook or 0 if none is set. static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook); |