Skip to content

Commit

Permalink
Fixed compilation issue for arm macOS native compilation (#696)
Browse files Browse the repository at this point in the history
Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>
  • Loading branch information
achristoforides committed Jun 27, 2022
1 parent 74f915b commit a4bb526
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
13 changes: 13 additions & 0 deletions third_party/patches/spdlogv1.x.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,16 @@ index 87c8c5a0..759021ac 100644

long int hours = (24 * days) + (localtm.tm_hour - gmtm.tm_hour);
long int mins = (60 * hours) + (localtm.tm_min - gmtm.tm_min);

diff --git a/third_party/spdlog/include/spdlog/details/log_msg.h b/third_party/spdlog/include/spdlog/details/log_msg.h
index 834ca4df..c1071d91 100644
--- a/third_party/spdlog/include/spdlog/details/log_msg.h
+++ b/third_party/spdlog/include/spdlog/details/log_msg.h
@@ -14,7 +14,6 @@ struct SPDLOG_API log_msg
log_msg(log_clock::time_point log_time, source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(string_view_t logger_name, level::level_enum lvl, string_view_t msg);
- log_msg(const log_msg &other) = default;

string_view_t logger_name;
level::level_enum level{level::off};
1 change: 0 additions & 1 deletion third_party/spdlog/include/spdlog/details/log_msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ struct SPDLOG_API log_msg
log_msg(log_clock::time_point log_time, source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(string_view_t logger_name, level::level_enum lvl, string_view_t msg);
log_msg(const log_msg &other) = default;

string_view_t logger_name;
level::level_enum level{level::off};
Expand Down

0 comments on commit a4bb526

Please sign in to comment.