diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-03-10 17:26:38 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-03-10 18:35:13 +0100 |
| commit | 4edcf74065e24c9c152fdf44d1dea891a360ea5b (patch) | |
| tree | a1e71c608f7d72f6532be70bbc56e5fda4b6cb0d | |
| parent | af292bc8dcf31d8df6d4500d63752f9e651cc5ac (diff) | |
sprinkle some `static constexpr inline'
| -rw-r--r-- | dinput/win32-joystick.hpp | 2 | ||||
| -rw-r--r-- | pose-widget/pose-widget.hpp | 2 | ||||
| -rw-r--r-- | tracker-joystick/ftnoir_tracker_joystick.h | 2 | ||||
| -rw-r--r-- | tracker-pt/module/point_extractor.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dinput/win32-joystick.hpp b/dinput/win32-joystick.hpp index 4d2dd344..42ecf57f 100644 --- a/dinput/win32-joystick.hpp +++ b/dinput/win32-joystick.hpp @@ -58,7 +58,7 @@ struct OTR_DINPUT_EXPORT win32_joy_ctx using joys_t = std::unordered_map<QString, std::shared_ptr<joy>>; - static constexpr int joy_axis_size = 65536; + static constexpr inline int joy_axis_size = 65536; struct joy_info { diff --git a/pose-widget/pose-widget.hpp b/pose-widget/pose-widget.hpp index 9b280afc..fa956b47 100644 --- a/pose-widget/pose-widget.hpp +++ b/pose-widget/pose-widget.hpp @@ -86,7 +86,7 @@ struct pose_transform final : QThread std::atomic<bool> fresh; - static constexpr int w = 320, h = 240; + static constexpr inline int w = 320, h = 240; }; class OTR_POSE_WIDGET_EXPORT pose_widget final : public QWidget diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h index f3bbcda6..f84a13d2 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.h +++ b/tracker-joystick/ftnoir_tracker_joystick.h @@ -45,7 +45,7 @@ public: void data(double *data); settings s; QString guid; - static constexpr int AXIS_MAX = win32_joy_ctx::joy_axis_size; + static constexpr inline int AXIS_MAX = win32_joy_ctx::joy_axis_size; win32_joy_ctx joy_ctx; }; diff --git a/tracker-pt/module/point_extractor.h b/tracker-pt/module/point_extractor.h index 1b6f55a2..eac2268c 100644 --- a/tracker-pt/module/point_extractor.h +++ b/tracker-pt/module/point_extractor.h @@ -36,7 +36,7 @@ public: void extract_points(const pt_frame& frame, pt_preview& preview_frame, std::vector<vec2>& points) override; PointExtractor(const QString& module_name); private: - static constexpr int max_blobs = 16; + static constexpr inline int max_blobs = 16; pt_settings s; |