From b15e13889a03c4fb22a46d094fa6efa7e4ffbb74 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 28 Sep 2009 18:42:58 +0200
Subject: Fix a bug in custom type regex processing (--custom-type-regex)

---
 xsd/cxx/tree/elements.cxx | 4 ++--
 1 file 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 ();
-- 
cgit v1.1