diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2013-05-11 06:52:02 -0400 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-11 18:21:40 +0200 |
commit | a77412ed3603c86e3a5043e678e7e8abb09b1fc8 (patch) | |
tree | 99ca2023366b99da0d9141ee8160712c0d7ae26a /odb/vector-impl.cxx | |
parent | 4fa9af2045dee259949c89cc6e0fa93adc326869 (diff) |
Make move constructor inline
C++11 support has to be inline or template.
Diffstat (limited to 'odb/vector-impl.cxx')
-rw-r--r-- | odb/vector-impl.cxx | 24 |
1 files changed, 2 insertions, 22 deletions
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) { |