Skip to content
Snippets Groups Projects
Commit be0ccc99 authored by Fabian Lennartz's avatar Fabian Lennartz
Browse files

Merge branch 'feature/#479_fix_cppcheck_clang_conan' into 'master'

Feature/#479 fix cppcheck clang conan

See merge request VR-Group/Project_Phoenix!147
parents b2fa88bb 10e2b15f
No related branches found
No related tags found
1 merge request!147Feature/#479 fix cppcheck clang conan
......@@ -36,7 +36,7 @@ else()
message(STATUS "Use cppcheck from: ${CPPCHECK_COMMAND}")
endif()
set(CPPCHECK_ARGUMENTS --enable=warning,performance,portability,missingInclude,unusedFunction,style --error-exitcode=1 --quiet --verbose)
set(CPPCHECK_ARGUMENTS --enable=warning,performance,portability,missingInclude,style --suppress=unusedFunction --error-exitcode=1 --quiet --verbose)
if(MSVC)
list(APPEND CPPCHECK_ARGUMENTS --template=vs)
elseif(CLANG)
......
......@@ -33,7 +33,7 @@ class ProjectPhoenix(ConanFile):
("boost_optional/1.66.0@bincrafters/testing"),
("boost_signals2/1.66.0@bincrafters/testing"), #still not working in stable, change whenever available (also boost_optional)
("catch/1.12.0@RWTH-VR/thirdparty"),
("cppcheck/1.82@RWTH-VR/thirdparty"),
("cppcheck/1.84@RWTH-VR/thirdparty"),
("cpplint/e8ffd7c@RWTH-VR/thirdparty"),
("freeimage/3.17.0_2@RWTH-VR/thirdparty"),
("gl/1.1.1@RWTH-VR/thirdparty"),
......
......@@ -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_; }
......
......@@ -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_; }
......
......@@ -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 +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment