Skip to content

Commit

Permalink
Merge branch 'main' into examples
Browse files Browse the repository at this point in the history
  • Loading branch information
tmayoff committed Dec 22, 2024
2 parents 7dc6402 + 7f3a405 commit b8c82f5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
[
vulkan-tools
llvmPackages_19.clang-tools
llvmPackages_17.libllvm
llvmPackages_19.libllvm
sccache

just
Expand Down
1 change: 1 addition & 0 deletions wren_utils/include/wren/utils/result.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespace wren {
class Err {
public:
template <typename T>
requires std::is_error_code_enum_v<T>
Err(T error) : error_code_(make_error_code(error)) {}
Err(const std::error_code& ec) : error_code_(ec) {}
Err(int32_t ec, const std::error_category& e_cat) : error_code_(ec, e_cat) {}
Expand Down

0 comments on commit b8c82f5

Please sign in to comment.