*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
// -*- C++ -*-
|
||||
//
|
||||
// $Id: config-icc-common.h 81935 2008-06-12 22:01:53Z jtc $
|
||||
|
||||
#ifndef ACE_LINUX_ICC_COMMON_H
|
||||
#define ACE_LINUX_ICC_COMMON_H
|
||||
#include /**/ "ace/pre.h"
|
||||
|
||||
# define ACE_HAS_CPLUSPLUS_HEADERS
|
||||
# define ACE_HAS_STDCPP_STL_INCLUDES
|
||||
# define ACE_HAS_TEMPLATE_TYPEDEFS
|
||||
@@ -13,7 +11,6 @@
|
||||
# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
|
||||
# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
|
||||
# define ACE_HAS_STRING_CLASS
|
||||
|
||||
#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
|
||||
# undef ACE_HAS_CUSTOM_EXPORT_MACROS
|
||||
# if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS)
|
||||
@@ -26,7 +23,6 @@
|
||||
# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */
|
||||
# define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
|
||||
# define ACE_Proper_Import_Flag __attribute__ ((visibility("default")))
|
||||
|
||||
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
|
||||
// Sadly, G++ 4.x silently ignores visibility attributes on
|
||||
// template instantiations, which breaks singletons.
|
||||
@@ -40,7 +36,6 @@
|
||||
# define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1
|
||||
# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T
|
||||
# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>;
|
||||
@@ -54,13 +49,11 @@
|
||||
template class SINGLETON_TYPE<CLASS, LOCK>; \
|
||||
_Pragma ("GCC visibility pop")
|
||||
# endif /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */
|
||||
|
||||
// Note that the "__extension__" is needed to prevent g++ from issuing
|
||||
// an error when using its "-pedantic" command line flag.
|
||||
# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
|
||||
# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
|
||||
#endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
|
||||
|
||||
// __EXCEPTIONS is defined with -fexceptions, the egcs default. It
|
||||
// is not defined with -fno-exceptions, the ACE default for g++.
|
||||
// ACE_HAS_EXCEPTIONS is defined in
|
||||
@@ -69,15 +62,12 @@
|
||||
# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS)
|
||||
# define ACE_HAS_EXCEPTIONS
|
||||
# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */
|
||||
|
||||
# if defined (ACE_HAS_EXCEPTIONS)
|
||||
# define ACE_NEW_THROWS_EXCEPTIONS
|
||||
# endif /* ACE_HAS_EXCEPTIONS */
|
||||
|
||||
#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
|
||||
# define ACE_SIZEOF_LONG_DOUBLE 12
|
||||
#endif /* i386 */
|
||||
|
||||
#if !defined (__MINGW32__) && (defined (i386) || defined (__i386__))
|
||||
// If running an Intel, assume that it's a Pentium so that
|
||||
// ACE_OS::gethrtime () can use the RDTSC instruction. If running a
|
||||
@@ -86,29 +76,23 @@
|
||||
// protection, so it can be ignored.)
|
||||
# define ACE_HAS_PENTIUM
|
||||
#endif /* i386 */
|
||||
|
||||
#if (defined (ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__))
|
||||
# define ACE_HAS_INTEL_ASSEMBLY
|
||||
#endif
|
||||
|
||||
#if !defined (ACE_LACKS_PRAGMA_ONCE)
|
||||
// We define it with a -D with make depend.
|
||||
# define ACE_LACKS_PRAGMA_ONCE
|
||||
#endif /* ! ACE_LACKS_PRAGMA_ONCE */
|
||||
|
||||
#define ACE_TEMPLATES_REQUIRE_SOURCE
|
||||
|
||||
#if (__INTEL_COMPILER >= 910)
|
||||
# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
|
||||
#endif
|
||||
|
||||
#if defined (__ia64)
|
||||
# define ACE_HAS_IA64INTRIN_H
|
||||
# define ACE_HAS_INTRINSIC_INTERLOCKED
|
||||
#else
|
||||
# define ACE_HAS_IA32INTRIN_H
|
||||
#endif
|
||||
|
||||
#include /**/ "ace/post.h"
|
||||
#endif /* ACE_LINUX_ICC_COMMON_H */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user