From 4fd6bca4e75870958ea61b94e0a1e60e78cd91bc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 8 Jan 2012 17:27:40 +0200
Subject: Add support for defining composite value type as class template
 instantiations

---
 odb/relational/source.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx
index 749e0d6..39a2ddc 100644
--- a/odb/relational/source.cxx
+++ b/odb/relational/source.cxx
@@ -172,7 +172,7 @@ namespace relational
           if (multi_obj)
           {
             r += "::";
-            r += vo->obj->name ();
+            r += context::class_name (*vo->obj);
           }
         }
 
@@ -563,16 +563,20 @@ namespace relational
 
       traversal::unit unit;
       traversal::defines unit_defines;
+      typedefs unit_typedefs (false);
       traversal::namespace_ ns;
       instance<class_> c;
 
       unit >> unit_defines >> ns;
       unit_defines >> c;
+      unit >> unit_typedefs >> c;
 
       traversal::defines ns_defines;
+      typedefs ns_typedefs (false);
 
       ns >> ns_defines >> ns;
       ns_defines >> c;
+      ns >> ns_typedefs >> c;
 
       instance<include> i;
       i->generate ();
-- 
cgit v1.1