josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

Browse Source 
*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 15:35:07 -07:00
parent f21f47005d
commit 26b5e033ff
2257 changed files with 750 additions and 103852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/ACE_wrappers/ace/Global_Macros.h
-99
View File
@@ -1,5 +1,4 @@
// -*- C++ -*-
//=============================================================================
/**
* @file Global_Macros.h
@@ -13,45 +12,34 @@
* This one is split from the famous OS.h
*/
//=============================================================================
#ifndef ACE_GLOBAL_MACROS_H
#define ACE_GLOBAL_MACROS_H
#include /**/ "ace/pre.h"
// Included just keep compilers that see #pragma dierctive first
// happy.
#include /**/ "ace/ACE_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/config-lite.h"
#include "ace/Assert.h" // For ACE_ASSERT
// Start Global Macros
# define ACE_BEGIN_DUMP ACE_TEXT ("\n====\n(%P|%t|%x)\n")
# define ACE_END_DUMP ACE_TEXT ("====\n")
# if defined (ACE_NDEBUG)
# define ACE_DB(X)
# else
# define ACE_DB(X) X
# endif /* ACE_NDEBUG */
// ACE_NO_HEAP_CHECK macro can be used to suppress false report of
// memory leaks. It turns off the built-in heap checking until the
// block is left. The old state will then be restored Only used for
// Win32 (in the moment).
# if defined (ACE_WIN32)
# if defined (_DEBUG) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
# include /**/ <crtdbg.h>
// Open versioned namespace, if enabled by the user.
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
class ACE_Export ACE_No_Heap_Check
{
public:
@@ -62,10 +50,8 @@ public:
private:
int old_state;
};
// Close versioned namespace, if enabled by the user.
ACE_END_VERSIONED_NAMESPACE_DECL
# define ACE_NO_HEAP_CHECK ACE_No_Heap_Check ____no_heap;
# else /* !_DEBUG */
# define ACE_NO_HEAP_CHECK
@@ -73,16 +59,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# else /* !ACE_WIN32 */
# define ACE_NO_HEAP_CHECK
# endif /* ACE_WIN32 */
// Turn a number into a string.
# define ACE_ITOA(X) #X
// Create a string of a server address with a "host:port" format.
# define ACE_SERVER_ADDRESS(H,P) H ACE_TEXT(":") P
// A couple useful inline functions for checking whether bits are
// enabled or disabled.
// Efficiently returns the least power of two >= X...
# define ACE_POW(X) (((X) == 0)?1:(X-=1,X|=X>>1,X|=X>>2,X|=X>>4,X|=X>>8,X|=X>>16,(++X)))
# define ACE_EVEN(NUM) (((NUM) & 1) == 0)
@@ -92,18 +74,15 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# define ACE_BIT_CMP_MASK(WORD, BIT, MASK) (((WORD) & (BIT)) == MASK)
# define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS))
# define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS))
# if !defined (ACE_ENDLESS_LOOP)
# define ACE_ENDLESS_LOOP
# endif /* ! ACE_ENDLESS_LOOP */
# if defined (ACE_NEEDS_FUNC_DEFINITIONS)
// It just evaporated ;-) Not pleasant.
# define ACE_UNIMPLEMENTED_FUNC(f)
# else
# define ACE_UNIMPLEMENTED_FUNC(f) f;
# endif /* ACE_NEEDS_FUNC_DEFINITIONS */
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
// Easy way to designate that a class is used as a pseudo-namespace.
// Insures that g++ "friendship" anamolies are properly handled.
@@ -113,9 +92,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
CLASSNAME (const CLASSNAME&); \
friend class ace_dewarn_gplusplus
#endif /* ACE_LACKS_DEPRECATED_MACROS */
// ----------------------------------------------------------------
//FUZZ: disable check_for_exception_sepc
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
#if defined (ACE_HAS_NO_THROW_SPEC)
@@ -134,16 +111,13 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#endif /*ACE_HAS_NO_THROW_SPEC*/
#endif /* ACE_LACKS_DEPRECATED_MACROS */
//FUZZ: enable check_for_exception_sepc
// ----------------------------------------------------------------
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
/**
* This macro is deprecated
*/
#define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
#endif /* ACE_LACKS_DEPRECATED_MACROS */
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
/**
* @name CORBA namespace macros.
@@ -161,9 +135,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME
//@}
#endif /* ACE_LACKS_DEPRECATED_MACROS */
// ----------------------------------------------------------------
// Convenient macro for testing for deadlock, as well as for detecting
// when mutexes fail.
#define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \
@@ -188,9 +160,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
ACE_Read_Guard< MUTEX > OBJ (LOCK); \
if (OBJ.locked () == 0) return RETURN;
// ----------------------------------------------------------------
# define ACE_DES_NOFREE(POINTER,CLASS) \
do { \
if (POINTER) \
@@ -199,7 +169,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
} \
} \
while (0)
# define ACE_DES_ARRAY_NOFREE(POINTER,SIZE,CLASS) \
do { \
if (POINTER) \
@@ -213,7 +182,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
} \
} \
while (0)
# define ACE_DES_FREE(POINTER,DEALLOCATOR,CLASS) \
do { \
if (POINTER) \
@@ -223,7 +191,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
} \
} \
while (0)
# define ACE_DES_ARRAY_FREE(POINTER,SIZE,DEALLOCATOR,CLASS) \
do { \
if (POINTER) \
@@ -238,7 +205,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
} \
} \
while (0)
# if defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR)
# define ACE_DES_NOFREE_TEMPLATE(POINTER,T_CLASS,T_PARAMETER) \
do { \
@@ -261,7 +227,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
} \
} \
while (0)
#if defined (ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS)
# define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
do { \
@@ -462,14 +427,11 @@ ACE_END_VERSIONED_NAMESPACE_DECL
while (0)
# endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
/*******************************************************************/
/// Service Objects, i.e., objects dynamically loaded via the service
/// configurator, must provide a destructor function with the
/// following prototype to perform object cleanup.
typedef void (*ACE_Service_Object_Exterminator)(void *);
/** @name Service Configurator macros
*
* The following macros are used to define helper objects used in
@@ -502,7 +464,6 @@ typedef void (*ACE_Service_Object_Exterminator)(void *);
*/
# define ACE_STATIC_SVC_DECLARE(SERVICE_CLASS) \
extern ACE_Static_Svc_Descriptor ace_svc_desc_##SERVICE_CLASS ;
/// As ACE_STATIC_SVC_DECLARE, but using an export macro for NT
/// compilers.
/**
@@ -523,7 +484,6 @@ extern ACE_Static_Svc_Descriptor ace_svc_desc_##SERVICE_CLASS ;
*/
#define ACE_STATIC_SVC_DECLARE_EXPORT(EXPORT_NAME,SERVICE_CLASS) \
extern EXPORT_NAME##_Export ACE_Static_Svc_Descriptor ace_svc_desc_##SERVICE_CLASS;
/// Define the data structure used to register a statically linked
/// service into the Service Configurator.
/**
@@ -556,7 +516,6 @@ extern EXPORT_NAME##_Export ACE_Static_Svc_Descriptor ace_svc_desc_##SERVICE_CLA
*/
# define ACE_STATIC_SVC_DEFINE(SERVICE_CLASS, NAME, TYPE, FN, FLAGS, ACTIVE) \
ACE_Static_Svc_Descriptor ace_svc_desc_##SERVICE_CLASS = { NAME, TYPE, FN, FLAGS, ACTIVE };
/// Automatically register a service with the service configurator
/**
* In some applications the services must be automatically registered
@@ -585,9 +544,7 @@ public:\
};
#define ACE_STATIC_SVC_REGISTER(SERVICE_CLASS)\
ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS
#else /* !ACE_LACKS_STATIC_CONSTRUCTORS */
# define ACE_STATIC_SVC_REQUIRE(SERVICE_CLASS)\
class ACE_Static_Svc_##SERVICE_CLASS {\
public:\
@@ -598,16 +555,13 @@ public:\
};\
static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
#define ACE_STATIC_SVC_REGISTER(SERVICE_CLASS) do {} while (0)
#endif /* !ACE_LACKS_STATIC_CONSTRUCTORS */
// Preprocessor symbols will not be expanded if they are
// concatenated. Force the preprocessor to expand them during the
// argument prescan by calling a macro that itself calls another that
// performs the actual concatenation.
#define ACE_PREPROC_CONCATENATE_IMPL(A,B) A ## B
#define ACE_PREPROC_CONCATENATE(A,B) ACE_PREPROC_CONCATENATE_IMPL(A,B)
#if defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1
// Preprocessor symbols will not be expanded if they are
// concatenated. Force the preprocessor to expand them during the
@@ -617,11 +571,9 @@ static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
#else
# define ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(PREFIX,VERSIONED_NAMESPACE,SERVICE_CLASS) PREFIX ## _ ## SERVICE_CLASS
#endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
#define ACE_MAKE_SVC_CONFIG_FACTORY_NAME(VERSIONED_NAMESPACE,SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(_make,VERSIONED_NAMESPACE,SERVICE_CLASS)
#define ACE_MAKE_SVC_CONFIG_GOBBLER_NAME(VERSIONED_NAMESPACE,SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FUNCTION_NAME(_gobble,VERSIONED_NAMESPACE,SERVICE_CLASS)
/// Declare the factory method used to create dynamically loadable
/// services.
/**
@@ -641,7 +593,6 @@ static ACE_Static_Svc_##SERVICE_CLASS ace_static_svc_##SERVICE_CLASS;
# define ACE_FACTORY_DECLARE(CLS,SERVICE_CLASS) \
extern "C" CLS##_Export ACE_VERSIONED_NAMESPACE_NAME::ACE_Service_Object * \
ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (ACE_Service_Object_Exterminator *);
/// Define the factory method (and destructor) for a dynamically
/// loadable service.
/**
@@ -657,7 +608,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
* specified as ACE_Local_Service.
*/
# define ACE_Local_Service_Export
#if defined (ACE_OPENVMS)
# define ACE_PREPROC_STRINGIFY(A) #A
# define ACE_MAKE_SVC_REGISTRAR_ARG(A) ACE_PREPROC_STRINGIFY(A), (void*)&A
@@ -693,7 +643,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
return new SERVICE_CLASS; \
}
#endif
/**
* For service classes scoped within namespaces, use this macro in
* place of ACE_FACTORY_DEFINE. The third argument in this case is
@@ -755,16 +704,12 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
return new NAMESPACE_CLASS; \
}
#endif
/// The canonical name for a service factory method
# define ACE_SVC_NAME(SERVICE_CLASS) ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS)
/// The canonical way to invoke (i.e. construct) a service factory
/// method.
#define ACE_SVC_INVOKE(SERVICE_CLASS) ACE_SVC_NAME(SERVICE_CLASS) (0)
//@}
/** @name Helper macros for services defined in the netsvcs library.
*
* The ACE services defined in netsvcs use this helper macros for
@@ -775,7 +720,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SVC_FACTORY_DECLARE(X) ACE_FACTORY_DECLARE (ACE_Svc, X)
# define ACE_SVC_FACTORY_DEFINE(X) ACE_FACTORY_DEFINE (ACE_Svc, X)
//@}
#if defined (ACE_WIN32)
// These are used in SPIPE_Acceptor/Connector, but are ignored at runtime.
# if defined (ACE_HAS_WINCE)
@@ -838,13 +782,10 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# endif /* !defined PIPE_TYPE_MESSAGE */
#endif /* ACE_WIN32 */
// Some useful abstrations for expressions involving
// ACE_Allocator.malloc (). The difference between ACE_NEW_MALLOC*
// with ACE_ALLOCATOR* is that they call constructors also.
#include "ace/OS_Errno.h" /* Need errno and ENOMEM */
# define ACE_ALLOCATOR_RETURN(POINTER,ALLOCATOR,RET_VAL) \
do { POINTER = ALLOCATOR; \
if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \
@@ -857,7 +798,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
do { POINTER = ALLOCATOR; \
if (POINTER == 0) { errno = ENOMEM; } \
} while (0)
# define ACE_NEW_MALLOC_RETURN(POINTER,ALLOCATOR,CONSTRUCTOR,RET_VAL) \
do { POINTER = ALLOCATOR; \
if (POINTER == 0) { errno = ENOMEM; return RET_VAL;} \
@@ -873,7 +813,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
if (POINTER == 0) { errno = ENOMEM;} \
else { (void) new (POINTER) CONSTRUCTOR; } \
} while (0)
/* ACE_Metrics */
#if defined ACE_LACKS_ARRAY_PLACEMENT_NEW
# define ACE_NEW_MALLOC_ARRAY_RETURN(POINTER,ALLOCATOR,CONSTRUCTOR,COUNT,RET_VAL) \
@@ -902,7 +841,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
else { (void) new (POINTER) CONSTRUCTOR [COUNT]; } \
} while (0)
#endif /* defined ACE_LACKS_ARRAY_PLACEMENT_NEW */
// This is being placed here temporarily to help stablelize the builds, but will
// be moved out along with the above macros as part of the subsetting. dhinton
#if !defined (ACE_LACKS_NEW_H)
@@ -912,9 +850,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# include /**/ <new.h>
# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
#endif /* ! ACE_LACKS_NEW_H */
# define ACE_NOOP(x)
#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
# define ACE_SEH_TRY __try
# define ACE_SEH_EXCEPT(X) __except(X)
@@ -924,48 +860,39 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SEH_EXCEPT(X) while (0)
# define ACE_SEH_FINALLY if (1)
#endif /* ACE_WIN32 */
// These should probably be put into a seperate header.
// The following is necessary since many C++ compilers don't support
// typedef'd types inside of classes used as formal template
// arguments... ;-(. Luckily, using the C++ preprocessor I can hide
// most of this nastiness!
# if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
// Handle ACE_Message_Queue.
# define ACE_SYNCH_DECL class _ACE_SYNCH
# define ACE_SYNCH_USE _ACE_SYNCH
# define ACE_SYNCH_MUTEX_T typename _ACE_SYNCH::MUTEX
# define ACE_SYNCH_CONDITION_T typename _ACE_SYNCH::CONDITION
# define ACE_SYNCH_SEMAPHORE_T typename _ACE_SYNCH::SEMAPHORE
// Handle ACE_Malloc*
# define ACE_MEM_POOL_1 class _ACE_MEM_POOL
# define ACE_MEM_POOL_2 _ACE_MEM_POOL
# define ACE_MEM_POOL _ACE_MEM_POOL
# define ACE_MEM_POOL_OPTIONS typename _ACE_MEM_POOL::OPTIONS
// Handle ACE_Svc_Handler
# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM
# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM
# define ACE_PEER_STREAM _ACE_PEER_STREAM
# define ACE_PEER_STREAM_ADDR typename _ACE_PEER_STREAM::PEER_ADDR
// Handle ACE_Acceptor
# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR
# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR
# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR
# define ACE_PEER_ACCEPTOR_ADDR typename _ACE_PEER_ACCEPTOR::PEER_ADDR
// Handle ACE_Connector
# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR
# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR
# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR
# define ACE_PEER_CONNECTOR_ADDR typename ACE_PEER_CONNECTOR::PEER_ADDR
# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_ADDR_TYPEDEF::sap_any
// Handle ACE_SOCK_*
# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor
# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector
@@ -973,41 +900,33 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SOCK_DGRAM ACE_SOCK_Dgram
# define ACE_SOCK_DGRAM_BCAST ACE_SOCK_Dgram_Bcast
# define ACE_SOCK_DGRAM_MCAST ACE_SOCK_Dgram_Mcast
// Handle ACE_SOCK_SEQPACK_*
# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor
# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector
# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association
// Handle ACE_MEM_*
# define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor
# define ACE_MEM_CONNECTOR ACE_MEM_Connector
# define ACE_MEM_STREAM ACE_MEM_Stream
// Handle ACE_LSOCK_*
# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor
# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector
# define ACE_LSOCK_STREAM ACE_LSOCK_Stream
// Handle ACE_TLI_*
# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor
# define ACE_TLI_CONNECTOR ACE_TLI_Connector
# define ACE_TLI_STREAM ACE_TLI_Stream
// Handle ACE_SPIPE_*
# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor
# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector
# define ACE_SPIPE_STREAM ACE_SPIPE_Stream
// Handle ACE_UPIPE_*
# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor
# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector
# define ACE_UPIPE_STREAM ACE_UPIPE_Stream
// Handle ACE_FILE_*
# define ACE_FILE_CONNECTOR ACE_FILE_Connector
# define ACE_FILE_STREAM ACE_FILE_IO
// Handle ACE_*_Memory_Pool.
# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool
# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool
@@ -1015,9 +934,7 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool
# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool
# define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool
# else /* TEMPLATES are broken in some form or another (i.e., most C++ compilers) */
// Handle ACE_Message_Queue.
# if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE)
# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T, class _ACE_SYNCH_SEMAPHORE_T
@@ -1029,32 +946,27 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SYNCH_MUTEX_T _ACE_SYNCH_MUTEX_T
# define ACE_SYNCH_CONDITION_T _ACE_SYNCH_CONDITION_T
# define ACE_SYNCH_SEMAPHORE_T _ACE_SYNCH_SEMAPHORE_T
// Handle ACE_Malloc*
# define ACE_MEM_POOL_1 class _ACE_MEM_POOL, class _ACE_MEM_POOL_OPTIONS
# define ACE_MEM_POOL_2 _ACE_MEM_POOL, _ACE_MEM_POOL_OPTIONS
# define ACE_MEM_POOL _ACE_MEM_POOL
# define ACE_MEM_POOL_OPTIONS _ACE_MEM_POOL_OPTIONS
// Handle ACE_Svc_Handler
# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM, class _ACE_PEER_ADDR
# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM, _ACE_PEER_ADDR
# define ACE_PEER_STREAM _ACE_PEER_STREAM
# define ACE_PEER_STREAM_ADDR _ACE_PEER_ADDR
// Handle ACE_Acceptor
# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR, class _ACE_PEER_ADDR
# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR, _ACE_PEER_ADDR
# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR
# define ACE_PEER_ACCEPTOR_ADDR _ACE_PEER_ADDR
// Handle ACE_Connector
# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR, class _ACE_PEER_ADDR
# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR, _ACE_PEER_ADDR
# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR
# define ACE_PEER_CONNECTOR_ADDR _ACE_PEER_ADDR
# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any
// Handle ACE_SOCK_*
# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor, ACE_INET_Addr
# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr
@@ -1062,41 +974,33 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_SOCK_DGRAM ACE_SOCK_Dgram, ACE_INET_Addr
# define ACE_SOCK_DGRAM_BCAST ACE_SOCK_Dgram_Bcast, ACE_INET_Addr
# define ACE_SOCK_DGRAM_MCAST ACE_SOCK_Dgram_Mcast, ACE_INET_Addr
// Handle ACE_SOCK_SEQPACK_*
# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor, ACE_Multihomed_INET_Addr
# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector, ACE_Multihomed_INET_Addr
# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association, ACE_Multihomed_INET_Addr
// Handle ACE_MEM_*
# define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor, ACE_MEM_Addr
# define ACE_MEM_CONNECTOR ACE_MEM_Connector, ACE_INET_Addr
# define ACE_MEM_STREAM ACE_MEM_Stream, ACE_INET_Addr
// Handle ACE_LSOCK_*
# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor, ACE_UNIX_Addr
# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector, ACE_UNIX_Addr
# define ACE_LSOCK_STREAM ACE_LSOCK_Stream, ACE_UNIX_Addr
// Handle ACE_TLI_*
# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor, ACE_INET_Addr
# define ACE_TLI_CONNECTOR ACE_TLI_Connector, ACE_INET_Addr
# define ACE_TLI_STREAM ACE_TLI_Stream, ACE_INET_Addr
// Handle ACE_SPIPE_*
# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor, ACE_SPIPE_Addr
# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector, ACE_SPIPE_Addr
# define ACE_SPIPE_STREAM ACE_SPIPE_Stream, ACE_SPIPE_Addr
// Handle ACE_UPIPE_*
# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor, ACE_SPIPE_Addr
# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector, ACE_SPIPE_Addr
# define ACE_UPIPE_STREAM ACE_UPIPE_Stream, ACE_SPIPE_Addr
// Handle ACE_FILE_*
# define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr
# define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr
// Handle ACE_*_Memory_Pool.
# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options
# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options
@@ -1105,7 +1009,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options
# define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool, ACE_Pagefile_Memory_Pool_Options
# endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
// Work around compilers that don't like in-class static integral
// constants. Constants in this case are meant to be compile-time
// constants so that they may be used as template arguments, for
@@ -1115,8 +1018,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
#else
# define ACE_STATIC_CONSTANT(TYPE, ASSIGNMENT) enum { ASSIGNMENT }
#endif /* !ACE_LACKS_STATIC_IN_CLASS_CONSTANTS */
#include /**/ "ace/post.h"
#endif /*ACE_GLOBAL_MACROS_H*/