Fix MSVC: Work around MSVC 2015 constexpr bug.

81fc767e · Kenton Varda · 302dd170 · 81fc767e
Commit 81fc767e authored Dec 11, 2017 by Kenton Varda
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

filesystem-disk-win32.c++ c++/src/kj/filesystem-disk-win32.c++ +5 -0

No files found.
--- a/c++/src/kj/filesystem-disk-win32.c++
+++ b/c++/src/kj/filesystem-disk-win32.c++
@@ -285,7 +285,12 @@ protected:
  }
 };

+#if _MSC_VER < 1910
+// TODO(msvc): MSVC 2015 can't initialize a constexpr's vtable correctly.
+const MmapDisposer mmapDisposer = MmapDisposer();
+#else
 constexpr MmapDisposer mmapDisposer = MmapDisposer();
+#endif

 void* win32Mmap(HANDLE handle, MmapRange range, DWORD pageProtect, DWORD access) {
  HANDLE mappingHandle;