Rework const object handling

Now objects are always loaded as non-const and the object cache in
session treats all objects as non-const.

1 files changed, 1 insertions, 10 deletions

diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx
index e4933a0..50a40b2 100644
--- a/odb/relational/header.hxx
+++ b/odb/relational/header.hxx
@@ -1163,8 +1163,7 @@ namespace relational
         //
         if (options.generate_query ())
         {
-          os << "template<typename T>" << endl
-             << "static result<T>" << endl
+          os << "static result<object_type>" << endl
              << "query (database&, const query_base_type&);"
              << endl;
 
@@ -1204,14 +1203,6 @@ namespace relational
           "object_type&);"
            << endl;
 
-        if (options.generate_query ())
-          os << "static void" << endl
-             << "query_ (database&," << endl
-             << "const query_base_type&," << endl
-             << db << "::object_statements< object_type >&," << endl
-             << "details::shared_ptr< " << db << "::select_statement >&);"
-             << endl;
-
         os << "};";
       }