diff options
author | Brad King <brad.king@kitware.com> | 2019-09-12 13:15:31 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-12 13:16:56 (GMT) |
commit | 9602bcfc62d50d7bb302b02ae3b1f9afe941bae7 (patch) | |
tree | 78fa402278479ea4dab743710ac47ba5a7d32e48 /Source | |
parent | 1a1508c8b840ae016dc8db9da6be4cbe59d5f1aa (diff) | |
parent | a3cfb66543d307e644e4df207f2e1305200ced02 (diff) | |
download | CMake-9602bcfc62d50d7bb302b02ae3b1f9afe941bae7.zip CMake-9602bcfc62d50d7bb302b02ae3b1f9afe941bae7.tar.gz CMake-9602bcfc62d50d7bb302b02ae3b1f9afe941bae7.tar.bz2 |
Merge topic 'compile-msvc-permissive-off'
a3cfb66543 Add compatibility with the cl.exe /permissive- compiler option
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3803
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmUVStreambuf.h | 2 |
1 files changed, 1 insertions, 1 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 |