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,12 +1,12 @@
// $Id: Dump.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Dump.h"
#include "ace/Guard_T.h"
#include "ace/Thread_Mutex.h"
#include "ace/Object_Manager.h"
#include "ace/Log_Category.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -54,8 +54,6 @@ ACE_ODB::ACE_ODB (void)
ACE_TRACE ("ACE_ODB::ACE_ODB");
}
ACE_ALLOC_HOOK_DEFINE(ACE_ODB)
ACE_ODB *
ACE_ODB::instance (void)
{