diff options
Diffstat (limited to 'odb/details/win32')
| -rw-r--r-- | odb/details/win32/thread.cxx | 5 | ||||
| -rw-r--r-- | odb/details/win32/tls.txx | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/odb/details/win32/thread.cxx b/odb/details/win32/thread.cxx index 2c6e337..f51b949 100644 --- a/odb/details/win32/thread.cxx +++ b/odb/details/win32/thread.cxx @@ -9,8 +9,7 @@ #include <windows.h> #include <process.h> // _beginthreadex, _endthreadex -#include <memory> // std::auto_ptr - +#include <odb/details/unique-ptr.hxx> #include <odb/details/win32/thread.hxx> #include <odb/details/win32/exceptions.hxx> @@ -60,7 +59,7 @@ namespace odb thread:: thread (void* (*func) (void*), void* arg) { - std::auto_ptr<data> d (new data); + unique_ptr<data> d (new data); d->func = func; d->arg = arg; d->count = 2; // One for the thread and one for us. diff --git a/odb/details/win32/tls.txx b/odb/details/win32/tls.txx index 7ce5821..4e3b9ab 100644 --- a/odb/details/win32/tls.txx +++ b/odb/details/win32/tls.txx @@ -2,12 +2,9 @@ // copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include <memory> // std::auto_ptr - +#include <odb/details/unique-ptr.hxx> #include <odb/details/win32/exceptions.hxx> -using namespace std; - namespace odb { namespace details @@ -29,7 +26,7 @@ namespace odb if (void* v = _get (key_)) return *static_cast<T*> (v); - auto_ptr<T> p (new T); + unique_ptr<T> p (new T); _set (key_, p.get ()); T& r (*p); |