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_Control.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Thread_Control.cpp')
| -rw-r--r-- | dep/acelite/ace/Thread_Control.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dep/acelite/ace/Thread_Control.cpp b/dep/acelite/ace/Thread_Control.cpp index 2f38849e339..4046c07eef7 100644 --- a/dep/acelite/ace/Thread_Control.cpp +++ b/dep/acelite/ace/Thread_Control.cpp @@ -1,4 +1,4 @@ -// $Id: Thread_Control.cpp 91688 2010-09-09 11:21:50Z johnnyw $ +// $Id: Thread_Control.cpp 94054 2011-05-11 18:28:20Z johnnyw $ #include "ace/Thread_Control.h" #include "ace/Thread_Manager.h" @@ -18,7 +18,7 @@ ACE_Thread_Control::dump (void) const } int -ACE_Thread_Control::insert (ACE_Thread_Manager *tm, int insert) +ACE_Thread_Control::insert (ACE_Thread_Manager *tm, bool insert) { ACE_OS_TRACE ("ACE_Thread_Control::insert"); @@ -33,7 +33,6 @@ ACE_Thread_Control::insert (ACE_Thread_Manager *tm, int insert) } // Initialize the thread controller. - ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t, int insert) : tm_ (t), @@ -50,7 +49,6 @@ ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t, } // Automatically kill thread on exit. - ACE_Thread_Control::~ACE_Thread_Control (void) { ACE_OS_TRACE ("ACE_Thread_Control::~ACE_Thread_Control"); @@ -63,7 +61,6 @@ ACE_Thread_Control::~ACE_Thread_Control (void) } // Exit from thread (but clean up first). - ACE_THR_FUNC_RETURN ACE_Thread_Control::exit (ACE_THR_FUNC_RETURN exit_status, int do_thr_exit) { |