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 /connectivity | |
| 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 'connectivity')
| -rw-r--r-- | connectivity/Library_dbtools.mk | 1 | ||||
| -rw-r--r-- | connectivity/source/commontools/RowFunctionParser.cxx | 36 |
2 files changed, 18 insertions, 19 deletions
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index d91cdfc553fe..6869cd0bbc6b 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -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)) diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 2246b7636797..21f5e638a651 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -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 |