diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-06-22 17:12:20 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-06-22 17:12:20 +0200 |
commit | 2ca7acef7c858fb7f21b5101dedfc021aea62ff8 (patch) | |
tree | b53a7d56da0a7f04ee46438f5ce6bb12c05b8f3a /odb/relational | |
parent | 6e35807bd495c0001cba229fd082e45f0421100e (diff) |
Get rid of member_[u]type(), other cleanups
Diffstat (limited to 'odb/relational')
-rw-r--r-- | odb/relational/source.hxx | 4 | ||||
-rw-r--r-- | odb/relational/validator.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index 5880a2b..53034ac 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -2193,7 +2193,7 @@ namespace relational // When handling a pointer, mi.t is the id type of the referenced // object. // - semantics::type& pt (member_utype (mi.m, key_prefix_)); + semantics::type& pt (utype (mi.m, key_prefix_)); type = "obj_traits::id_type"; @@ -2704,7 +2704,7 @@ namespace relational // When handling a pointer, mi.t is the id type of the referenced // object. // - semantics::type& pt (member_utype (mi.m, key_prefix_)); + semantics::type& pt (utype (mi.m, key_prefix_)); if (lazy_pointer (pt)) os << member << " = ptr_traits::pointer_type (" << endl diff --git a/odb/relational/validator.cxx b/odb/relational/validator.cxx index 3b867f8..5dea25f 100644 --- a/odb/relational/validator.cxx +++ b/odb/relational/validator.cxx @@ -61,7 +61,7 @@ namespace relational // Make sure it is a pointer or a member with points_to pragma. // - if (!object_pointer (member_utype (m, kp)) && !points_to (m)) + if (!object_pointer (utype (m, kp)) && !points_to (m)) { error (l) << "on_delete specified for non-object pointer" << endl; valid_ = false; |