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.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Thread_Hook.cpp')
| -rw-r--r-- | dep/acelite/ace/Thread_Hook.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dep/acelite/ace/Thread_Hook.cpp b/dep/acelite/ace/Thread_Hook.cpp index 1121e4b44ae..03b2fd74cdb 100644 --- a/dep/acelite/ace/Thread_Hook.cpp +++ b/dep/acelite/ace/Thread_Hook.cpp @@ -1,10 +1,8 @@ -// $Id: Thread_Hook.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Thread_Hook.cpp 94054 2011-05-11 18:28:20Z johnnyw $ #include "ace/Thread_Hook.h" #include "ace/Object_Manager_Base.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Thread_Hook::~ACE_Thread_Hook () @@ -12,8 +10,7 @@ ACE_Thread_Hook::~ACE_Thread_Hook () } ACE_THR_FUNC_RETURN -ACE_Thread_Hook::start (ACE_THR_FUNC func, - void *arg) +ACE_Thread_Hook::start (ACE_THR_FUNC func, void *arg) { return (func) (arg); } |