summaryrefslogtreecommitdiff
path: root/odb/relational/inline.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'odb/relational/inline.hxx')
-rw-r--r--odb/relational/inline.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/odb/relational/inline.hxx b/odb/relational/inline.hxx
index 090779f..583cb13 100644
--- a/odb/relational/inline.hxx
+++ b/odb/relational/inline.hxx
@@ -214,16 +214,16 @@ namespace relational
{
using semantics::data_member;
- data_member* id (id_member (c));
+ data_member_path* id (id_member (c));
+ data_member* idf (id ? id->front () : 0);
bool auto_id (id && auto_ (*id));
- bool base_id (id && &id->scope () != &c); // Comes from base.
+ bool base_id (id && &idf->scope () != &c); // Comes from base.
data_member* optimistic (context::optimistic (c));
// Base class that contains the object id and version for optimistic
// concurrency.
//
- type* base (
- id != 0 && base_id ? dynamic_cast<type*> (&id->scope ()) : 0);
+ type* base (base_id ? dynamic_cast<type*> (&idf->scope ()) : 0);
type* poly_root (context::polymorphic (c));
bool poly (poly_root != 0);