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>

2 files changed, 21 insertions, 25 deletions

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