mirror of
https://github.com/boostorg/mpl.git
synced 2025-08-03 14:54:30 +02:00
Fixed some config; rationalized # directives, used BOOST_WORKAROUND
[SVN r18227]
This commit is contained in:
@@ -18,11 +18,15 @@
|
||||
#define BOOST_MPL_AUX_CONFIG_OVERLOAD_RESOLUTION_HPP_INCLUDED
|
||||
|
||||
#include "boost/config.hpp"
|
||||
#include "boost/detail/workaround.hpp"
|
||||
|
||||
#if !defined(BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION)
|
||||
|
||||
# if BOOST_WORKAROUND(__BORLANDC__, <= 0x561) || BOOST_WORKAROUND(__MWERKS__, < 0x3001)
|
||||
|
||||
#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x561 || !defined(BOOST_STRICT_CONFIG)) \
|
||||
|| defined(__MWERKS__) && __MWERKS__ < 0x3001 \
|
||||
&& !defined(BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION)
|
||||
# define BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION
|
||||
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif // BOOST_MPL_AUX_CONFIG_OVERLOAD_RESOLUTION_HPP_INCLUDED
|
||||
|
@@ -22,10 +22,11 @@
|
||||
#include "boost/mpl/aux_/config/msvc_typename.hpp"
|
||||
#include "boost/mpl/aux_/config/overload_resolution.hpp"
|
||||
#include "boost/mpl/aux_/config/static_constant.hpp"
|
||||
#include "boost/detail/workaround.hpp"
|
||||
|
||||
#if !defined(BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION) && (!defined(__GNUC__) || __GNUC__ == 3)
|
||||
#if !defined(BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION) && !BOOST_WORKAROUND(__GNUC__, <= 2)
|
||||
|
||||
# if (!defined(BOOST_MSVC) || BOOST_MSVC > 1300)
|
||||
# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
|
||||
|
||||
// the implementation below is based on a USENET newsgroup's posting by
|
||||
// Rani Sharoni (comp.lang.c++.moderated, 2002-03-17 07:45:09 PST)
|
||||
@@ -134,14 +135,18 @@ template<> struct trait<T> \
|
||||
/**/
|
||||
|
||||
# if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
|
||||
|
||||
# define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, unused) \
|
||||
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF_(trait, name, unused) \
|
||||
BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, wchar_t) \
|
||||
/**/
|
||||
|
||||
# else
|
||||
|
||||
# define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, unused) \
|
||||
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF_(trait, name, unused) \
|
||||
/**/
|
||||
|
||||
# endif
|
||||
|
||||
# endif // BOOST_MSVC > 1300
|
||||
|
Reference in New Issue
Block a user