diff options
| author | Alexej Harm <alexej.h@xiphos.de> | 2019-09-11 13:26:20 (GMT) |
|---|---|---|
| committer | Alexej Harm <alexej.h@xiphos.de> | 2019-09-11 13:26:20 (GMT) |
| commit | a3cfb66543d307e644e4df207f2e1305200ced02 (patch) | |
| tree | b4e39e681b8e1e11d88e49a01637910f1a826bf0 | |
| parent | 7f46e4a73a4d7aaa4029a04c532d2c99635383b9 (diff) | |
| download | CMake-a3cfb66543d307e644e4df207f2e1305200ced02.zip CMake-a3cfb66543d307e644e4df207f2e1305200ced02.tar.gz CMake-a3cfb66543d307e644e4df207f2e1305200ced02.tar.bz2 | |
Add compatibility with the cl.exe /permissive- compiler option
| -rw-r--r-- | Source/cmUVStreambuf.h | 2 | ||||
| -rw-r--r-- | 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<CharT, Traits>::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<wchar_t> buffer(size + 1); |