aboutsummaryrefslogtreecommitdiff
path: root/odb/details/win32
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-05 17:46:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-05 17:46:11 +0200
commit758b3799a8afca1bcfcc80f1863d99417a8de1eb (patch)
tree50fa1e01674183d812aa84e35837b48a4fd841b3 /odb/details/win32
parentbe85d32f0f645e47104ef1241acac1041cc58c16 (diff)
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).
Diffstat (limited to 'odb/details/win32')
-rw-r--r--odb/details/win32/condition.cxx2
-rw-r--r--odb/details/win32/condition.hxx4
2 files changed, 4 insertions, 2 deletions
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&);