From 758b3799a8afca1bcfcc80f1863d99417a8de1eb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 5 Aug 2016 17:46:11 +0200
Subject: Initial take on build2-based build

Only C++11 is supported with GCC 4.8 and up and VC 14 and up.

This change also introduces the ODB_THREADS_CXX11 threading model. It
is the default for the build2 build but can be disabled with a global
ODB_THREADS_NONE define (global means that it should be in effect both
when building and using the library).
---
 odb/details/lock.hxx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'odb/details/lock.hxx')

diff --git a/odb/details/lock.hxx b/odb/details/lock.hxx
index 26ab4a8..28f3ede 100644
--- a/odb/details/lock.hxx
+++ b/odb/details/lock.hxx
@@ -10,12 +10,23 @@
 #include <odb/details/export.hxx>
 #include <odb/details/mutex.hxx>
 
+#ifdef ODB_THREADS_CXX11
+#  include <mutex>
 namespace odb
 {
   namespace details
   {
-    struct LIBODB_EXPORT lock
+    using lock = std::unique_lock<mutex>;
+  }
+}
+#else
+namespace odb
+{
+  namespace details
+  {
+    class LIBODB_EXPORT lock
     {
+    public:
       lock (mutex& m)
           : mutex_ (&m)
       {
@@ -43,6 +54,7 @@ namespace odb
     };
   }
 }
+#endif
 
 #include <odb/post.hxx>
 
-- 
cgit v1.1