Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,5 @@
// $Id: OS_Thread_Adapter.cpp 92682 2010-11-23 23:41:19Z shuston $
#include "ace/OS_Thread_Adapter.h"
#include "ace/Thread_Hook.h"
@ -5,10 +7,6 @@
#include "ace/Global_Macros.h"
#include "ace/OS_NS_Thread.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_OS_Thread_Adapter::ACE_OS_Thread_Adapter (
@ -36,8 +34,6 @@ ACE_OS_Thread_Adapter::~ACE_OS_Thread_Adapter (void)
{
}
ACE_ALLOC_HOOK_DEFINE(ACE_OS_Thread_Adapter)
ACE_THR_FUNC_RETURN
ACE_OS_Thread_Adapter::invoke (void)
{