Various bug fixes for dynamic multi-database support2.2.22.2

1 files changed, 7 insertions, 3 deletions

diff --git a/odb/common-query.hxx b/odb/common-query.hxx
index 5a07c86..b340b9f 100644
--- a/odb/common-query.hxx
+++ b/odb/common-query.hxx
@@ -177,22 +177,26 @@ private:
   bool ptr_;
 };
 
-// Generate explicit instantiations of base classes (reuse inheritance).
+// Generate explicit instantiations of base classes.
 //
 struct query_columns_base_insts: traversal::class_, virtual context
 {
   typedef query_columns_base_insts base;
 
-  query_columns_base_insts (bool ptr, bool decl, string const& alias);
+  query_columns_base_insts (bool test_ptr,
+                            bool decl,
+                            string const& alias,
+                            bool poly); // Traverse polymorphic bases.
   query_columns_base_insts (query_columns_base_insts const&);
 
   virtual void
   traverse (type&);
 
 private:
-  bool ptr_;
+  bool test_ptr_;
   bool decl_;
   string alias_;
+  bool poly_;
   traversal::inherits inherits_;
 };