summaryrefslogtreecommitdiff
path: root/odb/semantics/relational
diff options
context:
space:
mode:
Diffstat (limited to 'odb/semantics/relational')
-rw-r--r--odb/semantics/relational/elements.cxx6
-rw-r--r--odb/semantics/relational/elements.hxx3
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>