From a3cfb66543d307e644e4df207f2e1305200ced02 Mon Sep 17 00:00:00 2001 From: Alexej Harm Date: Wed, 11 Sep 2019 15:26:20 +0200 Subject: Add compatibility with the cl.exe /permissive- compiler option --- Source/cmUVStreambuf.h | 2 +- Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/cmUVStreambuf.h b/Source/cmUVStreambuf.h index 873352b..0737629 100644 --- a/Source/cmUVStreambuf.h +++ b/Source/cmUVStreambuf.h @@ -61,7 +61,7 @@ public: cmBasicUVStreambuf* close(); protected: - typename cmBasicUVStreambuf::int_type underflow() override; + typename cmBasicUVStreambuf::int_type underflow() override; std::streamsize showmanyc() override; // FIXME: Add write support diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp index 4b17875..593822a 100644 --- a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -10,7 +10,8 @@ std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name) { DWORD size = 0; - UINT status = MsiGetPropertyW(msi_handle, name.c_str(), L"", &size); + WCHAR value_buffer[] = L""; + UINT status = MsiGetPropertyW(msi_handle, name.c_str(), value_buffer, &size); if (status == ERROR_MORE_DATA) { std::vector buffer(size + 1); -- cgit v0.12