diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-05-03 14:59:40 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-05-03 14:59:40 +0200 |
| commit | da207036f8e9f4b8e431bbabba30813b5d65cbf8 (patch) | |
| tree | 989ee43889849b5a30826f16050ec873f7179656 /tracker-steamvr | |
| parent | a42d3b16dd94aa3d2703431d72fdf995e5a92299 (diff) | |
tracker/{rift,steamvr}: rename reserved identifier
Could be declared as macro.
Issue: #771
Diffstat (limited to 'tracker-steamvr')
| -rw-r--r-- | tracker-steamvr/steamvr.cpp | 6 | ||||
| -rw-r--r-- | tracker-steamvr/steamvr.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tracker-steamvr/steamvr.cpp b/tracker-steamvr/steamvr.cpp index fd21187b..7bb2fb22 100644 --- a/tracker-steamvr/steamvr.cpp +++ b/tracker-steamvr/steamvr.cpp @@ -164,12 +164,12 @@ tt device_list::vr_init_() if (v) std::atexit(vr::VR_Shutdown); else - qDebug() << "steamvr: init failure" << error << device_list::strerror(error); + qDebug() << "steamvr: init failure" << error << device_list::error_string(error); return tt(v, error); } -QString device_list::strerror(vr_error_t err) +QString device_list::error_string(vr_error_t err) { const char* str(vr::VR_GetVRInitErrorAsSymbol(err)); return QString(str ? str : "No description"); @@ -191,7 +191,7 @@ module_status steamvr::start_tracker(QFrame*) if (!v) { - err = device_list::strerror(e); + err = device_list::error_string(e); return error(err); } diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp index 73964593..c4e10adb 100644 --- a/tracker-steamvr/steamvr.hpp +++ b/tracker-steamvr/steamvr.hpp @@ -55,7 +55,7 @@ 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(vr_error_t error); + static QString error_string(vr_error_t error); static constexpr inline unsigned max_devices = vr::k_unMaxTrackedDeviceCount; template<typename F> |