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/win32/condition.cxx | 2 +-
 odb/details/win32/condition.hxx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'odb/details/win32')

diff --git a/odb/details/win32/condition.cxx b/odb/details/win32/condition.cxx
index 6e22823..05402ef 100644
--- a/odb/details/win32/condition.cxx
+++ b/odb/details/win32/condition.cxx
@@ -28,7 +28,7 @@ namespace odb
     }
 
     void condition::
-    wait ()
+    wait (lock&)
     {
       // When we enter this functions the mutex is locked. When we
       // return from this function the mutex must be locked.
diff --git a/odb/details/win32/condition.hxx b/odb/details/win32/condition.hxx
index 56eebf6..be06557 100644
--- a/odb/details/win32/condition.hxx
+++ b/odb/details/win32/condition.hxx
@@ -18,6 +18,8 @@ namespace odb
 {
   namespace details
   {
+    class lock;
+
     class LIBODB_EXPORT condition
     {
     public:
@@ -28,7 +30,7 @@ namespace odb
       signal ();
 
       void
-      wait ();
+      wait (lock&);
 
     private:
       condition (const condition&);
-- 
cgit v1.1