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 Service_Manager.h
*
* @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
* $Id: Service_Manager.h 81388 2008-04-23 14:02:05Z johnnyw $
*
* @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
*/
//=============================================================================
@ -57,9 +59,6 @@ public:
/// Destructor.
virtual ~ACE_Service_Manager (void);
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
protected:
// = Perform the various meta-services.
@ -83,6 +82,9 @@ protected:
/// Dump the state of an object.
void dump (void) const;
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
protected:
int open (const ACE_INET_Addr &sia);