summaryrefslogtreecommitdiffhomepage
path: root/tracker-steamvr/steamvr.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-05-03 14:54:09 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-05-03 14:54:09 +0200
commita42d3b16dd94aa3d2703431d72fdf995e5a92299 (patch)
tree9e5fe05e5a47184f2dba329aa38cbf007cc2d06c /tracker-steamvr/steamvr.hpp
parenta1fd815088ad6a98b580109f91ba8929453fca56 (diff)
tracker/steamvr: fix GNU libc typedef conflict
Really sometimes they should be less intrusive. Reported-by: @zanoni-mbdyn Issue: #771
Diffstat (limited to 'tracker-steamvr/steamvr.hpp')
-rw-r--r--tracker-steamvr/steamvr.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp
index 4ae52371..73964593 100644
--- a/tracker-steamvr/steamvr.hpp
+++ b/tracker-steamvr/steamvr.hpp
@@ -21,10 +21,10 @@ using namespace options;
using rmat = euler::rmat;
using euler_t = euler::euler_t;
-using error_t = vr::EVRInitError;
+using vr_error_t = vr::EVRInitError;
using vr_t = vr::IVRSystem*;
-using tt = std::tuple<vr_t, error_t>;
+using tt = std::tuple<vr_t, vr_error_t>;
using pose_t = vr::TrackedDevicePose_t;
using origin = vr::ETrackingUniverseOrigin;
@@ -55,11 +55,11 @@ struct device_list final
const QList<device_spec>& devices() const { return device_specs; }
static never_inline maybe_pose get_pose(int k);
- static QString strerror(error_t error);
+ static QString strerror(vr_error_t error);
static constexpr inline unsigned max_devices = vr::k_unMaxTrackedDeviceCount;
template<typename F>
- friend auto with_vr_lock(F&& fun) -> decltype(fun(vr_t(), error_t()));
+ friend auto with_vr_lock(F&& fun) -> decltype(fun(vr_t(), vr_error_t()));
private:
QList<device_spec> device_specs;