diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-30 18:21:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-31 08:19:14 +0200 |
| commit | 0cf0847b81ed48de01e66565d794ebbd9c663e79 (patch) | |
| tree | 55bc2cbf50a5dadea5abae84f123196147325647 /external | |
| parent | 63aa373631a192f261b0e5cb603357f5e9822efa (diff) | |
cl version 19.15.26726 (VS 2017 15.8.1) still produces those warnings
...see d84bf553afa510e5c674817fa480ac0af62e4945 "Silence external/boost
deprecated std::iterator warnings with MSVC 2017"
Change-Id: I886ce27b90184aa0044f5a89f40cdd69507a70c4
Reviewed-on: https://gerrit.libreoffice.org/59831
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/msvc2017.patch.0 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/boost/msvc2017.patch.0 b/external/boost/msvc2017.patch.0 index a032557542c9..525f3c95cbab 100644 --- a/external/boost/msvc2017.patch.0 +++ b/external/boost/msvc2017.patch.0 @@ -4,7 +4,7 @@ // Helper types //! Base iterator. -+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914 ++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914 +#pragma warning(push) +#pragma warning(disable: 4996) +#endif @@ -14,7 +14,7 @@ typename Traits::difference_type, typename Traits::pointer, typename Traits::reference> base_iterator; -+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914 ++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914 +#pragma warning(pop) +#endif @@ -26,12 +26,12 @@ namespace boost { -+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914 ++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914 +#pragma warning(push) +#pragma warning(disable: 4996) +#endif using std::iterator; -+#if defined _MSC_VER && !defined __clang__ && _MSC_VER == 1914 ++#if defined _MSC_VER && !defined __clang__ && _MSC_VER >= 1914 +#pragma warning(pop) +#endif |