diff options
| author | Adam Majer <amajer@suse.com> | 2020-02-19 15:29:06 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <tchvatal@suse.com> | 2020-02-20 18:50:24 +0100 |
| commit | a7be9479a04de2f0059c5769bbd9dc354c84136b (patch) | |
| tree | 6238de55e0ede2c27eb5e84792f54186b7928998 /sdext | |
| parent | 578667856462c9f7374b0714c5cc311191122b00 (diff) | |
Move Boost.Spirit usage away from legacy namespace
Remove BOOST_SPIRIT_USE_OLD_NAMESPACE defines and move all usage
of Boost.Spirit to boost::spirit::classic namespace.
Change-Id: I7dc5bed4d1b51f4a0bd1a4ae40c2024222127ce3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89079
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal <tchvatal@suse.com>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/Library_pdfimport.mk | 1 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfparse.cxx | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index f0d38e624d1d..11a1a3e9aebf 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_defs,pdfimport, \ endif $(eval $(call gb_Library_add_defs,pdfimport, \ - -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ -DBOOST_ALL_NO_LIB \ )) diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index eff5b774597b..da5daa5bf6c1 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -50,7 +50,7 @@ #endif -using namespace boost::spirit; +using namespace boost::spirit::classic; using namespace pdfparse; namespace { @@ -560,12 +560,12 @@ std::unique_ptr<PDFEntry> PDFReader::read( const char* pBuffer, unsigned int nLe try { #if OSL_DEBUG_LEVEL > 0 - boost::spirit::parse_info<const char*> aInfo = + boost::spirit::classic::parse_info<const char*> aInfo = #endif - boost::spirit::parse( pBuffer, + boost::spirit::classic::parse( pBuffer, pBuffer+nLen, aGrammar, - boost::spirit::space_p ); + boost::spirit::classic::space_p ); #if OSL_DEBUG_LEVEL > 0 SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop = " << aInfo.stop << " (buff=" << pBuffer << ", offset = " << aInfo.stop - pBuffer << "), hit = " << (aInfo.hit ? OUString("true") : OUString("false")) << ", full = " << (aInfo.full ? OUString("true") : OUString("false")) << ", length = " << static_cast<int>(aInfo.length) ); #endif @@ -638,12 +638,12 @@ std::unique_ptr<PDFEntry> PDFReader::read( const char* pFileName ) try { #if OSL_DEBUG_LEVEL > 0 - boost::spirit::parse_info< file_iterator<> > aInfo = + boost::spirit::classic::parse_info< file_iterator<> > aInfo = #endif - boost::spirit::parse( file_start, + boost::spirit::classic::parse( file_start, file_end, aGrammar, - boost::spirit::space_p ); + boost::spirit::classic::space_p ); #if OSL_DEBUG_LEVEL > 0 SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop at offset = " << aInfo.stop - file_start << ", hit = " << (aInfo.hit ? "true" : "false") << ", full = " << (aInfo.full ? "true" : "false") << ", length = " << aInfo.length); #endif |