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/condition.hxx | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'odb/details/condition.hxx') diff --git a/odb/details/condition.hxx b/odb/details/condition.hxx index cf22a70..1baa81b 100644 --- a/odb/details/condition.hxx +++ b/odb/details/condition.hxx @@ -17,6 +17,8 @@ namespace odb namespace details { class mutex; + class lock; + class LIBODB_EXPORT condition { public: @@ -26,7 +28,7 @@ namespace odb signal () {} void - wait () {} + wait (lock&) {} private: condition (const condition&); @@ -35,6 +37,27 @@ namespace odb } } +#elif defined(ODB_THREADS_CXX11) +# include +# include + +namespace odb +{ + namespace details + { + class mutex; + + class condition: public std::condition_variable + { + public: + condition (mutex&) {} + + void + signal () {notify_one ();} + }; + } +} + #elif defined(ODB_THREADS_POSIX) #include #elif defined(ODB_THREADS_WIN32) -- cgit v1.1