diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-14 20:32:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-14 21:21:29 +0200 |
| commit | 9d29d3dad4e944182b2fad6e58bd1cd02aa0a8fd (patch) | |
| tree | 13af36e1a95ddafc04ff62bdcd351a705bbd31c1 /slideshow/source | |
| parent | f6afad4c7bc0e77ec374a7bf1cd4b97a66921b1c (diff) | |
BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE has been defined forever in these files
Change-Id: I0afa1b404192f44540aa318e748452e0328fac6b
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/smilfunctionparser.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 8cfea83efc17..f2ca8c3bc024 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -35,6 +35,7 @@ // But watch out, the parser might have // state not visible to this code! #define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE + #if defined(DBG_UTIL) #include <typeinfo> #define BOOST_SPIRIT_DEBUG @@ -511,7 +512,6 @@ namespace slideshow ParserContextSharedPtr mpParserContext; // might get modified during parsing }; -#ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE const ParserContextSharedPtr& getParserContext() { static ParserContextSharedPtr lcl_parserContext( new ParserContext() ); @@ -523,7 +523,6 @@ namespace slideshow return lcl_parserContext; } -#endif } std::shared_ptr<ExpressionNode> SmilFunctionParser::parseSmilValue( const OUString& rSmilValue, @@ -540,13 +539,9 @@ namespace slideshow ParserContextSharedPtr pContext; -#ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE // static parser context, because the actual // Spirit parser is also a static object pContext = getParserContext(); -#else - pContext.reset( new ParserContext() ); -#endif pContext->maShapeBounds = rRelativeShapeBounds; pContext->mbParseAnimationFunction = false; // parse with '$' disabled @@ -589,13 +584,9 @@ namespace slideshow ParserContextSharedPtr pContext; -#ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE // static parser context, because the actual // Spirit parser is also a static object pContext = getParserContext(); -#else - pContext.reset( new ParserContext() ); -#endif pContext->maShapeBounds = rRelativeShapeBounds; pContext->mbParseAnimationFunction = true; // parse with '$' enabled |