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: Log_Category.cpp 97058 2013-04-19 14:41:18Z huangh $
#include "ace/Log_Msg.h"
#include "ace/Log_Category.h"
#include "ace/Atomic_Op.h"
@ -72,8 +74,6 @@ ACE_Log_Category_TSS::ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_M
{
}
ACE_ALLOC_HOOK_DEFINE(ACE_Log_Category_TSS)
ACE_Log_Category_TSS*
ACE_Log_Category::per_thr_obj()
{