Merge branch 'develop'

This commit is contained in:
Peter Dimov
2018-07-12 16:59:32 +03:00

View File

@ -252,12 +252,7 @@ namespace boost {
n = i - j; n = i - j;
} }
private: private:
// MSVC 14.1 - avoid C4596: 'difference_type': illegal qualified name in member declaration BOOST_DEDUCED_TYPENAME BidirectionalIteratorConcept<Iterator>::difference_type n;
#if defined(_MSC_VER) && _MSC_VER >= 1912
BOOST_DEDUCED_TYPENAME difference_type n;
#else
BOOST_DEDUCED_TYPENAME RandomAccessIteratorConcept::difference_type n;
#endif
Iterator i; Iterator i;
Iterator j; Iterator j;
#endif #endif