8 files changed, 17 insertions, 11 deletions
diff --git a/odb/semantics/relational/changelog.cxx b/odb/semantics/relational/changelog.cxx
index 591a2db..0db9dab 100644
--- a/odb/semantics/relational/changelog.cxx
+++ b/odb/semantics/relational/changelog.cxx
@@ -24,7 +24,7 @@ namespace semantics
       using namespace xml;
 
       p.next_expect (parser::start_element, xmlns, "changelog");
-      p.content (parser::complex);
+      p.content (content::complex);
 
       if (p.attribute<unsigned int> ("version") != 1)
         throw parsing (p, "unsupported changelog format version");
diff --git a/odb/semantics/relational/column.cxx b/odb/semantics/relational/column.cxx
index 875ec6d..04ca6c9 100644
--- a/odb/semantics/relational/column.cxx
+++ b/odb/semantics/relational/column.cxx
@@ -30,7 +30,7 @@ namespace semantics
           default__ (p.attribute ("default", string ())),
           options_ (p.attribute ("options", string ()))
     {
-      p.content (xml::parser::empty);
+      p.content (xml::content::empty);
     }
 
     column& column::
@@ -84,7 +84,7 @@ namespace semantics
     drop_column (xml::parser& p, uscope&, graph& g)
         : unameable (p, g)
     {
-      p.content (xml::parser::empty);
+      p.content (xml::content::empty);
     }
 
     drop_column& drop_column::
diff --git a/odb/semantics/relational/elements.hxx b/odb/semantics/relational/elements.hxx
index 19cf6ff..b72bac0 100644
--- a/odb/semantics/relational/elements.hxx
+++ b/odb/semantics/relational/elements.hxx
@@ -15,8 +15,14 @@
 #include <cutl/container/pointer-iterator.hxx>
 #include <cutl/compiler/context.hxx>
 
+#ifdef ODB_BUILD2
+#include <libstudxml/parser.hxx>
+#include <libstudxml/serializer.hxx>
+#else
 #include <cutl/xml/parser.hxx>
 #include <cutl/xml/serializer.hxx>
+namespace cutl {namespace xml {typedef parser content;}}
+#endif
 
 #include <odb/semantics/relational/name.hxx>
 
diff --git a/odb/semantics/relational/elements.txx b/odb/semantics/relational/elements.txx
index da8937e..f168b02 100644
--- a/odb/semantics/relational/elements.txx
+++ b/odb/semantics/relational/elements.txx
@@ -154,7 +154,7 @@ namespace semantics
         g.new_edge<alters> (*this, *base);
 
       using namespace xml;
-      p.content (parser::complex);
+      p.content (content::complex);
 
       for (parser::event_type e (p.peek ());
            e == parser::start_element;
diff --git a/odb/semantics/relational/foreign-key.cxx b/odb/semantics/relational/foreign-key.cxx
index 472b18f..a75972a 100644
--- a/odb/semantics/relational/foreign-key.cxx
+++ b/odb/semantics/relational/foreign-key.cxx
@@ -67,7 +67,7 @@ namespace semantics
 
       p.next_expect (parser::start_element, xmlns, "references");
       referenced_table_ = p.attribute<qname> ("table");
-      p.content (parser::complex);
+      p.content (content::complex);
 
       for (parser::event_type e (p.peek ());
            e == parser::start_element;
@@ -78,7 +78,7 @@ namespace semantics
 
         p.next ();
         referenced_columns_.push_back (p.attribute<uname> ("name"));
-        p.content (parser::empty);
+        p.content (content::empty);
         p.next_expect (parser::end_element);
       }
 
@@ -156,7 +156,7 @@ namespace semantics
     drop_foreign_key (xml::parser& p, uscope&, graph& g)
         : unameable (p, g)
     {
-      p.content (xml::parser::empty);
+      p.content (xml::content::empty);
     }
 
     drop_foreign_key& drop_foreign_key::
diff --git a/odb/semantics/relational/index.cxx b/odb/semantics/relational/index.cxx
index f46459f..f479eee 100644
--- a/odb/semantics/relational/index.cxx
+++ b/odb/semantics/relational/index.cxx
@@ -83,7 +83,7 @@ namespace semantics
     drop_index (xml::parser& p, uscope&, graph& g)
         : unameable (p, g)
     {
-      p.content (xml::parser::empty);
+      p.content (xml::content::empty);
     }
 
     drop_index& drop_index::
diff --git a/odb/semantics/relational/key.cxx b/odb/semantics/relational/key.cxx
index 0f49820..bf83ef4 100644
--- a/odb/semantics/relational/key.cxx
+++ b/odb/semantics/relational/key.cxx
@@ -29,7 +29,7 @@ namespace semantics
         : unameable (p, g)
     {
       using namespace xml;
-      p.content (parser::complex);
+      p.content (content::complex);
 
       for (parser::event_type e (p.peek ());
            e == parser::start_element;
@@ -39,7 +39,7 @@ namespace semantics
           break; // Not our elements.
 
         p.next ();
-        p.content (parser::empty);
+        p.content (content::empty);
 
         uname n (p.attribute<uname> ("name"));
         column* c (s.lookup<column, drop_column> (n));
diff --git a/odb/semantics/relational/table.cxx b/odb/semantics/relational/table.cxx
index 9851751..6675227 100644
--- a/odb/semantics/relational/table.cxx
+++ b/odb/semantics/relational/table.cxx
@@ -94,7 +94,7 @@ namespace semantics
     drop_table (xml::parser& p, qscope&, graph& g)
         : qnameable (p, g)
     {
-      p.content (xml::parser::empty);
+      p.content (xml::content::empty);
     }
 
     drop_table& drop_table::