From 2ca7acef7c858fb7f21b5101dedfc021aea62ff8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 22 Jun 2015 17:12:20 +0200 Subject: Get rid of member_[u]type(), other cleanups --- odb/relational/source.hxx | 4 ++-- odb/relational/validator.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'odb/relational') 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; -- cgit v1.1