summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-10-08 13:45:32 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-10-08 13:45:32 +0200
commitac24092ba6df7460860099f8d73f4bb9f2455333 (patch)
treefbd7a6e114d4579c636c7ec161672a83d0def2d4
parent48503f483f29450eca0f5a33381e0b64ef509d80 (diff)
fix harmless msvc warnings
-rw-r--r--compat/check-visible.cpp5
-rw-r--r--options/connector.hpp2
-rw-r--r--tracker-rift-080/ftnoir_tracker_rift_080.cpp3
3 files changed, 7 insertions, 3 deletions
diff --git a/compat/check-visible.cpp b/compat/check-visible.cpp
index a47af156..386bbb1f 100644
--- a/compat/check-visible.cpp
+++ b/compat/check-visible.cpp
@@ -39,8 +39,11 @@ void set_is_visible(const QWidget& w, bool force)
};
for (const QPoint& pt : points)
- if (!!(visible = WindowFromPoint({ pt.x(), pt.y() }) == id))
+ {
+ visible = WindowFromPoint({ pt.x(), pt.y() }) == id;
+ if (visible)
break;
+ }
}
never_inline OTR_COMPAT_EXPORT
diff --git a/options/connector.hpp b/options/connector.hpp
index 06f5d68e..5091ae67 100644
--- a/options/connector.hpp
+++ b/options/connector.hpp
@@ -26,7 +26,7 @@ class base_value;
namespace detail {
-class connector
+class OTR_OPTIONS_EXPORT connector
{
friend class ::options::base_value;
diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_080.cpp
index 4218511d..be18e90d 100644
--- a/tracker-rift-080/ftnoir_tracker_rift_080.cpp
+++ b/tracker-rift-080/ftnoir_tracker_rift_080.cpp
@@ -40,7 +40,8 @@ void rift_tracker_080::start_tracker(QFrame*)
ovrResult code;
ovrGraphicsLuid luid = {{0}};
- if (!OVR_SUCCESS(code = ovr_Initialize(nullptr)))
+ code = ovr_Initialize(nullptr);
+ if (!OVR_SUCCESS(code))
goto error;
code = ovr_Create(&hmd, &luid);