sdext/source/pdfimport/pdfparse/pdfparse.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
New commits: commit 20cf158b85d40bdc7e1092dcbfe648c48339aec6 Author: Michael Stahl <mst...@redhat.com> Date: Thu Feb 15 20:56:41 2018 +0100 sdext: disable the warnings TWICE because they're sneaky bastards Let's hope this will finally work, it was like this before commit 4e102d6a4b483098e80ca86e19ee8576ae5356f1 Change-Id: I6337d4f1abc386e71747b2a37e55a3578bcbf340 diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index e8636a4a2dab..97ba78d2a80b 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -21,9 +21,10 @@ #include <pdfparse.hxx> // boost using obsolete stuff -#if defined(_MSC_VER) && _MSC_VER >= 1900 +#if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4996) +#pragma warning(disable:4503) #endif // workaround windows compiler: do not include multi_pass.hpp @@ -38,6 +39,15 @@ #include <rtl/strbuf.hxx> #include <rtl/alloc.h> +// disable warnings again because someone along the line has enabled them +// (we have included boost headers, what did you expect?) +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4996) +#pragma warning(disable:4503) +#endif + + using namespace boost::spirit; using namespace pdfparse; @@ -677,7 +687,7 @@ PDFEntry* PDFReader::read( const char* pFileName ) #endif // WIN32 } -#if defined(_MSC_VER) && _MSC_VER >= 1900 +#if defined(_MSC_VER) #pragma warning(pop) #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits