Commit 9c576391 authored by Kenton Varda's avatar Kenton Varda Committed by GitHub

Merge pull request #410 from harrishancock/msvc-fixes

Fix MSVC build errors
parents 556e63dd a09f4080
...@@ -524,7 +524,7 @@ struct Mapper { ...@@ -524,7 +524,7 @@ struct Mapper {
} }
return builder.finish(); return builder.finish();
} }
typedef decltype(*(array).begin()) Element; typedef decltype(*kj::instance<T>().begin()) Element;
}; };
template <typename T, size_t s> template <typename T, size_t s>
......
...@@ -122,7 +122,7 @@ private: ...@@ -122,7 +122,7 @@ private:
auto partPtr = part.asPtr(); auto partPtr = part.asPtr();
parts.add(kj::mv(part)); parts.add(kj::mv(part));
return input.tryRead(partPtr.begin(), partPtr.size(), partPtr.size()) return input.tryRead(partPtr.begin(), partPtr.size(), partPtr.size())
.then([this,partPtr,total](size_t amount) -> Promise<uint64_t> { .then([this,KJ_CPCAP(partPtr),total](size_t amount) -> Promise<uint64_t> {
uint64_t newTotal = total + amount; uint64_t newTotal = total + amount;
if (amount < partPtr.size()) { if (amount < partPtr.size()) {
return newTotal; return newTotal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment