external: Update outcome to latest commit

Signed-off-by: Andrew Gunnerson <[email protected]>
Dark98 · Jun 20, 2018 · c9fc804 · c9fc804
1 parent 4ddee20
commit c9fc804
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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
diff --git 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
@@ -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)));