Skip to content

C
capnproto
Commit 3305cbbe authored by Kenton Varda's avatar Kenton Varda
Browse files
Options

Fix MSVC: Remove MinGW-isms, rename lambda arg so it doesn't shadow captured variable.

parent 5efc3712
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
c++/src/kj/filesystem-disk-win32.c++
View file @ 3305cbbe
...@@ -57,7 +57,7 @@ struct REPARSE_DATA_BUFFER { ...@@ -57,7 +57,7 @@ struct REPARSE_DATA_BUFFER {
ULONG ReparseTag; ULONG ReparseTag;
USHORT ReparseDataLength; USHORT ReparseDataLength;
USHORT Reserved; USHORT Reserved;
_ANONYMOUS_UNION union { union {
struct { struct {
USHORT SubstituteNameOffset; USHORT SubstituteNameOffset;
USHORT SubstituteNameLength; USHORT SubstituteNameLength;
...@@ -76,7 +76,7 @@ struct REPARSE_DATA_BUFFER { ...@@ -76,7 +76,7 @@ struct REPARSE_DATA_BUFFER {
struct { struct {
UCHAR DataBuffer[1]; UCHAR DataBuffer[1];
} GenericReparseBuffer; } GenericReparseBuffer;
} DUMMYUNIONNAME; };
}; };
#define HIDDEN_PREFIX ".kj-tmp." #define HIDDEN_PREFIX ".kj-tmp."
...@@ -1023,8 +1023,8 @@ public: ...@@ -1023,8 +1023,8 @@ public:
if (has(mode, WriteMode::MODIFY)) { if (has(mode, WriteMode::MODIFY)) {
KJ_IF_MAYBE(tempName, KJ_IF_MAYBE(tempName,
createNamedTemporary(toPath, WriteMode::CREATE, [&](const wchar_t* tempName) { createNamedTemporary(toPath, WriteMode::CREATE, [&](const wchar_t* tempName2) {
return MoveFileW(wToPath.begin(), tempName); return MoveFileW(wToPath.begin(), tempName2);
})) { })) {
KJ_WIN32_HANDLE_ERRORS(MoveFileW(fromPath.begin(), wToPath.begin())) { KJ_WIN32_HANDLE_ERRORS(MoveFileW(fromPath.begin(), wToPath.begin())) {
default: default:
......
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