From 10e2b15f738477fa36776ba340cf1771348fef21 Mon Sep 17 00:00:00 2001 From: jwendt <wendt@vr.rwth-aachen.de> Date: Fri, 29 Jun 2018 14:39:02 +0200 Subject: [PATCH] make cppcheck happy closes #479 --- tests/src/mocks/openvr_mock.hpp | 2 +- tests/src/mocks/sdl_mock.hpp | 2 +- tests/src/test_vr_controller.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/src/mocks/openvr_mock.hpp b/tests/src/mocks/openvr_mock.hpp index 2b0d15f9..38b02409 100644 --- a/tests/src/mocks/openvr_mock.hpp +++ b/tests/src/mocks/openvr_mock.hpp @@ -269,7 +269,7 @@ class OPENVR_MOCK_EXPORT OpenVRMock { } OpenVRMock& operator=(const OpenVRMock&) = delete; - OpenVRMock& operator=(OpenVRMock&&) = default; + OpenVRMock& operator=(OpenVRMock&&) = delete; OpenVRMockInternal& Get() { return *mock_; } vr::IVRSystemMock& GetSystem() const { return *ivr_system_mock_; } diff --git a/tests/src/mocks/sdl_mock.hpp b/tests/src/mocks/sdl_mock.hpp index 10bfd11b..1d00d1a6 100644 --- a/tests/src/mocks/sdl_mock.hpp +++ b/tests/src/mocks/sdl_mock.hpp @@ -66,7 +66,7 @@ class SDL_MOCK_EXPORT SdlMock { ~SdlMock() { delete mock_; } SdlMock& operator=(const SdlMock&) = delete; - SdlMock& operator=(SdlMock&&) = default; + SdlMock& operator=(SdlMock&&) = delete; SdlMockInternal& Get() { return *mock_; } diff --git a/tests/src/test_vr_controller.cpp b/tests/src/test_vr_controller.cpp index 628db4de..052a8ddd 100644 --- a/tests/src/test_vr_controller.cpp +++ b/tests/src/test_vr_controller.cpp @@ -44,7 +44,7 @@ auto first_call = std::make_shared<bool>(true); void CheckForButtonEvent(uint32_t openVR_event_type, phx::VRController::ButtonEvent vr_cont_event, - uint32_t button_id, std::string side, + uint32_t button_id, const std::string& side, bool expect_to_fire, phx::VRController* vr_controller) { WHEN("a " + side + -- GitLab