From 8d89bf37dd4ef3cb7373e1841ff57a53916fff0d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Mar 2012 08:36:21 +0200
Subject: Polymorphic inheritance support

---
 odb/semantics/relational/elements.cxx | 6 ++----
 odb/semantics/relational/elements.hxx | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'odb/semantics/relational')

diff --git a/odb/semantics/relational/elements.cxx b/odb/semantics/relational/elements.cxx
index 7a0ec1d..a73520c 100644
--- a/odb/semantics/relational/elements.cxx
+++ b/odb/semantics/relational/elements.cxx
@@ -15,16 +15,14 @@ namespace semantics
     template <>
     duplicate_name::
     duplicate_name (uscope& s, unameable& o, unameable& d)
-        : scope (s), orig (o), dup (d),
-          orig_name (o.name ()), dup_name (d.name ())
+        : scope (s), orig (o), dup (d), name (o.name ())
     {
     }
 
     template <>
     duplicate_name::
     duplicate_name (qscope& s, qnameable& o, qnameable& d)
-        : scope (s), orig (o), dup (d),
-          orig_name (o.name ().string ()), dup_name (d.name ().string ())
+        : scope (s), orig (o), dup (d), name (o.name ().string ())
     {
     }
 
diff --git a/odb/semantics/relational/elements.hxx b/odb/semantics/relational/elements.hxx
index 9d98619..6b4964e 100644
--- a/odb/semantics/relational/elements.hxx
+++ b/odb/semantics/relational/elements.hxx
@@ -212,8 +212,7 @@ namespace semantics
       node& orig;
       node& dup;
 
-      string orig_name;
-      string dup_name;
+      string name;
     };
 
     template <typename N>
-- 
cgit v1.1