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: Capabilities.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Capabilities.h"
#include "ace/OS_NS_ctype.h"
#include "ace/OS_Memory.h"
@ -283,6 +285,7 @@ ACE_Capabilities::getval (const ACE_TCHAR *keyname, int &val)
return 0;
}
#if !defined (ACE_IS_SPLITTING)
static int
is_empty (const ACE_TCHAR *line)
{
@ -300,6 +303,7 @@ is_line (const ACE_TCHAR *line)
return *line != ACE_TEXT ('\0');
}
#endif /* !ACE_IS_SPLITTING */
int
ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
@ -345,8 +349,4 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name)
return -1;
}
ACE_ALLOC_HOOK_DEFINE(ACE_StringCapEntry)
ACE_ALLOC_HOOK_DEFINE(ACE_IntCapEntry)
ACE_ALLOC_HOOK_DEFINE(ACE_BoolCapEntry)
ACE_END_VERSIONED_NAMESPACE_DECL