diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-11-19 19:17:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 19:17:10 -0800 |
| commit | 817100c793e0953f673068f1c4c6035cd80002c2 (patch) | |
| tree | c7eacafe5c2ea47c8629e9edbfabda61fdc271e9 | |
| parent | e013fa17ec560bbb97c74c277f1c4b52e49e63c2 (diff) | |
| download | vcpkg-817100c793e0953f673068f1c4c6035cd80002c2.tar.gz vcpkg-817100c793e0953f673068f1c4c6035cd80002c2.zip | |
[vcpkg] fix vs2015 build (#14659)
| -rw-r--r-- | toolsrc/include/vcpkg/base/lockguarded.h | 2 | ||||
| -rw-r--r-- | 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<T>& sync) : m_lock(sync.m_mutex), m_ptr(sync.m_t) { } private: - std::lock_guard<std::mutex> m_lock; + std::unique_lock<std::mutex> 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<decltype(ALL_POLICIES)> generate_all_policies() { - std::remove_const_t<decltype(ALL_POLICIES)> res; + std::remove_const_t<decltype(ALL_POLICIES)> res{}; for (size_t i = 0; i < res.size(); ++i) { res[i] = static_cast<BuildPolicy>(i); |