From 9072761e0c9486cc3d1265a1c1e2b39db8e68bf7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 9 Nov 2011 20:19:17 +0200
Subject: Make sure we can use same type as both container and simple value

---
 odb/relational/source.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'odb/relational/source.cxx')

diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx
index be16309..749e0d6 100644
--- a/odb/relational/source.cxx
+++ b/odb/relational/source.cxx
@@ -259,10 +259,12 @@ namespace relational
         {
           using semantics::type;
 
-          type* t (&context::utype (*m));
+          type* t;
 
-          if (type* c = context::container_wrapper (*t))
+          if (type* c = context::container (*m))
             t = &context::container_vt (*c);
+          else
+            t = &context::utype (*m);
 
           if (context::object_pointer (*t))
             return e;
-- 
cgit v1.1