Merge remote-tracking branch 'refs/remotes/Microsoft/master'

This commit is contained in:
Vladislav Yaroslavlev
2015-11-12 10:47:49 +03:00
2 changed files with 2 additions and 2 deletions

View File

@ -138,7 +138,7 @@ basic_string_span<T, dynamic_range> ensure_z(T(&sz)[N]) { return ensure_z(&sz[0]
template<class Cont>
basic_string_span<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_range> ensure_z(Cont& cont)
{
return ensure_z(cont.data(), cont.length());
return ensure_z(cont.data(), static_cast<std::ptrdiff_t>(cont.length()));
}
//