From 3d1985a7d0d282998a0995c5167592f5305960f0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 4 May 2016 20:59:08 +0200
Subject: Fix bug in previous fix (include object statements for OLV)

---
 odb/validator.cxx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/odb/validator.cxx b/odb/validator.cxx
index f5c4c33..9b95b31 100644
--- a/odb/validator.cxx
+++ b/odb/validator.cxx
@@ -1676,13 +1676,16 @@ namespace
 
         for (view_objects::iterator i (objs.begin ()); i != objs.end (); ++i)
         {
-          if (i->kind == view_object::object && polymorphic (*i->obj))
-            features.polymorphic_object = true;
-          else if (i->ptr != 0)
+          if (i->kind == view_object::object)
           {
-            (id_member (*i->obj) != 0
-             ? features.simple_object
-             : features.no_id_object) = true;
+            if (polymorphic (*i->obj))
+              features.polymorphic_object = true;
+            else if (i->ptr != 0)
+            {
+              (id_member (*i->obj) != 0
+               ? features.simple_object
+               : features.no_id_object) = true;
+            }
           }
         }
       }
-- 
cgit v1.1