From 2b02d443ab344bc02dfc2891fb1a57c6520c393f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 19 Aug 2010 17:05:24 +0200
Subject: Use type names as specified in the header that we compile

---
 odb/mysql/header.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'odb/mysql/header.cxx')

diff --git a/odb/mysql/header.cxx b/odb/mysql/header.cxx
index 237cb85..bdb98a4 100644
--- a/odb/mysql/header.cxx
+++ b/odb/mysql/header.cxx
@@ -216,12 +216,6 @@ namespace mysql
 
         string const& type (c.fq_name ());
 
-        // Find the id member and type.
-        //
-        id_member_.traverse (c);
-        semantics::data_member& id (*id_member_.member ());
-        semantics::type& id_type (id.type ());
-
         member_count_.traverse (c);
         size_t column_count (member_count_.count ());
 
@@ -241,8 +235,14 @@ namespace mysql
 
         // id_type
         //
-        os << "typedef " << id_type.fq_name () << " id_type;"
-           << endl;
+        {
+          id_member_.traverse (c);
+          semantics::data_member& id (*id_member_.member ());
+
+          os << "typedef " << id.type ().fq_name (id.belongs ().hint ()) <<
+            " id_type;"
+             << endl;
+        }
 
         // image_type
         //
-- 
cgit v1.1