boostorg/mpl
1
0
Fork 1
mirror of https://github.com/boostorg/mpl.git synced 2025-08-06 08:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some config; rationalized # directives, used BOOST_WORKAROUND

Browse Source 
[SVN r18227]
This commit is contained in:
Dave Abrahams
2003-04-10 12:45:19 +00:00
parent 2a5b68c117
commit d808e1fff1
2 changed files with 99 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/mpl/aux_/config/overload_resolution.hpp
View File

@@ -18,11 +18,15 @@
#define BOOST_MPL_AUX_CONFIG_OVERLOAD_RESOLUTION_HPP_INCLUDED #define BOOST_MPL_AUX_CONFIG_OVERLOAD_RESOLUTION_HPP_INCLUDED
#include "boost/config.hpp" #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 # define BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION
# endif
#endif #endif
#endif // BOOST_MPL_AUX_CONFIG_OVERLOAD_RESOLUTION_HPP_INCLUDED #endif // BOOST_MPL_AUX_CONFIG_OVERLOAD_RESOLUTION_HPP_INCLUDED

31
include/boost/mpl/aux_/has_xxx.hpp
View File

@@ -22,10 +22,11 @@
#include "boost/mpl/aux_/config/msvc_typename.hpp" #include "boost/mpl/aux_/config/msvc_typename.hpp"
#include "boost/mpl/aux_/config/overload_resolution.hpp" #include "boost/mpl/aux_/config/overload_resolution.hpp"
#include "boost/mpl/aux_/config/static_constant.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 // 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) // Rani Sharoni (comp.lang.c++.moderated, 2002-03-17 07:45:09 PST)
@@ -37,10 +38,10 @@ trait##_helper( \
boost::mpl::aux::type_wrapper<T> const volatile* \ boost::mpl::aux::type_wrapper<T> const volatile* \
, boost::mpl::aux::type_wrapper<BOOST_MSVC_TYPENAME T::name>* = 0 \ , boost::mpl::aux::type_wrapper<BOOST_MSVC_TYPENAME T::name>* = 0 \
); \ ); \
\ \
boost::mpl::aux::no_tag \ boost::mpl::aux::no_tag \
trait##_helper(...); \ trait##_helper(...); \
\ \
template< typename T > \ template< typename T > \
struct trait \ struct trait \
{ \ { \
@@ -54,9 +55,9 @@ struct trait \
# else # else
#include "boost/mpl/if.hpp" # include "boost/mpl/if.hpp"
#include "boost/mpl/bool.hpp" # include "boost/mpl/bool.hpp"
#include "boost/preprocessor/cat.hpp" # include "boost/preprocessor/cat.hpp"
// agurt, 11/sep/02: MSVC version, based on a USENET newsgroup's posting by // agurt, 11/sep/02: MSVC version, based on a USENET newsgroup's posting by
// John Madsen (comp.lang.c++.moderated, 1999-11-12 19:17:06 GMT); // John Madsen (comp.lang.c++.moderated, 1999-11-12 19:17:06 GMT);
@@ -93,14 +94,14 @@ struct BOOST_PP_CAT(trait,_impl) : T \
private: \ private: \
static boost::mpl::aux::no_tag test(void(*)(::boost::mpl::aux::has_xxx_tag)); \ static boost::mpl::aux::no_tag test(void(*)(::boost::mpl::aux::has_xxx_tag)); \
static boost::mpl::aux::yes_tag test(...); \ static boost::mpl::aux::yes_tag test(...); \
\ \
public: \ public: \
BOOST_STATIC_CONSTANT(bool, value = \ BOOST_STATIC_CONSTANT(bool, value = \
sizeof(test(static_cast<void(*)(name)>(0))) \ sizeof(test(static_cast<void(*)(name)>(0))) \
!= sizeof(boost::mpl::aux::no_tag) \ != sizeof(boost::mpl::aux::no_tag) \
); \ ); \
}; \ }; \
\ \
template< typename T > struct trait \ template< typename T > struct trait \
: boost::mpl::if_c< \ : boost::mpl::if_c< \
boost::mpl::aux::msvc_is_incomplete<T>::value \ boost::mpl::aux::msvc_is_incomplete<T>::value \
@@ -109,7 +110,7 @@ template< typename T > struct trait \
>::type \ >::type \
{ \ { \
}; \ }; \
\ \
BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, void) \ BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, void) \
BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, bool) \ BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, bool) \
BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, char) \ BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, char) \
@@ -133,16 +134,20 @@ template<> struct trait<T> \
}; \ }; \
/**/ /**/
#if !defined(BOOST_NO_INTRINSIC_WCHAR_T) # if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
# define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, unused) \ # define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, unused) \
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) \ BOOST_MPL_AUX_HAS_XXX_TRAIT_SPEC(trait, wchar_t) \
/**/ /**/
#else
# else
# define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, unused) \ # define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, unused) \
BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF_(trait, name, unused) \ BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF_(trait, name, unused) \
/**/ /**/
#endif
# endif
# endif // BOOST_MSVC > 1300 # endif // BOOST_MSVC > 1300