aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-07-16 13:45:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-07-16 13:45:28 +0200
commitd5648dddfd8511d4ddff923bc4479c1c88c53b57 (patch)
tree331628410bc626e2487c5bb0a2edf7962a142d3a
parentf3f9389365a03603c6f9bcc4d502ff4049c72fe2 (diff)
Simplify query inheritance hierarchy
This should also allow Sun CC handle queries for objects with circular dependencies.
-rw-r--r--odb/mssql/query.hxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/odb/mssql/query.hxx b/odb/mssql/query.hxx
index 4844463..eba3f33 100644
--- a/odb/mssql/query.hxx
+++ b/odb/mssql/query.hxx
@@ -2267,7 +2267,8 @@ namespace odb
namespace odb
{
template <typename T>
- class query<T, mssql::query>: public query_selector<T>::type
+ class query<T, mssql::query>: public mssql::query,
+ public query_selector<T>::columns_type
{
public:
// We don't define any typedefs here since they may clash with
@@ -2280,44 +2281,44 @@ namespace odb
explicit
query (bool v)
- : query_selector<T>::type (v)
+ : mssql::query (v)
{
}
explicit
query (const char* q)
- : query_selector<T>::type (q)
+ : mssql::query (q)
{
}
explicit
query (const std::string& q)
- : query_selector<T>::type (q)
+ : mssql::query (q)
{
}
template <typename T2>
explicit
query (mssql::val_bind<T2> v)
- : query_selector<T>::type (mssql::query (v))
+ : mssql::query (mssql::query (v))
{
}
template <typename T2>
explicit
query (mssql::ref_bind<T2> r)
- : query_selector<T>::type (mssql::query (r))
+ : mssql::query (mssql::query (r))
{
}
query (const mssql::query& q)
- : query_selector<T>::type (q)
+ : mssql::query (q)
{
}
template <mssql::database_type_id ID>
query (const mssql::query_column<bool, ID>& qc)
- : query_selector<T>::type (qc)
+ : mssql::query (qc)
{
}
};