From a21f161ebbec15125fd6bc8a006a7beeea77d032 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Sep 2011 13:00:33 +0200
Subject: Rework const object handling

Now objects are always loaded as non-const and the object cache in
session treats all objects as non-const.
---
 odb/sqlite/object-result.hxx | 8 ++++----
 odb/sqlite/view-result.hxx   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'odb')

diff --git a/odb/sqlite/object-result.hxx b/odb/sqlite/object-result.hxx
index b3dbf2b..401c83a 100644
--- a/odb/sqlite/object-result.hxx
+++ b/odb/sqlite/object-result.hxx
@@ -29,12 +29,12 @@ namespace odb
     public:
       typedef odb::result_impl<T, class_object> base_type;
 
-      typedef typename base_type::pointer_type pointer_type;
-      typedef typename base_type::pointer_traits pointer_traits;
-
+      typedef typename base_type::object_traits object_traits;
       typedef typename base_type::object_type object_type;
       typedef typename base_type::id_type id_type;
-      typedef typename base_type::object_traits object_traits;
+
+      typedef typename base_type::pointer_type pointer_type;
+      typedef typename base_type::pointer_traits pointer_traits;
 
       virtual
       ~result_impl ();
diff --git a/odb/sqlite/view-result.hxx b/odb/sqlite/view-result.hxx
index 7f65c4b..fe4fca5 100644
--- a/odb/sqlite/view-result.hxx
+++ b/odb/sqlite/view-result.hxx
@@ -29,12 +29,12 @@ namespace odb
     public:
       typedef odb::result_impl<T, class_view> base_type;
 
-      typedef typename base_type::pointer_type pointer_type;
-      typedef typename base_type::pointer_traits pointer_traits;
-
       typedef typename base_type::view_type view_type;
       typedef typename base_type::view_traits view_traits;
 
+      typedef typename base_type::pointer_type pointer_type;
+      typedef typename base_type::pointer_traits pointer_traits;
+
       virtual
       ~result_impl ();
 
-- 
cgit v1.1