Merge branch 'master' of somweyr.de:ousia

2 files changed, 4 insertions, 6 deletions

diff --git a/test/core/parser/ParserStackTest.cpp b/test/core/parser/ParserStackTest.cpp
index 69978b0..81160da 100644
--- a/test/core/parser/ParserStackTest.cpp
+++ b/test/core/parser/ParserStackTest.cpp
@@ -24,7 +24,6 @@
 #include <core/parser/StandaloneParserContext.hpp>
 
 namespace ousia {
-namespace parser {
 
 static const State STATE_DOCUMENT = 0;
 static const State STATE_BODY = 1;
@@ -168,7 +167,5 @@ TEST(ParserStack, validation)
 	ASSERT_FALSE(logger.hasError());
 	s.end();
 }
-
-}
 }
 
diff --git a/test/core/parser/StandaloneParserContext.hpp b/test/core/parser/StandaloneParserContext.hpp
index 347d34f..51cd1e6 100644
--- a/test/core/parser/StandaloneParserContext.hpp
+++ b/test/core/parser/StandaloneParserContext.hpp
@@ -23,16 +23,18 @@
 
 #include <core/model/Project.hpp>
 #include <core/parser/Parser.hpp>
+#include <core/parser/ParserScope.hpp>
+#include <core/parser/ParserContext.hpp>
+#include <core/Registry.hpp>
 
 namespace ousia {
-namespace parser {
 
 struct StandaloneParserContext {
 public:
 	Manager manager;
 	Logger logger;
-	Scope scope;
 	Registry registry;
+	ParserScope scope;
 	Rooted<model::Project> project;
 	ParserContext context;
 
@@ -47,7 +49,6 @@ public:
 	      context(scope, registry, externalLogger, manager, project){};
 };
 }
-}
 
 #endif /* _OUSIA_STANDALONE_PARSER_CONTEXT_ */