include/o3tl/array_view.hxx | 4 ++--
include/o3tl/string_view.hxx | 9 ---------
2 files changed, 2 insertions(+), 11 deletions(-)
New commits:
commit 1e96364cf016097ab01ef933fff02f629e7b1884
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date: Wed Jan 31 20:39:33 2018 +0300
o3tl: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Id9d038d50d5b6335a2f354c759b2c1e5dd413cec
Reviewed-on: https://gerrit.libreoffice.org/49037
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
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>;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
