strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Boost.Spirit usage away from legacy namespace

Browse source 
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>
This commit is contained in:
Adam Majer 2020-02-19 15:29:06 +01:00 committed by Tomáš Chvátal
parent 5786678564
commit a7be9479a0
10 changed files with 71 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
connectivity/Library_dbtools.mk
View file

@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,dbtools))
$(eval $(call gb_Library_add_defs,dbtools,\
-DOOO_DLLIMPLEMENTATION_DBTOOLS \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))

36
connectivity/source/commontools/RowFunctionParser.cxx
View file

@ -282,7 +282,7 @@ public:
( '-' multiplicative_expression )* )
*/
class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar >
{
public:
/** Create an arithmetic expression grammar
@ -301,14 +301,14 @@ public:
// grammar definition
explicit definition( const ExpressionGrammar& self )
{
using ::boost::spirit::space_p;
using ::boost::spirit::range_p;
using ::boost::spirit::lexeme_d;
using ::boost::spirit::ch_p;
using ::boost::spirit::int_p;
using ::boost::spirit::as_lower_d;
using ::boost::spirit::strlit;
using ::boost::spirit::inhibit_case;
using ::boost::spirit::classic::space_p;
using ::boost::spirit::classic::range_p;
using ::boost::spirit::classic::lexeme_d;
using ::boost::spirit::classic::ch_p;
using ::boost::spirit::classic::int_p;
using ::boost::spirit::classic::as_lower_d;
using ::boost::spirit::classic::strlit;
using ::boost::spirit::classic::inhibit_case;
typedef inhibit_case<strlit<> > token_t;
@ -360,7 +360,7 @@ public:
BOOST_SPIRIT_DEBUG_RULE(andExpression);
}
const ::boost::spirit::rule< ScannerT >& start() const
const ::boost::spirit::classic::rule< ScannerT >& start() const
{
return basicExpression;
}
@ -368,11 +368,11 @@ public:
private:
// the constituents of the Spirit arithmetic expression grammar.
// For the sake of readability, without 'ma' prefix.
::boost::spirit::rule< ScannerT > basicExpression;
::boost::spirit::rule< ScannerT > unaryFunction;
::boost::spirit::rule< ScannerT > assignment;
::boost::spirit::rule< ScannerT > integer,argument;
::boost::spirit::rule< ScannerT > orExpression,andExpression;
::boost::spirit::classic::rule< ScannerT > basicExpression;
::boost::spirit::classic::rule< ScannerT > unaryFunction;
::boost::spirit::classic::rule< ScannerT > assignment;
::boost::spirit::classic::rule< ScannerT > integer,argument;
::boost::spirit::classic::rule< ScannerT > orExpression,andExpression;
};
const ParserContextSharedPtr& getContext() const
@ -415,11 +415,11 @@ std::shared_ptr<ExpressionNode> const & FunctionParser::parseFunction( const OUS
ExpressionGrammar aExpressionGrammer( pContext );
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::classic::parse( aStart,
aEnd,
aExpressionGrammer,
::boost::spirit::space_p ) );
::boost::spirit::classic::space_p ) );
#if (OSL_DEBUG_LEVEL > 0)
std::cout.flush(); // needed to keep stdout and cout in sync

1
sdext/Library_pdfimport.mk
View file

@ -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 \
))

14
sdext/source/pdfimport/pdfparse/pdfparse.cxx
View file

@ -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

4
slideshow/Library_slideshow.mk
View file

@ -14,10 +14,6 @@ $(eval $(call gb_Library_set_include,slideshow,\
-I$(SRCDIR)/slideshow/source/inc \
))
$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
ifneq ($(strip $(debug)$(DEBUG)),)
$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SP_ENABLE_DEBUG_HOOKS \

42
slideshow/source/engine/smilfunctionparser.cxx
View file

@ -355,14 +355,14 @@ namespace slideshow::internal
// notation, not the 1.0e10 one.
// TODO(F1): Also handle the 1.0e10 case here.
template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T>
template< typename T > struct custom_real_parser_policies : public ::boost::spirit::classic::ureal_parser_policies<T>
{
template< typename ScannerT >
static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type
static typename ::boost::spirit::classic::parser_result< ::boost::spirit::classic::chlit<>, ScannerT >::type
parse_exp(ScannerT& scan)
{
// as_lower_d somehow breaks MSVC7
return ::boost::spirit::ch_p('E').parse(scan);
return ::boost::spirit::classic::ch_p('E').parse(scan);
}
};
@ -393,7 +393,7 @@ namespace slideshow::internal
( '-' multiplicative_expression )* )
*/
class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar >
{
public:
/** Create an arithmetic expression grammar
@ -412,8 +412,8 @@ namespace slideshow::internal
// grammar definition
explicit definition( const ExpressionGrammar& self )
{
using ::boost::spirit::str_p;
using ::boost::spirit::real_parser;
using ::boost::spirit::classic::str_p;
using ::boost::spirit::classic::real_parser;
identifier =
str_p( "$" )[ ValueTFunctor( self.getContext()) ]
@ -479,7 +479,7 @@ namespace slideshow::internal
BOOST_SPIRIT_DEBUG_RULE(identifier);
}
const ::boost::spirit::rule< ScannerT >& start() const
const ::boost::spirit::classic::rule< ScannerT >& start() const
{
return additiveExpression;
}
@ -487,13 +487,13 @@ namespace slideshow::internal
private:
// the constituents of the Spirit arithmetic expression grammar.
// For the sake of readability, without 'ma' prefix.
::boost::spirit::rule< ScannerT > additiveExpression;
::boost::spirit::rule< ScannerT > multiplicativeExpression;
::boost::spirit::rule< ScannerT > unaryExpression;
::boost::spirit::rule< ScannerT > basicExpression;
::boost::spirit::rule< ScannerT > unaryFunction;
::boost::spirit::rule< ScannerT > binaryFunction;
::boost::spirit::rule< ScannerT > identifier;
::boost::spirit::classic::rule< ScannerT > additiveExpression;
::boost::spirit::classic::rule< ScannerT > multiplicativeExpression;
::boost::spirit::classic::rule< ScannerT > unaryExpression;
::boost::spirit::classic::rule< ScannerT > basicExpression;
::boost::spirit::classic::rule< ScannerT > unaryFunction;
::boost::spirit::classic::rule< ScannerT > binaryFunction;
::boost::spirit::classic::rule< ScannerT > identifier;
};
const ParserContextSharedPtr& getContext() const
@ -539,11 +539,11 @@ namespace slideshow::internal
ExpressionGrammar aExpressionGrammer( pContext );
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::classic::parse( aStart,
aEnd,
aExpressionGrammer,
::boost::spirit::space_p ) );
::boost::spirit::classic::space_p ) );
#if OSL_DEBUG_LEVEL > 0
::std::cout.flush(); // needed to keep stdout and cout in sync
@ -582,11 +582,11 @@ namespace slideshow::internal
ExpressionGrammar aExpressionGrammer( pContext );
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::classic::parse( aStart,
aEnd,
aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) );
aExpressionGrammer >> ::boost::spirit::classic::end_p,
::boost::spirit::classic::space_p ) );
#if OSL_DEBUG_LEVEL > 0
::std::cout.flush(); // needed to keep stdout and cout in sync

1
svx/Library_svx.mk
View file

@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_custom_headers,svx,\
$(eval $(call gb_Library_add_defs,svx,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_set_precompiled_header,svx,svx/inc/pch/precompiled_svx))

1
svx/Library_svxcore.mk
View file

@ -46,7 +46,6 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,svx/inc/pch/precompiled_
$(eval $(call gb_Library_add_defs,svxcore,\
-DSVXCORE_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
$(eval $(call gb_Library_use_libraries,svxcore,\

1
svx/Module_svx.mk
View file

@ -52,7 +52,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
))
#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
#todo: component file
# vim: set noet sw=4 ts=4:

50
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
View file

@ -921,14 +921,14 @@ public:
// notation, not the 1.0e10 one.
// TODO(F1): Also handle the 1.0e10 case here.
template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T>
template< typename T > struct custom_real_parser_policies : public ::boost::spirit::classic::ureal_parser_policies<T>
{
template< typename ScannerT >
static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type
static typename ::boost::spirit::classic::parser_result< ::boost::spirit::classic::chlit<>, ScannerT >::type
parse_exp(ScannerT& scan)
{
// as_lower_d somehow breaks MSVC7
return ::boost::spirit::ch_p('E').parse(scan);
return ::boost::spirit::classic::ch_p('E').parse(scan);
}
};
@ -960,7 +960,7 @@ template< typename T > struct custom_real_parser_policies : public ::boost::spir
*/
class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar >
{
public:
/** Create an arithmetic expression grammar
@ -979,10 +979,10 @@ public:
// grammar definition
explicit definition( const ExpressionGrammar& self )
{
using ::boost::spirit::str_p;
using ::boost::spirit::range_p;
using ::boost::spirit::lexeme_d;
using ::boost::spirit::real_parser;
using ::boost::spirit::classic::str_p;
using ::boost::spirit::classic::range_p;
using ::boost::spirit::classic::lexeme_d;
using ::boost::spirit::classic::real_parser;
identifier =
str_p( "pi" )[ EnumFunctor(ExpressionFunct::EnumPi, self.getContext() ) ]
@ -1071,7 +1071,7 @@ public:
BOOST_SPIRIT_DEBUG_RULE(identifier);
}
const ::boost::spirit::rule< ScannerT >& start() const
const ::boost::spirit::classic::rule< ScannerT >& start() const
{
return additiveExpression;
}
@ -1079,18 +1079,18 @@ public:
private:
// the constituents of the Spirit arithmetic expression grammar.
// For the sake of readability, without 'ma' prefix.
::boost::spirit::rule< ScannerT > additiveExpression;
::boost::spirit::rule< ScannerT > multiplicativeExpression;
::boost::spirit::rule< ScannerT > unaryExpression;
::boost::spirit::rule< ScannerT > basicExpression;
::boost::spirit::rule< ScannerT > unaryFunction;
::boost::spirit::rule< ScannerT > binaryFunction;
::boost::spirit::rule< ScannerT > ternaryFunction;
::boost::spirit::rule< ScannerT > funcRef_decl;
::boost::spirit::rule< ScannerT > functionReference;
::boost::spirit::rule< ScannerT > modRef_decl;
::boost::spirit::rule< ScannerT > modifierReference;
::boost::spirit::rule< ScannerT > identifier;
::boost::spirit::classic::rule< ScannerT > additiveExpression;
::boost::spirit::classic::rule< ScannerT > multiplicativeExpression;
::boost::spirit::classic::rule< ScannerT > unaryExpression;
::boost::spirit::classic::rule< ScannerT > basicExpression;
::boost::spirit::classic::rule< ScannerT > unaryFunction;
::boost::spirit::classic::rule< ScannerT > binaryFunction;
::boost::spirit::classic::rule< ScannerT > ternaryFunction;
::boost::spirit::classic::rule< ScannerT > funcRef_decl;
::boost::spirit::classic::rule< ScannerT > functionReference;
::boost::spirit::classic::rule< ScannerT > modRef_decl;
::boost::spirit::classic::rule< ScannerT > modifierReference;
::boost::spirit::classic::rule< ScannerT > identifier;
};
const ParserContextSharedPtr& getContext() const
@ -1136,11 +1136,11 @@ std::shared_ptr<ExpressionNode> const & FunctionParser::parseFunction( const OUS
pContext->mpCustoShape = &rCustoShape;
ExpressionGrammar aExpressionGrammer( pContext );
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::classic::parse( aStart,
aEnd,
aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) );
aExpressionGrammer >> ::boost::spirit::classic::end_p,
::boost::spirit::classic::space_p ) );
// input fully congested by the parser?
if( !aParseInfo.full )