aboutsummaryrefslogtreecommitdiff
path: root/xsd
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2009-09-28 18:42:58 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2009-09-28 18:42:58 +0200
commitb15e13889a03c4fb22a46d094fa6efa7e4ffbb74 (patch)
tree571a3890c8bdeabc0419190e57eec36dd68a5f7c /xsd
parent67d249d7502b4c5c2f0c4aa142c655d51e1fe020 (diff)
Fix a bug in custom type regex processing (--custom-type-regex)
Diffstat (limited to 'xsd')
-rw-r--r--xsd/cxx/tree/elements.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/xsd/cxx/tree/elements.cxx b/xsd/cxx/tree/elements.cxx
index 5e85087..db1d858 100644
--- a/xsd/cxx/tree/elements.cxx
+++ b/xsd/cxx/tree/elements.cxx
@@ -403,7 +403,7 @@ namespace CXX
return true;
}
- r = i->pat.merge (name, i->type_sub);
+ r = i->pat.merge (i->type_sub, name);
return true;
}
}
@@ -456,7 +456,7 @@ namespace CXX
{
if (!i->base_sub.empty ())
{
- r = i->pat.merge (name, i->base_sub);
+ r = i->pat.merge (i->base_sub, name);
}
else
r.clear ();