diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-03 02:36:04 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-03 02:36:04 +0100 |
| commit | 75513b55ad721990ae53f9c2c2638c4bb5ef000a (patch) | |
| tree | e3d1124d0321b87c014f933cbf02d7ac554e219d | |
| parent | bcccee31179c0259b203870b10278033ffc29804 (diff) | |
Fixed imports when ParserTypes are set to more general nodes.
| -rw-r--r-- | src/core/resource/ResourceRequest.cpp | 2 | ||||
| -rw-r--r-- | testdata/xmlparser/generic.oxm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/resource/ResourceRequest.cpp b/src/core/resource/ResourceRequest.cpp index 1c93288..0803208 100644 --- a/src/core/resource/ResourceRequest.cpp +++ b/src/core/resource/ResourceRequest.cpp @@ -180,7 +180,7 @@ bool ResourceRequest::deduce(Registry ®istry, Logger &logger) logger.error(std::string("Cannot parse files of type \"") + mimetype + std::string("\"")); ok = false; - } else if (!Rtti::setIsOneOf(parserTypes, supportedTypes)) { + } else if (!Rtti::setIsOneOf(supportedTypes, parserTypes)) { logger.error(std::string("Resource of type \"") + mimetype + std::string("\" cannot be included here!")); ok = false; diff --git a/testdata/xmlparser/generic.oxm b/testdata/xmlparser/generic.oxm index 9b83f9a..4c9375e 100644 --- a/testdata/xmlparser/generic.oxm +++ b/testdata/xmlparser/generic.oxm @@ -1,6 +1,6 @@ <?xml version="1.0" standalone="yes"?> <typesystem name="bla"> - <import>./color.oxm</import> + <!--<import>color.oxm</import>--> <!--<struct name="color"> <field name="r" type="int"/> <field name="g" type="int"/> |