From 817100c793e0953f673068f1c4c6035cd80002c2 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 19 Nov 2020 19:17:10 -0800 Subject: [vcpkg] fix vs2015 build (#14659) --- toolsrc/include/vcpkg/base/lockguarded.h | 2 +- toolsrc/src/vcpkg/build.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/include/vcpkg/base/lockguarded.h b/toolsrc/include/vcpkg/base/lockguarded.h index e573ec7b0..e49b0b5d9 100644 --- a/toolsrc/include/vcpkg/base/lockguarded.h +++ b/toolsrc/include/vcpkg/base/lockguarded.h @@ -29,7 +29,7 @@ namespace vcpkg::Util LockGuardPtr(LockGuarded& sync) : m_lock(sync.m_mutex), m_ptr(sync.m_t) { } private: - std::lock_guard m_lock; + std::unique_lock m_lock; T& m_ptr; }; } diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index e75f5b7c1..d418f71f5 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -214,7 +214,7 @@ namespace vcpkg::Build static std::remove_const_t generate_all_policies() { - std::remove_const_t res; + std::remove_const_t res{}; for (size_t i = 0; i < res.size(); ++i) { res[i] = static_cast(i); -- cgit v1.2.3