Merge warning fixes from develop.

This commit is contained in:
Daniel James
2013-12-08 11:23:31 +00:00
2 changed files with 11 additions and 2 deletions

View File

@@ -65,10 +65,19 @@ struct requirement_<void(*)(Model)>
# endif # 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 ) \ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
typedef ::boost::concepts::detail::instantiate< \ typedef ::boost::concepts::detail::instantiate< \
&::boost::concepts::requirement_<ModelFnPtr>::failed> \ &::boost::concepts::requirement_<ModelFnPtr>::failed> \
BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check,__LINE__) \
BOOST_CONCEPT_UNUSED_TYPEDEF
}} }}

View File

@@ -878,7 +878,7 @@ namespace boost
typename BackInsertionSequence::const_reference typename BackInsertionSequence::const_reference
r = cc.back(); r = cc.back();
ignore_unused_variable_warning(r); ignore_unused_variable_warning(r);
}; }
S c; S c;
typename S::value_type t; typename S::value_type t;
}; };