aboutsummaryrefslogtreecommitdiff
path: root/libxsd/xsd/cxx/tree/type-factory-map.txx
diff options
context:
space:
mode:
Diffstat (limited to 'libxsd/xsd/cxx/tree/type-factory-map.txx')
-rw-r--r--libxsd/xsd/cxx/tree/type-factory-map.txx23
1 files changed, 13 insertions, 10 deletions
diff --git a/libxsd/xsd/cxx/tree/type-factory-map.txx b/libxsd/xsd/cxx/tree/type-factory-map.txx
index e1fe0cc..c8d2f18 100644
--- a/libxsd/xsd/cxx/tree/type-factory-map.txx
+++ b/libxsd/xsd/cxx/tree/type-factory-map.txx
@@ -290,23 +290,26 @@ namespace xsd
if (qn.name () == name &&
(qualified ? qn.namespace_ () == ns : ns[0] == C ('\0')))
{
- f = static_type;
+ f = static_type; // NULL for abstract types.
}
- else if (global)
+ else
{
// See if we have a substitution.
//
- typename element_map::const_iterator i (
- element_map_.find (qualified_name (name, ns)));
-
- if (i != element_map_.end ())
+ if (global)
{
- f = find_substitution (i->second, qn);
+ typename element_map::const_iterator i (
+ element_map_.find (qualified_name (name, ns)));
+
+ if (i != element_map_.end ())
+ {
+ f = find_substitution (i->second, qn);
+ }
}
- }
- if (f == 0)
- return XSD_AUTO_PTR<type> (); // No match.
+ if (f == 0)
+ return XSD_AUTO_PTR<type> (); // No match.
+ }
// Check for xsi:type
//