aboutsummaryrefslogtreecommitdiff
path: root/odb/tr1
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-10-19 10:47:40 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-10-21 19:02:01 +0200
commit19c89827d68440780c918d32cae26eaa2241861d (patch)
treeaefe16779c349b520fb77ca0086a93c456fe5ede /odb/tr1
parentcc569c1834e191eda45a328cfe34d15181d2d396 (diff)
Add support for const data members
Const data members are automatically treated as readonly. New test: const-member.
Diffstat (limited to 'odb/tr1')
-rw-r--r--odb/tr1/wrapper-traits.hxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/odb/tr1/wrapper-traits.hxx b/odb/tr1/wrapper-traits.hxx
index e65e2d7..f8a9f6c 100644
--- a/odb/tr1/wrapper-traits.hxx
+++ b/odb/tr1/wrapper-traits.hxx
@@ -26,6 +26,12 @@ namespace odb
typedef T wrapped_type;
typedef std::tr1::shared_ptr<T> wrapper_type;
+ // T can be const.
+ //
+ typedef
+ typename details::meta::remove_const<T>::result
+ unrestricted_wrapped_type;
+
static const bool null_handler = true;
static const bool null_default = false;
@@ -47,13 +53,13 @@ namespace odb
return *p;
}
- static wrapped_type&
+ static unrestricted_wrapped_type&
set_ref (wrapper_type& p)
{
if (!p)
- p.reset (new wrapped_type);
+ p.reset (new unrestricted_wrapped_type);
- return *p;
+ return const_cast<unrestricted_wrapped_type&> (*p);
}
};
}