From c9ff2aaaf3cadcd1a80455cba426ffb12e62ce7b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 19 Sep 2011 09:50:32 +0200 Subject: Use query_base_type instead of query_type as argument type The base type is sufficient. --- odb/relational/header.hxx | 8 ++++---- odb/relational/source.hxx | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx index 4ac919c..51c95f9 100644 --- a/odb/relational/header.hxx +++ b/odb/relational/header.hxx @@ -1165,11 +1165,11 @@ namespace relational { os << "template" << endl << "static result" << endl - << "query (database&, const query_type&);" + << "query (database&, const query_base_type&);" << endl; os << "static unsigned long long" << endl - << "erase_query (database&, const query_type&);" + << "erase_query (database&, const query_base_type&);" << endl; } @@ -1207,7 +1207,7 @@ namespace relational if (options.generate_query ()) os << "static void" << endl << "query_ (database&," << endl - << "const query_type&," << endl + << "const query_base_type&," << endl << db << "::object_statements< object_type >&," << endl << "details::shared_ptr< " << db << "::select_statement >&);" << endl; @@ -1402,7 +1402,7 @@ namespace relational // query () // os << "static result" << endl - << "query (database&, const query_type&);" + << "query (database&, const query_base_type&);" << endl; view_public_extra_post (c); diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx index 8512c2d..cd89081 100644 --- a/odb/relational/source.hxx +++ b/odb/relational/source.hxx @@ -2711,7 +2711,7 @@ namespace relational << traits << "::" << endl << "query< " << traits << "::object_type > (" << endl << "database& db," << endl - << "const query_type& q)" + << "const query_base_type& q)" << "{" << "using namespace " << db << ";" << "using odb::details::shared;" @@ -2740,7 +2740,7 @@ namespace relational << traits << "::" << endl << "query< const " << traits << "::object_type > (" << endl << "database& db," << endl - << "const query_type& q)" + << "const query_base_type& q)" << "{" << "using namespace " << db << ";" << "using odb::details::shared;" @@ -2766,7 +2766,7 @@ namespace relational os << "void " << traits << "::" << endl << "query_ (database&," << endl - << "const query_type& q," << endl + << "const query_base_type& q," << endl << db << "::object_statements< object_type >& sts," << endl << "odb::details::shared_ptr<" << db << "::select_statement>& st)" << "{" @@ -2796,7 +2796,7 @@ namespace relational // erase_query // os << "unsigned long long " << traits << "::" << endl - << "erase_query (database&, const query_type& q)" + << "erase_query (database&, const query_base_type& q)" << "{" << "using namespace " << db << ";" << endl @@ -3574,7 +3574,7 @@ namespace relational // os << "result< " << traits << "::view_type >" << endl << traits << "::" << endl - << "query (database&, const query_type& q)" + << "query (database&, const query_base_type& q)" << "{" << "using namespace " << db << ";" << "using odb::details::shared;" -- cgit v1.1