Merge branch 'ehofman/framebuffer'

[simgear.git] / simgear / structure / SGExpression.cxx

diff --git a/simgear/structure/SGExpression.cxx b/simgear/structure/SGExpression.cxx
index fa6650300fce9a0bf55f395b91b805ae4f6eb01b..162414876eb39d5a7b6229bcd7ee5bb65cfc08e9 100644 (file)
--- a/simgear/structure/SGExpression.cxx
+++ b/simgear/structure/SGExpression.cxx
@@ -690,11 +690,10 @@ bool Parser::readChildren(const SGPropertyNode* exp,
     return true;
 }
 
-Parser::ParserMap ExpressionParser::_parserTable;
-
 void ExpressionParser::addExpParser(const string& token, exp_parser parsefn)
 {
-    _parserTable.insert(std::make_pair(token, parsefn));
+    ParserMapSingleton::instance()
+        ->_parserTable.insert(std::make_pair(token, parsefn));
 }
 
 Expression* valueParser(const SGPropertyNode* exp, Parser* parser)