diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake index 68c824b4b..4642bc9ba 100644 --- a/cmake/CompilerFlags.cmake +++ b/cmake/CompilerFlags.cmake @@ -9,6 +9,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # Except for "/*" within comment errors (present in doxygen blocks) add_compile_options(-Wno-error=comment) + # outcome.hpp + add_compile_options(-Wno-parentheses) + # Enable PIC set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) diff --git a/external/outcome b/external/outcome index 595f5ee4e..862506557 160000 --- a/external/outcome +++ b/external/outcome @@ -1 +1 @@ -Subproject commit 595f5ee4e5a99d8246a3e162a3304ad99eaf658b +Subproject commit 862506557820aacdbee6249bd1904abac3907866 diff --git a/libmbsign/include/mbsign/error.h b/libmbsign/include/mbsign/error.h index b9b23f94f..5a4b0021a 100644 --- a/libmbsign/include/mbsign/error.h +++ b/libmbsign/include/mbsign/error.h @@ -61,7 +61,7 @@ inline const std::error_code & make_error_code(const ErrorInfo &ei) } // https://github.com/ned14/outcome/issues/118 -inline void throw_as_system_error_with_payload(const ErrorInfo &ei) +inline void outcome_throw_as_system_error_with_payload(const ErrorInfo &ei) { (void) ei; OUTCOME_THROW_EXCEPTION(std::system_error(make_error_code(ei))); diff --git a/libmbutil/include/mbutil/fstab.h b/libmbutil/include/mbutil/fstab.h index 5d2cbcf76..10cefd6d8 100644 --- a/libmbutil/include/mbutil/fstab.h +++ b/libmbutil/include/mbutil/fstab.h @@ -55,7 +55,7 @@ inline const std::error_code & make_error_code(const FstabErrorInfo &ei) } [[noreturn]] -inline void throw_as_system_error_with_payload(const FstabErrorInfo &ei) +inline void outcome_throw_as_system_error_with_payload(const FstabErrorInfo &ei) { (void) ei; OUTCOME_THROW_EXCEPTION(std::system_error(make_error_code(ei)));