From 9072761e0c9486cc3d1265a1c1e2b39db8e68bf7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 9 Nov 2011 20:19:17 +0200 Subject: Make sure we can use same type as both container and simple value --- odb/context.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'odb/context.cxx') diff --git a/odb/context.cxx b/odb/context.cxx index 9842a22..532a6b7 100644 --- a/odb/context.cxx +++ b/odb/context.cxx @@ -1192,19 +1192,17 @@ is_a (data_member_path const& mp, test_inverse_container | test_readonly_container)) != 0) { - semantics::type& c (utype (m)); - if (f & test_container) - r = r || container_wrapper (c); + r = r || container (m); if (f & test_straight_container) - r = r || (container_wrapper (c) && !inverse (m, kp)); + r = r || (container(m) && !inverse (m, kp)); if (f & test_inverse_container) - r = r || (container_wrapper (c) && inverse (m, kp)); + r = r || (container (m) && inverse (m, kp)); if (f & test_readonly_container) - r = r || (container_wrapper (c) && readonly (mp, ms)); + r = r || (container (m) && readonly (mp, ms)); } return r; -- cgit v1.1