From 38b4810e67bf461ddad1cdd75b491ba7f8d5dd9b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 11 May 2013 06:52:02 -0400
Subject: Make move constructor inline

C++11 support has to be inline or template.
---
 odb/vector-impl.cxx | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'odb/vector-impl.cxx')

diff --git a/odb/vector-impl.cxx b/odb/vector-impl.cxx
index 08019d6..402f5cf 100644
--- a/odb/vector-impl.cxx
+++ b/odb/vector-impl.cxx
@@ -4,15 +4,8 @@
 
 #include <odb/vector-impl.hxx>
 
-#include <cstring> // std::memcpy, std::memset
-
-#ifdef ODB_CXX11
-#  include <utility> // std::swap, std::move
-#else
-#  include <algorithm> // std::swap
-#endif
-
-#include <iostream> // @@ tmp
+#include <cstring>   // std::memcpy, std::memset
+#include <algorithm> // std::swap
 
 using namespace std;
 
@@ -184,19 +177,6 @@ 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)
   {
-- 
cgit v1.1