diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 20:39:33 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-01 17:56:23 +0100 |
| commit | 1e96364cf016097ab01ef933fff02f629e7b1884 (patch) | |
| tree | f812939a00f93e7c485fa2bb7e0ca9e895729516 /include/o3tl | |
| parent | 682cef7d375f38656ec6b4b91213524d40586f44 (diff) | |
o3tl: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Id9d038d50d5b6335a2f354c759b2c1e5dd413cec
Reviewed-on: https://gerrit.libreoffice.org/49037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/o3tl')
| -rw-r--r-- | include/o3tl/array_view.hxx | 4 | ||||
| -rw-r--r-- | include/o3tl/string_view.hxx | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/include/o3tl/array_view.hxx b/include/o3tl/array_view.hxx index 2913010fab89..3630955a927b 100644 --- a/include/o3tl/array_view.hxx +++ b/include/o3tl/array_view.hxx @@ -36,8 +36,8 @@ namespace o3tl { #if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4814) // in C++14 'constexpr' will not imply 'const' +#pragma warning(push) +#pragma warning(disable: 4522) // multiple assignment operators specified #endif /** A barebones approximation of C++17(?) <array_view>. diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx index ae284b20173d..303e4800af79 100644 --- a/include/o3tl/string_view.hxx +++ b/include/o3tl/string_view.hxx @@ -152,11 +152,6 @@ template<std::size_t N> struct ConstWcharArrayDetector<wchar_t const[N]> { } -#if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4814) // in C++14 'constexpr' will not imply 'const' -#endif - template<typename charT, typename traits = std::char_traits<charT>> class basic_string_view { public: @@ -825,10 +820,6 @@ operator <<( return os; } -#if defined _MSC_VER -#pragma warning(pop) -#endif - using string_view = basic_string_view<char>; using u16string_view = basic_string_view<char16_t>; using u32string_view = basic_string_view<char32_t>; |