Merge remote-tracking branch 'origin/master' into development

This commit is contained in:
John Wellbelove 2017-07-21 19:33:01 +01:00
commit 51a14b90f6

View File

@ -471,7 +471,7 @@ namespace
CHECK_EQUAL(6U, data.size());
CHECK_EQUAL(6, std::distance(data.begin(), data.end()));
CHECK_EQUAL(std::distance(compare_data.begin(), compare_data.end()), data.size());
CHECK_EQUAL(size_t(std::distance(compare_data.begin(), compare_data.end())), data.size());
are_equal = std::equal(data.begin(), data.end(), compare_data.begin());
CHECK(are_equal);