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

@ -4,7 +4,9 @@
/**
* @file Object_Manager_Base.h
*
* @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
* $Id: Object_Manager_Base.h 97262 2013-08-09 08:32:10Z johnnyw $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
* @author Jesper S. M|ller<stophph@diku.dk>
* @author and a cast of thousands...
*
@ -127,8 +129,6 @@ class ACE_Log_Msg;
class ACE_Export ACE_OS_Object_Manager : public ACE_Object_Manager_Base
{
public:
ACE_ALLOC_HOOK_DECLARE;
/// Explicitly initialize.
virtual int init (void);