Commit 9602bcfc authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'compile-msvc-permissive-off'

a3cfb665

 Add compatibility with the cl.exe /permissive- compiler option
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3803
parents 1a1508c8 a3cfb665
......@@ -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
......
......@@ -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);
......
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