diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-05 17:46:11 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-05 17:46:11 +0200 |
commit | 758b3799a8afca1bcfcc80f1863d99417a8de1eb (patch) | |
tree | 50fa1e01674183d812aa84e35837b48a4fd841b3 /odb/details/condition.hxx | |
parent | be85d32f0f645e47104ef1241acac1041cc58c16 (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/condition.hxx')
-rw-r--r-- | odb/details/condition.hxx | 25 |
1 files changed, 24 insertions, 1 deletions
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 <condition_variable> +# include <odb/details/lock.hxx> + +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 <odb/details/posix/condition.hxx> #elif defined(ODB_THREADS_WIN32) |