Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations .diff with TC changes added
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
// -*- C++ -*-
|
||||
//
|
||||
// $Id: config-g++-common.h 92120 2010-10-01 12:00:01Z johnnyw $
|
||||
// $Id: config-g++-common.h 93500 2011-03-07 16:19:27Z vzykov $
|
||||
|
||||
// This configuration file is designed to be included by another,
|
||||
// specific configuration file. It provides config information common
|
||||
@@ -24,20 +24,10 @@
|
||||
#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
|
||||
#define ACE_TEMPLATES_REQUIRE_SOURCE
|
||||
|
||||
#if ( __GNUC__ == 2 && __GNUC_MINOR__ < 97 )
|
||||
// gcc 2.97 and lower use old iostreams
|
||||
# define ACE_USES_OLD_IOSTREAMS
|
||||
#endif /* __GNUC__ >= 2.97 */
|
||||
|
||||
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
|
||||
# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
|
||||
#endif /* __GNUC__ >= 3.4 */
|
||||
|
||||
#if (__GNUC__ < 3)
|
||||
# define ACE_LACKS_MEMBER_TEMPLATES
|
||||
# define ACE_LACKS_NUMERIC_LIMITS
|
||||
#endif /* __GNUC__ < 3 */
|
||||
|
||||
#define ACE_NEW_THROWS_EXCEPTIONS
|
||||
#if (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
|
||||
// Versions of g++ prior to 3.3 had a buggy operator // new(nothrow)[]().
|
||||
@@ -73,6 +63,10 @@
|
||||
#define ACE_HAS_GCC_DEPRECATED_ATTRIBUTE 1
|
||||
#endif
|
||||
|
||||
#if !defined (ACE_HAS_GCC_FORMAT_ATTRIBUTE)
|
||||
#define ACE_HAS_GCC_FORMAT_ATTRIBUTE 1
|
||||
#endif
|
||||
|
||||
#if (ACE_HAS_GCC_CONSTRUCTOR_ATTRIBUTE == 1)
|
||||
# define ACE_GCC_CONSTRUCTOR_ATTRIBUTE __attribute__ ((constructor))
|
||||
#endif
|
||||
@@ -85,6 +79,11 @@
|
||||
#define ACE_DEPRECATED __attribute__ ((deprecated))
|
||||
#endif
|
||||
|
||||
#if (ACE_HAS_GCC_FORMAT_ATTRIBUTE == 1)
|
||||
# define ACE_GCC_FORMAT_ATTRIBUTE(TYPE, STR_INDEX, FIRST_INDEX) \
|
||||
__attribute__ ((format (TYPE, STR_INDEX, FIRST_INDEX)))
|
||||
#endif
|
||||
|
||||
// GNU g++ >= 4.x implements "#pragma once".
|
||||
#if (__GNUC__ < 4) && !defined (ACE_LACKS_PRAGMA_ONCE)
|
||||
// We define it with a -D with make depend.
|
||||
|
||||
Reference in New Issue
Block a user