From 040a6a777be8b933e4c1c4528e9dd2cb516c3c36 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 16 Jul 2012 13:45:27 +0200
Subject: Simplify query inheritance hierarchy

This should also allow Sun CC handle queries for objects with circular
dependencies.
---
 odb/query.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odb/query.hxx b/odb/query.hxx
index e654ade..9f889db 100644
--- a/odb/query.hxx
+++ b/odb/query.hxx
@@ -63,14 +63,14 @@ namespace odb
   struct query_selector_impl<T, class_object>
   {
     typedef typename object_traits<T>::query_base_type base_type;
-    typedef typename object_traits<T>::query_type type;
+    typedef query_columns<T, access::object_traits<T> > columns_type;
   };
 
   template <typename T>
   struct query_selector_impl<T, class_view>
   {
     typedef typename view_traits<T>::query_base_type base_type;
-    typedef typename view_traits<T>::query_type type;
+    typedef typename view_traits<T>::query_columns columns_type;
   };
 
   template <typename T>
-- 
cgit v1.1