diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-29 13:45:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-30 08:25:13 +0100 |
| commit | 83102e4fa21e22ae18d2bbd19e29b1d37f50bab9 (patch) | |
| tree | b979377c22ffead4ff842eb4cdb3a18899cb7c94 /external | |
| parent | f3ea5e21bea80004b04edbf0287d4a2e1aaef5d0 (diff) | |
Remove obsolete _MSC_VER checks
...after 206b8c4ae320d7d8614f21800d8f77fa29f8f5ff "On Windows, check for at
least Visual Studio 2017 version 15.7"
Change-Id: I38ee86e1649bbdc828a7e328f2dbbac0dc163c8a
Reviewed-on: https://gerrit.libreoffice.org/64250
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/clang-cl.patch.0 | 4 | ||||
| -rw-r--r-- | external/boost/msvc2017.patch.0 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0 index 3990f27eb3f5..e563c637e2c3 100644 --- a/external/boost/clang-cl.patch.0 +++ b/external/boost/clang-cl.patch.0 @@ -5,7 +5,7 @@ // that an Output Iterator have output_iterator_tag in its iterator_category if // that iterator is not bidirectional_iterator or random_access_iterator. -#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) -+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) || (defined __clang__ && BOOST_WORKAROUND(_MSC_VER, >= 1600)) ++#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) || defined __clang__ struct mutable_iterator_tag : boost::random_access_traversal_tag, std::input_iterator_tag { @@ -14,7 +14,7 @@ // iterator support // -#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) -+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) || (defined __clang__ && BOOST_WORKAROUND(_MSC_VER, >= 1600)) ++#if BOOST_WORKAROUND(BOOST_MSVC, >= 1600) || defined __clang__ // Deal with VC 2010 output_iterator_tag requirement typedef array_iterator<T,T*,mpl::size_t<NumDims>,reference, mutable_iterator_tag> iterator; diff --git a/external/boost/msvc2017.patch.0 b/external/boost/msvc2017.patch.0 index 525f3c95cbab..e888fd96aba4 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__ +#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__ +#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__ +#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__ +#pragma warning(pop) +#endif |