From 8d89bf37dd4ef3cb7373e1841ff57a53916fff0d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Mar 2012 08:36:21 +0200
Subject: Polymorphic inheritance support

---
 odb/header.cxx | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'odb/header.cxx')

diff --git a/odb/header.cxx b/odb/header.cxx
index d316036..a2b3b96 100644
--- a/odb/header.cxx
+++ b/odb/header.cxx
@@ -31,14 +31,12 @@ namespace header
     // the latter is just a using-declaration for the former. To resolve
     // this we will include TR1 traits if the Boost TR1 header is included.
     //
-    if (ctx.unit.count ("tr1-pointer-used") &&
-        ctx.unit.get<bool> ("tr1-pointer-used"))
+    if (ctx.features.tr1_pointer)
     {
       os << "#include <odb/tr1/wrapper-traits.hxx>" << endl
          << "#include <odb/tr1/pointer-traits.hxx>" << endl;
     }
-    else if (ctx.unit.count ("boost-pointer-used") &&
-             ctx.unit.get<bool> ("boost-pointer-used"))
+    else if (ctx.features.boost_pointer)
     {
       os << "#ifdef BOOST_TR1_MEMORY_HPP_INCLUDED" << endl
          << "#  include <odb/tr1/wrapper-traits.hxx>" << endl
@@ -48,9 +46,26 @@ namespace header
 
     os << "#include <odb/container-traits.hxx>" << endl;
 
+    if (ctx.features.polymorphic_object)
+      os << "#include <odb/polymorphic-info.hxx>" << endl;
+
     if (ctx.options.generate_query ())
+    {
       os << "#include <odb/result.hxx>" << endl;
 
+      if (ctx.features.simple_object)
+        os << "#include <odb/simple-object-result.hxx>" << endl;
+
+      if (ctx.features.polymorphic_object)
+        os << "#include <odb/polymorphic-object-result.hxx>" << endl;
+
+      if (ctx.features.no_id_object)
+        os << "#include <odb/no-id-object-result.hxx>" << endl;
+
+      if (ctx.features.view)
+        os << "#include <odb/view-result.hxx>" << endl;
+    }
+
     os << endl;
   }
 }
-- 
cgit v1.1