luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac fixes

Browse Source
This commit is contained in:
Jeremy 2024-03-31 22:01:14 -05:00
parent 06372b772f
commit 0dd71cebb7
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/binary/mach-o.hpp
View File

@ -426,7 +426,7 @@ namespace detail {
// we have a bunch of symbols in our binary we need to pair up with symbols from various .o files // we have a bunch of symbols in our binary we need to pair up with symbols from various .o files
// first collect symbols and the objects they come from // first collect symbols and the objects they come from
std::vector<symbol_entry> symbols; std::vector<symbol_entry> symbols;
const auto& symtab_info_res = get_symtab_info(); auto symtab_info_res = get_symtab_info();
if(!symtab_info_res) { if(!symtab_info_res) {
return std::move(symtab_info_res).unwrap_error(); return std::move(symtab_info_res).unwrap_error();
} }

10
src/utils/utils.hpp
View File

@ -337,8 +337,14 @@ namespace detail {
enum class member { value, error }; enum class member { value, error };
member active; member active;
public: public:
Result(T value) : value_(std::move(value)), active(member::value) {} Result(T&& value) : value_(std::move(value)), active(member::value) {}
Result(E error) : error_(std::move(error)), active(member::error) { Result(E&& error) : error_(std::move(error)), active(member::error) {
if(!absorb_trace_exceptions.load()) {
std::fprintf(stderr, "%s\n", unwrap_error().what());
}
}
Result(T& value) : value_(T(value)), active(member::value) {}
Result(E& error) : error_(E(error)), active(member::error) {
if(!absorb_trace_exceptions.load()) { if(!absorb_trace_exceptions.load()) {
std::fprintf(stderr, "%s\n", unwrap_error().what()); std::fprintf(stderr, "%s\n", unwrap_error().what());
} }