1 files changed, 42 insertions, 0 deletions
diff --git a/odb/details/thread.hxx b/odb/details/thread.hxx
index 858263d..79c1b62 100644
--- a/odb/details/thread.hxx
+++ b/odb/details/thread.hxx
@@ -8,9 +8,51 @@
 #include <odb/pre.hxx>
 
 #include <odb/details/config.hxx>
+#include <odb/details/export.hxx>
 
 #ifdef ODB_THREADS_NONE
 # error no thread support available
+#elif defined(ODB_THREADS_CXX11)
+#  include <thread>
+#  include <future>
+#  include <utility> // move()
+
+namespace odb
+{
+  namespace details
+  {
+    class LIBODB_EXPORT thread
+    {
+    public:
+      thread (void* (*thread_func) (void*), void* arg = 0)
+      {
+        std::promise<void*> p;
+        f_ = p.get_future ();
+        t_ = std::thread (thunk, thread_func, arg, std::move (p));
+      }
+
+      void*
+      join ()
+      {
+        f_.wait ();
+        t_.join ();
+        return f_.get ();
+      }
+
+      thread (const thread&) = delete;
+      thread& operator= (const thread&) = delete;
+
+    private:
+      static void
+      thunk (void* (*) (void*), void*, std::promise<void*>);
+
+    private:
+      std::thread t_;
+      std::future<void*> f_;
+    };
+  }
+}
+
 #elif defined(ODB_THREADS_POSIX)
 #include <odb/details/posix/thread.hxx>
 #elif defined(ODB_THREADS_WIN32)