diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-12 19:47:43 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-12 19:47:43 +0100 |
| commit | fa387f9bef0d1a70a4b40c28c5cf9d661c421f73 (patch) | |
| tree | c1857d0d7fc0a8db8c1f3a841913b1f496d8e661 /test/core/model | |
| parent | 2b15fcab4b81fa8a854e724c48ee9c771fb126f8 (diff) | |
| parent | 55f943ba1b31542157b984b5955b91261c280f46 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Conflicts:
application/src/core/model/Document.hpp
Diffstat (limited to 'test/core/model')
| -rw-r--r-- | test/core/model/TestDocumentBuilder.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/model/TestDocumentBuilder.hpp b/test/core/model/TestDocumentBuilder.hpp index a09b081..081e934 100644 --- a/test/core/model/TestDocumentBuilder.hpp +++ b/test/core/model/TestDocumentBuilder.hpp @@ -135,7 +135,7 @@ Rooted<StructuredEntity> buildRootStructuredEntity(Handle<Document> document, * contain a StructuredClass with the given name. */ Rooted<StructuredEntity> buildStructuredEntity( - Handle<Document> document, Logger &logger, Handle<DocumentEntity> parent, + Handle<Document> document, Logger &logger, Handle<StructuredEntity> parent, Path path, const std::string &fieldName = "", Variant attributes = {}, std::string name = "") { @@ -191,7 +191,7 @@ Rooted<StructuredEntity> buildStructuredEntity( * input handle was empty. */ Rooted<DocumentPrimitive> buildPrimitiveEntity( - Logger &logger, Handle<DocumentEntity> parent, Variant content = {}, + Logger &logger, Handle<StructuredEntity> parent, Variant content = {}, const std::string &fieldName = "") { // If the input handles are not set, we can not build the entity. @@ -228,7 +228,7 @@ Rooted<DocumentPrimitive> buildPrimitiveEntity( * input handle was empty. */ Rooted<AnnotationEntity::Anchor> buildAnchor(Logger &logger, - Handle<DocumentEntity> parent, + Handle<StructuredEntity> parent, std::string id, const std::string &fieldName = "") { |