aboutsummaryrefslogtreecommitdiff
path: root/odb/boost
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-08-04 13:32:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-08-04 13:32:25 +0200
commita815b90fe870d6d740c91a60ec0633f8bc256337 (patch)
treec8ac0b04e0a3e87f9b2bd8503e362dcee69ce06d /odb/boost
parent7051803dcbde4c52507361d6b471746cc5e88dce (diff)
Add support for boost::optional and boost::shared_ptr as value wrappers
New test: boost/common/optional.
Diffstat (limited to 'odb/boost')
-rw-r--r--odb/boost/optional.options9
-rw-r--r--odb/boost/optional/wrapper-traits.hxx59
-rw-r--r--odb/boost/smart-ptr.options5
-rw-r--r--odb/boost/smart-ptr/wrapper-traits.hxx60
4 files changed, 133 insertions, 0 deletions
diff --git a/odb/boost/optional.options b/odb/boost/optional.options
new file mode 100644
index 0000000..fe99428
--- /dev/null
+++ b/odb/boost/optional.options
@@ -0,0 +1,9 @@
+# file : odb/boost/optional.options
+# author : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+# license : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/version
+
+--odb-epilogue '#include <odb/boost/optional/wrapper-traits.hxx>'
+--hxx-prologue '#include <odb/boost/optional/wrapper-traits.hxx>'
diff --git a/odb/boost/optional/wrapper-traits.hxx b/odb/boost/optional/wrapper-traits.hxx
new file mode 100644
index 0000000..04f4b55
--- /dev/null
+++ b/odb/boost/optional/wrapper-traits.hxx
@@ -0,0 +1,59 @@
+// file : odb/boost/optional/wrapper-traits.hxx
+// author : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_OPTIONAL_WRAPPER_TRAITS_HXX
+#define ODB_BOOST_OPTIONAL_WRAPPER_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <boost/none.hpp>
+#include <boost/optional.hpp>
+
+#include <odb/wrapper-traits.hxx>
+
+namespace odb
+{
+ template <typename T>
+ class wrapper_traits< ::boost::optional<T> >
+ {
+ public:
+ typedef T wrapped_type;
+ typedef ::boost::optional<T> wrapper_type;
+
+ static const bool null_handler = true;
+ static const bool null_default = true;
+
+ static bool
+ get_null (const wrapper_type& o)
+ {
+ return !o;
+ }
+
+ static void
+ set_null (wrapper_type& o)
+ {
+ o = ::boost::none;
+ }
+
+ static const wrapped_type&
+ get_ref (const wrapper_type& o)
+ {
+ return *o;
+ }
+
+ static wrapped_type&
+ set_ref (wrapper_type& o)
+ {
+ if (!o)
+ o = T ();
+
+ return *o;
+ }
+ };
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_BOOST_OPTIONAL_WRAPPER_TRAITS_HXX
diff --git a/odb/boost/smart-ptr.options b/odb/boost/smart-ptr.options
index 9e4e41b..9efb645 100644
--- a/odb/boost/smart-ptr.options
+++ b/odb/boost/smart-ptr.options
@@ -14,3 +14,8 @@
#
--odb-epilogue '#include <odb/boost/smart-ptr/pointer-traits.hxx>'
--hxx-prologue '#include <odb/boost/smart-ptr/pointer-traits.hxx>'
+
+# Include wrapper traits.
+#
+--odb-epilogue '#include <odb/boost/smart-ptr/wrapper-traits.hxx>'
+--hxx-prologue '#include <odb/boost/smart-ptr/wrapper-traits.hxx>'
diff --git a/odb/boost/smart-ptr/wrapper-traits.hxx b/odb/boost/smart-ptr/wrapper-traits.hxx
new file mode 100644
index 0000000..5389eca
--- /dev/null
+++ b/odb/boost/smart-ptr/wrapper-traits.hxx
@@ -0,0 +1,60 @@
+// file : odb/boost/smart-ptr/wrapper-traits.hxx
+// author : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_SMART_PTR_WRAPPER_TRAITS_HXX
+#define ODB_BOOST_SMART_PTR_WRAPPER_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <boost/shared_ptr.hpp>
+
+#include <odb/wrapper-traits.hxx>
+
+namespace odb
+{
+ // Specialization for boost::shared_ptr.
+ //
+ template <typename T>
+ class wrapper_traits< ::boost::shared_ptr<T> >
+ {
+ public:
+ typedef T wrapped_type;
+ typedef ::boost::shared_ptr<T> wrapper_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 wrapped_type&
+ set_ref (wrapper_type& p)
+ {
+ if (!p)
+ p.reset (new wrapped_type);
+
+ return *p;
+ }
+ };
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_BOOST_SMART_PTR_WRAPPER_TRAITS_HXX