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 /connectivity | |
| parent | f6afad4c7bc0e77ec374a7bf1cd4b97a66921b1c (diff) | |
BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE has been defined forever in these files
Change-Id: I0afa1b404192f44540aa318e748452e0328fac6b
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/RowFunctionParser.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index dd7d05f03900..cada6eeb03e2 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -23,6 +23,7 @@ // But watch out, the parser might have // state not visible to this code! #define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE + #if OSL_DEBUG_LEVEL >= 2 && defined(DBG_UTIL) #include <typeinfo> #define BOOST_SPIRIT_DEBUG @@ -385,7 +386,6 @@ private: ParserContextSharedPtr mpParserContext; // might get modified during parsing }; -#ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE const ParserContextSharedPtr& getParserContext() { static ParserContextSharedPtr lcl_parserContext( new ParserContext() ); @@ -397,7 +397,7 @@ const ParserContextSharedPtr& getParserContext() return lcl_parserContext; } -#endif + } std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& _sFunction) @@ -413,13 +413,9 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& _ 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 ExpressionGrammar aExpressionGrammer( pContext ); |