diff --git a/cmake/linux/compilerconfig.cmake b/cmake/linux/compilerconfig.cmake index d7ea99de..3d408b11 100644 --- a/cmake/linux/compilerconfig.cmake +++ b/cmake/linux/compilerconfig.cmake @@ -70,11 +70,14 @@ endif() if(CMAKE_CXX_COMPILER_ID STREQUAL GNU) # Disable false-positive warning in GCC 12.1.0 and later add_compile_options(-Wno-error=maybe-uninitialized) + add_compile_options(-Wno-error=stringop-overflow) # Add warning for infinite recursion (added in GCC 12) if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0) add_compile_options(-Winfinite-recursion) endif() +elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang) + add_compile_options(-Wno-error=null-pointer-subtraction) endif() # Enable compiler and build tracing (requires Ninja generator) diff --git a/lib/macro/macro-action-variable.hpp b/lib/macro/macro-action-variable.hpp index a4cb1912..6afb0864 100644 --- a/lib/macro/macro-action-variable.hpp +++ b/lib/macro/macro-action-variable.hpp @@ -18,7 +18,7 @@ public: bool PerformAction(); bool Save(obs_data_t *obj) const; bool Load(obs_data_t *obj); - bool PostLoad() override; + bool PostLoad(); std::string GetShortDesc() const; std::string GetId() const { return id; }; static std::shared_ptr Create(Macro *m); diff --git a/lib/macro/macro-condition-macro.hpp b/lib/macro/macro-condition-macro.hpp index 141c0f67..21f82213 100644 --- a/lib/macro/macro-condition-macro.hpp +++ b/lib/macro/macro-condition-macro.hpp @@ -25,7 +25,7 @@ public: bool CheckCondition(); bool Save(obs_data_t *obj) const; bool Load(obs_data_t *obj); - bool PostLoad() override; + bool PostLoad(); std::string GetShortDesc() const; std::string GetId() const { return id; }; static std::shared_ptr Create(Macro *m) diff --git a/plugins/base/macro-action-sequence.hpp b/plugins/base/macro-action-sequence.hpp index 080bee7f..a32629cf 100644 --- a/plugins/base/macro-action-sequence.hpp +++ b/plugins/base/macro-action-sequence.hpp @@ -23,7 +23,7 @@ public: void LogAction() const; bool Save(obs_data_t *obj) const; bool Load(obs_data_t *obj); - bool PostLoad() override; + bool PostLoad(); std::string GetId() const { return id; }; MacroRef GetNextMacro(bool advance = true); static std::shared_ptr Create(Macro *m);