diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-05-04 11:51:47 +0200 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-05-05 12:34:52 +0200 | 
| commit | a6f095c01e93090e185afd0d9f26bf4565a552ed (patch) | |
| tree | f20a632b256bfa95b4470654a61f829d5a117f3b /logic | |
| parent | 7f8043b8287e187a7c1d4f0175ed9c527d6bdcc6 (diff) | |
compat, logic/pipeline: add bitwise enum operators
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/pipeline.cpp | 2 | ||||
| -rw-r--r-- | logic/pipeline.hpp | 11 | 
2 files changed, 8 insertions, 5 deletions
| diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp index 5f17f2b1..e562ef7f 100644 --- a/logic/pipeline.cpp +++ b/logic/pipeline.cpp @@ -667,7 +667,7 @@ void bits::negate(flags flag_)      }  } -bool bits::get(unsigned flag) +bool bits::get(flags flag)  {      return !!(b & flag);  } diff --git a/logic/pipeline.hpp b/logic/pipeline.hpp index 7c18f7fc..2fe0f64b 100644 --- a/logic/pipeline.hpp +++ b/logic/pipeline.hpp @@ -6,6 +6,7 @@  #include "api/plugin-support.hpp"  #include "mappings.hpp"  #include "compat/euler.hpp" +#include "compat/enum-operators.hpp"  #include "runtime-libraries.hpp"  #include "extensions.hpp" @@ -62,7 +63,7 @@ public:  using namespace time_units;  struct OTR_LOGIC_EXPORT bits -{ +{         enum flags : unsigned {          f_center         = 1 << 0,          f_held_center    = 1 << 1, @@ -73,12 +74,14 @@ struct OTR_LOGIC_EXPORT bits      std::atomic<unsigned> b; -    void set(flags flag_, bool val_); +    void set(flags flag_, bool val);      void negate(flags flag_); -    bool get(unsigned flag); +    bool get(flags flag);      bits();  }; +DEFINE_ENUM_OPERATORS(bits::flags); +  class OTR_LOGIC_EXPORT pipeline : private QThread, private bits  {      Q_OBJECT @@ -144,6 +147,6 @@ public:      void set_zero(bool value);  }; -} // ns pipeine_impl +} // ns pipeline_impl  using pipeline_impl::pipeline; | 
