From 758b3799a8afca1bcfcc80f1863d99417a8de1eb Mon Sep 17 00:00:00 2001 From: Boris Kolpackov 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/posix/condition.hxx | 4 +++- odb/details/posix/condition.ixx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'odb/details/posix') diff --git a/odb/details/posix/condition.hxx b/odb/details/posix/condition.hxx index 6a86741..7a9dd2d 100644 --- a/odb/details/posix/condition.hxx +++ b/odb/details/posix/condition.hxx @@ -16,6 +16,8 @@ namespace odb { namespace details { + class lock; + class LIBODB_EXPORT condition { public: @@ -26,7 +28,7 @@ namespace odb signal (); void - wait (); + wait (lock&); private: condition (const condition&); diff --git a/odb/details/posix/condition.ixx b/odb/details/posix/condition.ixx index 9ebd60e..0aa504b 100644 --- a/odb/details/posix/condition.ixx +++ b/odb/details/posix/condition.ixx @@ -30,7 +30,7 @@ namespace odb } inline void condition:: - wait () + wait (lock&) { if (int e = pthread_cond_wait (&cond_, &mutex_.mutex_)) throw posix_exception (e); -- cgit v1.1