reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-19 09:54:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'compile-msvc-permissive-off'

Browse Source 
a3cfb66543 Add compatibility with the cl.exe /permissive- compiler option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3803
This commit is contained in:
Brad King 2019-09-12 13:15:31 +00:00 committed by Kitware Robot
commit 9602bcfc62
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmUVStreambuf.h
View File

@ -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

3
Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
View File

@ -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);