Adapted OsmlParser to new Stack interface, reenabled OsmlParser code in CMakeLists

1 files changed, 5 insertions, 5 deletions

diff --git a/src/formats/osml/OsmlStreamParser.cpp b/src/formats/osml/OsmlStreamParser.cpp
index 823075a..64a489d 100644
--- a/src/formats/osml/OsmlStreamParser.cpp
+++ b/src/formats/osml/OsmlStreamParser.cpp
@@ -409,7 +409,7 @@ public:
 	State parse();
 
 	TokenId registerToken(const std::string &token);
-	void unregisterToken(TokenId token);
+	void unregisterToken(TokenId id);
 
 	const TokenizedData &getData() const { return data; }
 	const Variant &getCommandName() const { return cmd().getName(); }
@@ -928,9 +928,9 @@ TokenId OsmlStreamParserImpl::registerToken(const std::string &token)
 	return tokenizer.registerToken(token, false);
 }
 
-void OsmlStreamParserImpl::unregisterToken(TokenId token)
+void OsmlStreamParserImpl::unregisterToken(TokenId id)
 {
-	assert(tokenizer.unregisterToken(token));
+	assert(tokenizer.unregisterToken(id));
 }
 
 /* Class OsmlStreamParser */
@@ -979,8 +979,8 @@ TokenId OsmlStreamParser::registerToken(const std::string &token)
 	return impl->registerToken(token);
 }
 
-void OsmlStreamParser::unregisterToken(TokenId token)
+void OsmlStreamParser::unregisterToken(TokenId id)
 {
-	impl->unregisterToken(token);
+	impl->unregisterToken(id);
 }
 }