[vcpkg] Fix build on old compilers. (microsoft#12950)

strega-nil · Aug 25, 2020 · f24b34d · f24b34d
1 parent ca99c15
commit f24b34d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/vcpkg/base/expected.h b/include/vcpkg/base/expected.h
@@ -4,6 +4,7 @@
 #include <vcpkg/base/stringliteral.h>
 
 #include <system_error>
+#include <type_traits>
 
 namespace vcpkg
 {
@@ -111,7 +112,7 @@ namespace vcpkg
  ExpectedT(S&& s, ExpectedRightTag = {}) : m_s(std::move(s)) { }
 
  ExpectedT(const T& t, ExpectedLeftTag = {}) : m_t(t) { }
- template<class = std::enable_if<!std::is_reference_v<T>>>
+ template<class = std::enable_if<!std::is_reference<T>::value>>
  ExpectedT(T&& t, ExpectedLeftTag = {}) : m_t(std::move(t))
  {
  }

diff --git a/include/vcpkg/base/span.h b/include/vcpkg/base/span.h
@@ -3,6 +3,7 @@
 #include <array>
 #include <cstddef>
 #include <initializer_list>
+#include <type_traits>
 #include <vector>
 
 namespace vcpkg
@@ -29,7 +30,7 @@ namespace vcpkg
  {
  }
 
- template<size_t N, class = std::enable_if_t<std::is_const_v<T>>>
+ template<size_t N, class = std::enable_if_t<std::is_const<T>::value>>
  constexpr Span(std::remove_const_t<T> (&arr)[N]) noexcept : m_ptr(arr), m_count(N)
  {
  }