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: Trace.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Trace.h"
// Turn off tracing for the duration of this file.
@ -8,9 +10,6 @@
#include "ace/Log_Category.h"
#include "ace/Object_Manager_Base.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL