diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-02-25 10:21:26 +0600 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-02-25 06:48:39 +0100 |
| commit | 1cdf33d7485ec45c9ddcfcf7d1445f5b0a69dfec (patch) | |
| tree | 10da7d68a50b8c31931743ccf7b96851f0cd38ad /sdext | |
| parent | 3502484d53d0fdb8868f9bdfd35da99616451614 (diff) | |
Simplify boost includes, and drop unneeded warning suppression
Likely obsoleted by commit 046e9545956d8ad1d69345d6b4a4c0a33714d179
(Try to revert to use of file_iterator from boost on Windows, 2023-11-01).
Change-Id: Icddb21203755845f6d3c46ba168fb51443f04251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163896
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 1a78fde79de1..34424b9ec320 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -20,18 +20,7 @@ #include <pdfparse.hxx> -// boost using obsolete stuff -#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 -#include <boost/spirit/include/classic_core.hpp> -#include <boost/spirit/include/classic_utility.hpp> -#include <boost/spirit/include/classic_error_handling.hpp> -#include <boost/spirit/include/classic_file_iterator.hpp> +#include <boost/spirit/include/classic.hpp> #include <boost/bind/bind.hpp> #include <string.h> @@ -44,14 +33,6 @@ #include <sal/log.hxx> #include <utility> -// 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::classic; using namespace pdfparse; @@ -631,8 +612,4 @@ std::unique_ptr<PDFEntry> PDFReader::read(std::u16string_view aFileName) return pRet; } -#if defined(_MSC_VER) -#pragma warning(pop) -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |