From 19c89827d68440780c918d32cae26eaa2241861d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 19 Oct 2011 10:47:40 +0200 Subject: Add support for const data members Const data members are automatically treated as readonly. New test: const-member. --- odb/tr1/wrapper-traits.hxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'odb/tr1') 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 wrapper_type; + // T can be const. + // + typedef + typename details::meta::remove_const::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 (*p); } }; } -- cgit v1.1