Merge branch 'develop'

This commit is contained in:
Neil Groves
2014-03-12 03:43:36 +00:00
8 changed files with 20 additions and 51 deletions

View File

@@ -356,7 +356,7 @@ namespace boost
OtherDifference,
Buffer
>& other,
typename enable_if<
typename ::boost::enable_if<
typename mpl::and_<
typename is_mutable_reference<OtherReference>::type,
typename is_const_reference<Reference>::type
@@ -387,7 +387,7 @@ namespace boost
, OtherDifference
, Buffer
>& other,
typename enable_if<
typename ::boost::enable_if<
typename mpl::or_<
typename mpl::and_<
typename is_mutable_reference<OtherReference>::type,
@@ -423,7 +423,7 @@ namespace boost
, OtherDifference
, Buffer
>& other,
typename enable_if<
typename ::boost::enable_if<
typename is_convertible_to_value_as_reference<
OtherReference
, Reference