diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /toolsrc/include | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/base/expected.h | 3 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/base/span.h | 3 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/dependencies.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h index d8a2cacaa..fcf37bcaf 100644 --- a/toolsrc/include/vcpkg/base/expected.h +++ b/toolsrc/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/toolsrc/include/vcpkg/base/span.h b/toolsrc/include/vcpkg/base/span.h index 221cccc8c..a66205332 100644 --- a/toolsrc/include/vcpkg/base/span.h +++ b/toolsrc/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) { } diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 3cca364e7..080a28f52 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -67,6 +67,7 @@ namespace vcpkg::Dependencies std::string displayname() const; const std::string& public_abi() const; + bool has_package_abi() const; const Build::PreBuildInfo& pre_build_info(LineInfo linfo) const; PackageSpec spec; |