diff options
Diffstat (limited to '3rdParty/Boost/src/boost/concept')
| -rw-r--r-- | 3rdParty/Boost/src/boost/concept/assert.hpp | 3 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/concept/detail/concept_def.hpp | 17 | ||||
| -rwxr-xr-x[-rw-r--r--] | 3rdParty/Boost/src/boost/concept/detail/concept_undef.hpp | 0 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/concept/detail/general.hpp | 11 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/concept/detail/msvc.hpp | 9 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/concept/usage.hpp | 8 | 
6 files changed, 20 insertions, 28 deletions
| diff --git a/3rdParty/Boost/src/boost/concept/assert.hpp b/3rdParty/Boost/src/boost/concept/assert.hpp index 80eca81..cf98179 100644 --- a/3rdParty/Boost/src/boost/concept/assert.hpp +++ b/3rdParty/Boost/src/boost/concept/assert.hpp @@ -19,6 +19,5 @@      && !defined(BOOST_NO_SFINAE)                                                    \                                                                                      \ -    && !(BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4)) \ -    && !(BOOST_WORKAROUND(__GNUC__, == 2)) +    && !(BOOST_WORKAROUND(__GNUC__, == 3) && BOOST_WORKAROUND(__GNUC_MINOR__, < 4))  // Note: gcc-2.96 through 3.3.x have some SFINAE, but no ability to diff --git a/3rdParty/Boost/src/boost/concept/detail/concept_def.hpp b/3rdParty/Boost/src/boost/concept/detail/concept_def.hpp index 79f628e..750561e 100644 --- a/3rdParty/Boost/src/boost/concept/detail/concept_def.hpp +++ b/3rdParty/Boost/src/boost/concept/detail/concept_def.hpp @@ -16,5 +16,4 @@  // Also defines an equivalent SomeNameConcept for backward compatibility.  // Maybe in the next release we can kill off the "Concept" suffix for good. -#if BOOST_WORKAROUND(__GNUC__, <= 3)  # define BOOST_concept(name, params)                                            \      template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) >       \ @@ -25,24 +24,8 @@        : name< BOOST_PP_SEQ_ENUM(params) >                                       \      {                                                                           \ -        /* at least 2.96 and 3.4.3 both need this */                            \ -        BOOST_PP_CAT(name,Concept)();                                           \      };                                                                          \                                                                                  \      template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) >       \      struct name                                                                 -#else -# define BOOST_concept(name, params)                                            \ -    template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) >       \ -    struct name; /* forward declaration */                                      \ -                                                                                \ -    template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) >       \ -    struct BOOST_PP_CAT(name,Concept)                                           \ -      : name< BOOST_PP_SEQ_ENUM(params) >                                       \ -    {                                                                           \ -    };                                                                          \ -                                                                                \ -    template < BOOST_PP_SEQ_FOR_EACH_I(BOOST_CONCEPT_typename,~,params) >       \ -    struct name                                                                 -#endif  // Helper for BOOST_concept, above. diff --git a/3rdParty/Boost/src/boost/concept/detail/concept_undef.hpp b/3rdParty/Boost/src/boost/concept/detail/concept_undef.hpp index 713db89..713db89 100644..100755 --- a/3rdParty/Boost/src/boost/concept/detail/concept_undef.hpp +++ b/3rdParty/Boost/src/boost/concept/detail/concept_undef.hpp diff --git a/3rdParty/Boost/src/boost/concept/detail/general.hpp b/3rdParty/Boost/src/boost/concept/detail/general.hpp index e3014c1..c88a1ed 100644 --- a/3rdParty/Boost/src/boost/concept/detail/general.hpp +++ b/3rdParty/Boost/src/boost/concept/detail/general.hpp @@ -66,8 +66,17 @@ struct requirement_<void(*)(Model)>  # endif +// Version check from https://svn.boost.org/trac/boost/changeset/82886 +// (boost/static_assert.hpp) +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))  +#define BOOST_CONCEPT_UNUSED_TYPEDEF __attribute__((unused)) +#else +#define BOOST_CONCEPT_UNUSED_TYPEDEF /**/ +#endif +  #  define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \      typedef ::boost::concepts::detail::instantiate<          \      &::boost::concepts::requirement_<ModelFnPtr>::failed>    \ -      BOOST_PP_CAT(boost_concept_check,__LINE__) +      BOOST_PP_CAT(boost_concept_check,__LINE__)             \ +      BOOST_CONCEPT_UNUSED_TYPEDEF  }} diff --git a/3rdParty/Boost/src/boost/concept/detail/msvc.hpp b/3rdParty/Boost/src/boost/concept/detail/msvc.hpp index 9fbd250..078dd22 100644 --- a/3rdParty/Boost/src/boost/concept/detail/msvc.hpp +++ b/3rdParty/Boost/src/boost/concept/detail/msvc.hpp @@ -7,4 +7,5 @@  # include <boost/preprocessor/cat.hpp>  # include <boost/concept/detail/backward_compatibility.hpp> +# include <boost/config.hpp>  # ifdef BOOST_OLD_CONCEPT_SUPPORT @@ -13,4 +14,8 @@  # endif +# ifdef BOOST_MSVC +#  pragma warning(push) +#  pragma warning(disable:4100) +# endif  namespace boost { namespace concepts { @@ -112,3 +117,7 @@ enum                                                    \  }} +# ifdef BOOST_MSVC +#  pragma warning(pop) +# endif +  #endif // BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP diff --git a/3rdParty/Boost/src/boost/concept/usage.hpp b/3rdParty/Boost/src/boost/concept/usage.hpp index 21547c3..e73370f 100644 --- a/3rdParty/Boost/src/boost/concept/usage.hpp +++ b/3rdParty/Boost/src/boost/concept/usage.hpp @@ -11,10 +11,4 @@  namespace boost { namespace concepts {  -# if BOOST_WORKAROUND(__GNUC__, == 2) - -#  define BOOST_CONCEPT_USAGE(model) ~model() - -# else  -  template <class Model>  struct usage_requirements @@ -38,6 +32,4 @@ struct usage_requirements  #  endif -# endif  -  }} // namespace boost::concepts | 
 Swift
 Swift