diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2012-03-21 08:36:21 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-04-23 16:50:56 +0200 |
commit | 8d89bf37dd4ef3cb7373e1841ff57a53916fff0d (patch) | |
tree | 704b7de0338eba0e008a96a09b6d57e86846d1b1 /odb/semantics/relational | |
parent | 68ff21c56fb287790440208907ad2a851a108f89 (diff) |
Polymorphic inheritance support
Diffstat (limited to 'odb/semantics/relational')
-rw-r--r-- | odb/semantics/relational/elements.cxx | 6 | ||||
-rw-r--r-- | odb/semantics/relational/elements.hxx | 3 |
2 files changed, 3 insertions, 6 deletions
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> |