update boost
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
|
||||
# ifdef BOOST_MSVC
|
||||
# include <boost/concept/detail/msvc.hpp>
|
||||
# elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
|
||||
# elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
|
||||
# include <boost/concept/detail/borland.hpp>
|
||||
# else
|
||||
# include <boost/concept/detail/general.hpp>
|
||||
|
||||
@@ -28,7 +28,14 @@ namespace detail
|
||||
template <class Model>
|
||||
struct requirement
|
||||
{
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wnonnull"
|
||||
# endif
|
||||
static void failed() { ((Model*)0)->~Model(); }
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic pop
|
||||
# endif
|
||||
};
|
||||
|
||||
struct failed {};
|
||||
@@ -36,7 +43,14 @@ struct failed {};
|
||||
template <class Model>
|
||||
struct requirement<failed ************ Model::************>
|
||||
{
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wnonnull"
|
||||
# endif
|
||||
static void failed() { ((Model*)0)->~Model(); }
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic pop
|
||||
# endif
|
||||
};
|
||||
|
||||
# ifdef BOOST_OLD_CONCEPT_SUPPORT
|
||||
@@ -44,7 +58,14 @@ struct requirement<failed ************ Model::************>
|
||||
template <class Model>
|
||||
struct constraint
|
||||
{
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wnonnull"
|
||||
# endif
|
||||
static void failed() { ((Model*)0)->constraints(); }
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic pop
|
||||
# endif
|
||||
};
|
||||
|
||||
template <class Model>
|
||||
|
||||
@@ -65,7 +65,7 @@ struct Requires_ : ::boost::ccheck_aux::unaryfunptr_arg_type<Result>
|
||||
# define BOOST_CONCEPT_REQUIRES(models, result) \
|
||||
typename ::boost::ccheck_aux::unaryfunptr_arg_type<void(*)result>::type
|
||||
|
||||
#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
|
||||
#elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
|
||||
|
||||
// Same thing as below without the initial typename
|
||||
# define BOOST_CONCEPT_REQUIRES(models, result) \
|
||||
|
||||
@@ -13,7 +13,14 @@ namespace boost { namespace concepts {
|
||||
template <class Model>
|
||||
struct usage_requirements
|
||||
{
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wnonnull"
|
||||
# endif
|
||||
~usage_requirements() { ((Model*)0)->~Model(); }
|
||||
# if defined(BOOST_GCC) && (BOOST_GCC >= 110000)
|
||||
# pragma GCC diagnostic pop
|
||||
# endif
|
||||
};
|
||||
|
||||
# if BOOST_WORKAROUND(__GNUC__, <= 3)
|
||||
|
||||
Reference in New Issue
Block a user