diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/boost/clang-cl.patch.0 | |
parent | Initial commit. (diff) | |
download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/boost/clang-cl.patch.0')
-rw-r--r-- | external/boost/clang-cl.patch.0 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0 new file mode 100644 index 000000000..45137f9ff --- /dev/null +++ b/external/boost/clang-cl.patch.0 @@ -0,0 +1,20 @@ +--- boost/multi_array/base.hpp ++++ boost/multi_array/base.hpp +@@ -222,7 +222,7 @@ + // MSVC 2010 is broken in debug mode: it requires + // 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__ + struct mutable_iterator_tag + : boost::random_access_traversal_tag, std::input_iterator_tag + { +@@ -274,7 +274,7 @@ + // + // iterator support + // +-#if BOOST_WORKAROUND(BOOST_MSVC, >= 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; |