aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-05-07 09:39:46 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-05-07 09:39:46 +0200
commit905a5eb6081c15ee3c122200f1dae7a00017999f (patch)
treecb3f2d0a1e91b97701392098388004af39b1ee1b
parentf7ee4860c54fd49fd4447b53c7bea0f57bfbc588 (diff)
Update to reflect libxsd-frontend interface changes
-rw-r--r--xsde/elements.hxx15
-rw-r--r--xsde/processing/inheritance/processor.cxx2
2 files changed, 7 insertions, 10 deletions
diff --git a/xsde/elements.hxx b/xsde/elements.hxx
index 13e9c03..7684484 100644
--- a/xsde/elements.hxx
+++ b/xsde/elements.hxx
@@ -20,18 +20,16 @@ namespace Traversal = XSDFrontend::Traversal;
// Anonymous feedback via belongs edge.
//
-struct AnonymousBase : Traversal::Element,
- Traversal::Attribute
+struct AnonymousBase: Traversal::Element, Traversal::Attribute
{
- AnonymousBase (Traversal::NodeDispatcherBase& d1)
+ AnonymousBase (Traversal::NodeDispatcher& d1)
: complex_ (&d1, 0)
{
edge_traverser (belongs_);
belongs_.node_traverser (complex_);
}
- AnonymousBase (Traversal::NodeDispatcherBase& d1,
- Traversal::NodeDispatcherBase& d2)
+ AnonymousBase (Traversal::NodeDispatcher& d1, Traversal::NodeDispatcher& d2)
: complex_ (&d1, &d2)
{
edge_traverser (belongs_);
@@ -106,8 +104,7 @@ public:
private:
struct Complex : Traversal::Complex
{
- Complex (Traversal::NodeDispatcherBase* d1,
- Traversal::NodeDispatcherBase* d2)
+ Complex (Traversal::NodeDispatcher* d1, Traversal::NodeDispatcher* d2)
: d1_ (d1), d2_ (d2)
{
}
@@ -123,8 +120,8 @@ private:
}
private:
- Traversal::NodeDispatcherBase* d1_;
- Traversal::NodeDispatcherBase* d2_;
+ Traversal::NodeDispatcher* d1_;
+ Traversal::NodeDispatcher* d2_;
} complex_;
diff --git a/xsde/processing/inheritance/processor.cxx b/xsde/processing/inheritance/processor.cxx
index 79615c3..76172fa 100644
--- a/xsde/processing/inheritance/processor.cxx
+++ b/xsde/processing/inheritance/processor.cxx
@@ -125,7 +125,7 @@ namespace Processing
{
if (types_seen_.find (&t) == types_seen_.end ())
{
- FrontendElements::Context& ctx (t.context ());
+ SemanticGraph::Context& ctx (t.context ());
last_xpath_ = xpath (m);