[Libreoffice-commits] core.git: connectivity/Library_dbtools.mk connectivity/source sdext/Library_pdfimport.mk sdext/source slideshow/Library_slideshow.mk slideshow/source svx/Library_svxcore.mk svx/Library_svx.mk svx/Module_svx.mk svx/source
Adam Majer (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 20 17:51:04 UTC 2020
connectivity/Library_dbtools.mk | 1
connectivity/source/commontools/RowFunctionParser.cxx | 36 +++----
sdext/Library_pdfimport.mk | 1
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 14 +-
slideshow/Library_slideshow.mk | 4
slideshow/source/engine/smilfunctionparser.cxx | 42 ++++----
svx/Library_svx.mk | 1
svx/Library_svxcore.mk | 1
svx/Module_svx.mk | 1
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 50 +++++-----
10 files changed, 71 insertions(+), 80 deletions(-)
New commits:
commit a7be9479a04de2f0059c5769bbd9dc354c84136b
Author: Adam Majer <amajer at suse.com>
AuthorDate: Wed Feb 19 15:29:06 2020 +0100
Commit: Tomáš Chvátal <tchvatal at suse.com>
CommitDate: Thu Feb 20 18:50:24 2020 +0100
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 at suse.com>
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
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
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 58e169a05cbb..55c531a86f43 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -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 \
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 6f67f8ac0487..a398fee0627a 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -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
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2b9b96f04a3b..a7d72db44ccd 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -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))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5cb8a455738d..80fcdae920f3 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -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,\
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index c4d816e6fc5d..1d83bdc29d68 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -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:
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 2c761e9d7360..cecc478ae66e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -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 )
More information about the Libreoffice-commits
mailing list