Dep/ACE: Upgrade ACE -library to 5.8.3
--HG-- branch : trunk
This commit is contained in:
click
+14
-167
@@ -4,7 +4,7 @@
|
||||
/**
|
||||
* @file config-macros.h
|
||||
*
|
||||
* $Id: config-macros.h 88485 2010-01-12 13:36:59Z schmidt $
|
||||
* $Id: config-macros.h 91685 2010-09-09 09:35:14Z johnnyw $
|
||||
*
|
||||
* @author (Originally in OS.h)Doug Schmidt <[email protected]>
|
||||
* @author Jesper S. M|ller<[email protected]>
|
||||
@@ -21,15 +21,15 @@
|
||||
#ifndef ACE_CONFIG_MACROS_H
|
||||
#define ACE_CONFIG_MACROS_H
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "ace/config-win32.h"
|
||||
#else
|
||||
#include "ace/config.h"
|
||||
#endif
|
||||
#include "ace/config.h"
|
||||
|
||||
#include "ace/Version.h"
|
||||
#include "ace/Versioned_Namespace.h"
|
||||
|
||||
#if !defined (ACE_HAS_EXCEPTIONS)
|
||||
#define ACE_HAS_EXCEPTIONS
|
||||
#endif /* !ACE_HAS_EXCEPTIONS */
|
||||
|
||||
// ACE_HAS_TLI is used to decide whether to try any XTI/TLI functionality
|
||||
// so if it isn't set, set it. Capabilities and differences between
|
||||
// XTI and TLI favor XTI, but when deciding to do anything, as opposed to
|
||||
@@ -58,19 +58,6 @@
|
||||
# endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
|
||||
#endif /* ! ACE_DEFAULT_LOG_STREAM */
|
||||
|
||||
// These two are only for backward compatibility. You should avoid
|
||||
// using them if not necessary.
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
/**
|
||||
* @deprecated The ACE_SYNCH_1 macro is deprecated
|
||||
*/
|
||||
# define ACE_SYNCH_1 ACE_SYNCH_DECL
|
||||
/**
|
||||
* @deprecated The ACE_SYNCH_2 macro is deprecated
|
||||
*/
|
||||
# define ACE_SYNCH_2 ACE_SYNCH_USE
|
||||
#endif
|
||||
|
||||
// For Win32 compatibility...
|
||||
# if !defined (ACE_WSOCK_VERSION)
|
||||
# define ACE_WSOCK_VERSION 0, 0
|
||||
@@ -93,32 +80,6 @@
|
||||
# define ACE_INITIALIZE_MEMORY_BEFORE_USE
|
||||
# endif /* ACE_HAS_VALGRIND */
|
||||
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
/**
|
||||
* @deprecated The @c ACE_HAS_USING macros are deprecated
|
||||
*/
|
||||
# define ACE_USING using
|
||||
#endif /* !ACE_LACKS_DEPRECATED_MACROS */
|
||||
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
/**
|
||||
* @deprecated The @c ACE_TYPENAME macros is deprecated. Use standard
|
||||
* C++ keyword typename instead.
|
||||
*/
|
||||
# define ACE_TYPENAME typename
|
||||
#endif /* !ACE_LACKS_DEPRECATED_MACROS */
|
||||
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
/**
|
||||
* @deprecated The @c ACE_TEMPLATE_SPECIALIZATION and
|
||||
* @c ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION macros are
|
||||
* deprecated. Use standard C++ template specialization
|
||||
* syntax instead.
|
||||
*/
|
||||
# define ACE_TEMPLATE_SPECIALIZATION template<>
|
||||
# define ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
|
||||
#endif /* !ACE_LACKS_DEPRECATED_MACROS */
|
||||
|
||||
// =========================================================================
|
||||
// Perfect Multicast filting refers to RFC 3376, where a socket is only
|
||||
// delivered dgrams for groups joined even if it didn't bind the group
|
||||
@@ -158,45 +119,6 @@
|
||||
# endif
|
||||
# endif /* ACE_USES_FIFO_SEM */
|
||||
|
||||
// =========================================================================
|
||||
// RCSID Macros
|
||||
// =========================================================================
|
||||
|
||||
// By default, DO NOT include RCS Id strings in object code.
|
||||
#if ! defined (ACE_USE_RCSID)
|
||||
# define ACE_USE_RCSID 0
|
||||
#endif /* #if ! defined (ACE_USE_RCSID) */
|
||||
|
||||
#if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0))
|
||||
# if ! defined (ACE_RCSID)
|
||||
|
||||
// This hack has the following purposes:
|
||||
// 1. To define the RCS id string variable as a static char*, so
|
||||
// that there won't be any duplicate extern symbols at link
|
||||
// time.
|
||||
// 2. To have a RCS id string variable with a unique name for each
|
||||
// file.
|
||||
// 3. To avoid warnings of the type "variable declared and never
|
||||
// used".
|
||||
|
||||
# define ACE_RCSID(path, file, id) \
|
||||
static inline const char* get_rcsid_ ## path ## _ ## file (const char*) \
|
||||
{ \
|
||||
return id ; \
|
||||
} \
|
||||
static const char* rcsid_ ## path ## _ ## file = \
|
||||
get_rcsid_ ## path ## _ ## file ( rcsid_ ## path ## _ ## file ) ;
|
||||
|
||||
# endif /* #if ! defined (ACE_RCSID) */
|
||||
#else
|
||||
|
||||
// RCS id strings are not wanted.
|
||||
# if defined (ACE_RCSID)
|
||||
# undef ACE_RCSID
|
||||
# endif /* #if defined (ACE_RCSID) */
|
||||
# define ACE_RCSID(path, file, id) /* noop */
|
||||
#endif /* #if (defined (ACE_USE_RCSID) && (ACE_USE_RCSID != 0)) */
|
||||
|
||||
// =========================================================================
|
||||
// INLINE macros
|
||||
//
|
||||
@@ -222,31 +144,6 @@
|
||||
# define ACE_INLINE
|
||||
#endif /* __ACE_INLINE__ */
|
||||
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
// =========================================================================
|
||||
// EXPLICIT macro
|
||||
// =========================================================================
|
||||
|
||||
/**
|
||||
* @deprecated explicit is deprecated. ACE requires C++
|
||||
* "explicit" keyword support.
|
||||
*/
|
||||
# define ACE_EXPLICIT explicit
|
||||
#endif /* ACE_LACKS_DEPRECATED_MACROS */
|
||||
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
// =========================================================================
|
||||
// MUTABLE macro
|
||||
// =========================================================================
|
||||
|
||||
/**
|
||||
* @deprecated ACE_MUTABLE is deprecated. ACE requires C++ "mutable"
|
||||
* keyword support.
|
||||
*/
|
||||
# define ACE_MUTABLE mutable
|
||||
# define ACE_CONST_WHEN_MUTABLE const
|
||||
#endif /* ACE_LACKS_DEPRECATED_MACROS */
|
||||
|
||||
// ============================================================================
|
||||
// EXPORT macros
|
||||
//
|
||||
@@ -309,60 +206,6 @@
|
||||
|
||||
# define ACE_sap_any_cast(TYPE) reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any))
|
||||
|
||||
#if !defined (ACE_LACKS_DEPRECATED_MACROS)
|
||||
/**
|
||||
* @deprecated ACE_{static,reinterpret,dynamic,const}_cast@<@> is
|
||||
* deprecated. Directly use standard C++ casts instead.
|
||||
*/
|
||||
# define ACE_static_cast(TYPE, EXPR) static_cast<TYPE> (EXPR)
|
||||
# define ACE_static_cast_1_ptr(TYPE, T1, EXPR) static_cast<TYPE<T1> *> (EXPR)
|
||||
# define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR) static_cast<TYPE<T1, T2> *> (EXPR)
|
||||
# define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR) static_cast<TYPE<T1, T2, T3> *> (EXPR)
|
||||
# define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) static_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
|
||||
# define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
|
||||
# define ACE_static_cast_1_ref(TYPE, T1, EXPR) static_cast<TYPE<T1> &> (EXPR)
|
||||
# define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR) static_cast<TYPE<T1, T2> &> (EXPR)
|
||||
# define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR) static_cast<TYPE<T1, T2, T3> &> (EXPR)
|
||||
# define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) static_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
|
||||
# define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
|
||||
|
||||
# define ACE_const_cast(TYPE, EXPR) const_cast<TYPE> (EXPR)
|
||||
# define ACE_const_cast_1_ptr(TYPE, T1, EXPR) const_cast<TYPE<T1> *> (EXPR)
|
||||
# define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR) const_cast<TYPE<T1, T2> *> (EXPR)
|
||||
# define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR) const_cast<TYPE<T1, T2, T3> *> (EXPR)
|
||||
# define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) const_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
|
||||
# define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
|
||||
# define ACE_const_cast_1_ref(TYPE, T1, EXPR) const_cast<TYPE<T1> &> (EXPR)
|
||||
# define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR) const_cast<TYPE<T1, T2> &> (EXPR)
|
||||
# define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR) const_cast<TYPE<T1, T2, T3> &> (EXPR)
|
||||
# define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) const_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
|
||||
# define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
|
||||
|
||||
# define ACE_reinterpret_cast(TYPE, EXPR) reinterpret_cast<TYPE> (EXPR)
|
||||
# define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR) reinterpret_cast<TYPE<T1> *> (EXPR)
|
||||
# define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR) reinterpret_cast<TYPE<T1, T2> *> (EXPR)
|
||||
# define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR) reinterpret_cast<TYPE<T1, T2, T3> *> (EXPR)
|
||||
# define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
|
||||
# define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
|
||||
# define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR) reinterpret_cast<TYPE<T1> &> (EXPR)
|
||||
# define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR) reinterpret_cast<TYPE<T1, T2> &> (EXPR)
|
||||
# define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR) reinterpret_cast<TYPE<T1, T2, T3> &> (EXPR)
|
||||
# define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
|
||||
# define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
|
||||
|
||||
# define ACE_dynamic_cast(TYPE, EXPR) dynamic_cast<TYPE> (EXPR)
|
||||
# define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR) dynamic_cast<TYPE<T1> *> (EXPR)
|
||||
# define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR) dynamic_cast<TYPE<T1, T2> *> (EXPR)
|
||||
# define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR) dynamic_cast<TYPE<T1, T2, T3> *> (EXPR)
|
||||
# define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4> *> (EXPR)
|
||||
# define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR)
|
||||
# define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR) dynamic_cast<TYPE<T1> &> (EXPR)
|
||||
# define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR) dynamic_cast<TYPE<T1, T2> &> (EXPR)
|
||||
# define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR) dynamic_cast<TYPE<T1, T2, T3> &> (EXPR)
|
||||
# define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4> &> (EXPR)
|
||||
# define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR)
|
||||
#endif /* ACE_LACKS_DEPRECATED_MACROS */
|
||||
|
||||
# if !defined (ACE_CAST_CONST)
|
||||
// Sun CC 4.2, for example, requires const in reinterpret casts of
|
||||
// data members in const member functions. But, other compilers
|
||||
@@ -384,7 +227,7 @@
|
||||
#if !defined (ACE_UNUSED_ARG)
|
||||
# if defined (__GNUC__) && ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)))
|
||||
# define ACE_UNUSED_ARG(a) (void) (a)
|
||||
# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM)
|
||||
# elif defined (__GNUC__) || defined (ghs) || defined (__hpux) || defined (__DECCXX) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM)
|
||||
// Some compilers complain about "statement with no effect" with (a).
|
||||
// This eliminates the warnings, and no code is generated for the null
|
||||
// conditional statement. @note that may only be true if -O is enabled,
|
||||
@@ -399,11 +242,11 @@
|
||||
# endif /* ghs || __GNUC__ || ..... */
|
||||
#endif /* !ACE_UNUSED_ARG */
|
||||
|
||||
#if defined (_MSC_VER) || defined(__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC < 40000 || __HP_aCC >= 60500))
|
||||
#if defined (_MSC_VER) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (ACE_RM544) || defined (__USLC__) || defined (__DCC__) || defined (__PGI) || defined (__TANDEM) || (defined (__HP_aCC) && (__HP_aCC < 40000 || __HP_aCC >= 60500))
|
||||
# define ACE_NOTREACHED(a)
|
||||
#else /* __sgi || ghs || ..... */
|
||||
#else /* ghs || ..... */
|
||||
# define ACE_NOTREACHED(a) a
|
||||
#endif /* __sgi || ghs || ..... */
|
||||
#endif /* ghs || ..... */
|
||||
|
||||
// ============================================================================
|
||||
// ACE_ALLOC_HOOK* macros
|
||||
@@ -648,6 +491,10 @@ extern "C" u_long CLS##_Export _get_dll_unload_policy (void) \
|
||||
# define ACE_GCC_DESTRUCTOR_ATTRIBUTE
|
||||
#endif
|
||||
|
||||
#ifndef ACE_HAS_TEMPLATE_TYPEDEFS
|
||||
#define ACE_HAS_TEMPLATE_TYPEDEFS
|
||||
#endif
|
||||
|
||||
#ifndef ACE_DEPRECATED
|
||||
# define ACE_DEPRECATED
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user