Skip to content

Commit

Permalink
Fix #1856 (#1857)
Browse files Browse the repository at this point in the history
Fixes #1856
  • Loading branch information
lalitb authored Dec 10, 2022
1 parent 75f3900 commit f1f6083
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ using IsMoveAssignableImpl = decltype(std::declval<T&>() = std::declval<T&&>());

} // namespace type_traits_internal

// MSVC 19.20 has a regression that causes our workarounds to fail, but their
// MSVC 19.10 and higher have a regression that causes our workarounds to fail, but their
// std forms now appear to be compliant.
#if defined(_MSC_VER) && !defined(__clang__) && (_MSC_VER >= 1920)
#if defined(_MSC_VER) && !defined(__clang__) && (_MSC_VER >= 1910)

template <typename T>
using is_copy_assignable = std::is_copy_assignable<T>;
Expand Down
4 changes: 2 additions & 2 deletions api/include/opentelemetry/nostd/string_view.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ inline bool operator==(string_view lhs, string_view rhs) noexcept
{
return lhs.length() == rhs.length() &&
# if defined(_MSC_VER)
# if _MSC_VER == 1900
// Avoid SCL error in Visual Studio 2015
# if _MSC_VER >= 1900 && _MSC_VER <= 1911
// Avoid SCL error in Visual Studio 2015, VS2017 update 1 to update 4
(std::memcmp(lhs.data(), rhs.data(), lhs.length()) == 0);
# else
std::equal(lhs.data(), lhs.data() + lhs.length(), rhs.data());
Expand Down

0 comments on commit f1f6083

Please sign in to comment.