merge with dev

2019-04-11 08:12:04 +02:00
parent e2f6164551 bb58e65ffc
commit e80617d39b
22 changed files with 68 additions and 90 deletions
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -699,10 +699,7 @@ public:
    ProcEvent(): code_(0) {}
    ProcEvent(ProcEventCode code): code_(code) {}
    explicit ProcEvent(int code): code_(code) {}
-    operator int()
-    {
-        return code_;
-    }
+    operator int() const { return code_; }

 private:
    int code_;