From f69994437c991f5bd67994b2f55344a3d3619ad1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 21 Jun 2013 11:05:00 +0200
Subject: Revert "Make move constructor inline" change as not backwards
compatible
---
odb/vector-impl.cxx | 13 +++++++++++++
odb/vector-impl.ixx | 12 ------------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/odb/vector-impl.cxx b/odb/vector-impl.cxx
index 402f5cf..3a54196 100644
--- a/odb/vector-impl.cxx
+++ b/odb/vector-impl.cxx
@@ -177,6 +177,19 @@ namespace odb
// vector_base
//
+#ifdef ODB_CXX11
+ vector_base::
+ vector_base (vector_base&& x)
+ : impl_ (std::move (x.impl_)), tran_ (0)
+ {
+ if (x.tran_ != 0)
+ {
+ x.tran_->callback_unregister (&x);
+ _arm (*x.tran_);
+ }
+ }
+#endif
+
void vector_base::
rollback (unsigned short, void* key, unsigned long long)
{
diff --git a/odb/vector-impl.ixx b/odb/vector-impl.ixx
index 9fdadfb..02c27f4 100644
--- a/odb/vector-impl.ixx
+++ b/odb/vector-impl.ixx
@@ -137,18 +137,6 @@ namespace odb
// vector_base
//
-#ifdef ODB_CXX11
- inline vector_base::
- vector_base (vector_base&& x)
- : impl_ (std::move (x.impl_)), tran_ (0)
- {
- if (x.tran_ != 0)
- {
- x.tran_->callback_unregister (&x);
- _arm (*x.tran_);
- }
- }
-#endif
inline void vector_base::
_arm (transaction& t) const
--
cgit v1.1