From 650bcfa07b968118c7f77a5408ec504e42c5d8a3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 29 Feb 2012 11:53:22 +0200 Subject: Support for C++11 std::unique_ptr and std::shared_ptr as wrappers --- odb/wrapper-traits.hxx | 101 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 1 deletion(-) diff --git a/odb/wrapper-traits.hxx b/odb/wrapper-traits.hxx index 35dec0e..8816f5a 100644 --- a/odb/wrapper-traits.hxx +++ b/odb/wrapper-traits.hxx @@ -7,10 +7,11 @@ #include -#include // std::auto_ptr +#include // std::auto_ptr, std::unique_ptr, std::shared_ptr/weak_ptr #include +#include // ODB_CXX11 #include namespace odb @@ -122,6 +123,104 @@ namespace odb } }; +#ifdef ODB_CXX11 + + // Specialization for C++11 std::unique_ptr. + // + template + class wrapper_traits> + { + public: + // T can be const. + // + typedef T wrapped_type; + typedef std::unique_ptr wrapper_type; + + // T can be const. + // + typedef + typename odb::details::meta::remove_const::result + unrestricted_wrapped_type; + + static const bool null_handler = true; + static const bool null_default = false; + + static bool + get_null (const wrapper_type& p) + { + return !p; + } + + static void + set_null (wrapper_type& p) + { + p.reset (); + } + + static const wrapped_type& + get_ref (const wrapper_type& p) + { + return *p; + } + + static unrestricted_wrapped_type& + set_ref (wrapper_type& p) + { + if (!p) + p.reset (new unrestricted_wrapped_type ()); + + return const_cast (*p); + } + }; + + // Specialization for C++11 std::shared_ptr. + // + template + class wrapper_traits> + { + public: + typedef T wrapped_type; + typedef std::shared_ptr wrapper_type; + + // T can be const. + // + typedef + typename odb::details::meta::remove_const::result + unrestricted_wrapped_type; + + static const bool null_handler = true; + static const bool null_default = false; + + static bool + get_null (const wrapper_type& p) + { + return !p; + } + + static void + set_null (wrapper_type& p) + { + p.reset (); + } + + static const wrapped_type& + get_ref (const wrapper_type& p) + { + return *p; + } + + static unrestricted_wrapped_type& + set_ref (wrapper_type& p) + { + if (!p) + p.reset (new unrestricted_wrapped_type); + + return const_cast (*p); + } + }; + +#endif // ODB_CXX11 + // Specialization for odb::nullable. // template -- cgit v1.1