diff options
| author | tobtoht <tob@featherwallet.org> | 2025-03-16 22:39:31 +0100 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2025-03-18 08:36:13 +0100 |
| commit | bdcfd32f634989676594ee4d3ffc511c041d16e8 (patch) | |
| tree | dd2a18a357700a4c43b9d3db9e6522bab639de4b /src | |
| parent | 88a5d076822f39cdd897d3f962346f30e4901244 (diff) | |
| download | monzero-core-bdcfd32f634989676594ee4d3ffc511c041d16e8.tar.gz monzero-core-bdcfd32f634989676594ee4d3ffc511c041d16e8.tar.xz monzero-core-bdcfd32f634989676594ee4d3ffc511c041d16e8.zip | |
trezor: fix protobuf 30 compatibility
Diffstat (limited to 'src')
| -rw-r--r-- | src/device_trezor/trezor/messages_map.cpp | 6 | ||||
| -rw-r--r-- | src/device_trezor/trezor/messages_map.hpp | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/device_trezor/trezor/messages_map.cpp b/src/device_trezor/trezor/messages_map.cpp index 313fd6820..ed7abc6f6 100644 --- a/src/device_trezor/trezor/messages_map.cpp +++ b/src/device_trezor/trezor/messages_map.cpp @@ -132,5 +132,11 @@ namespace trezor return res; } +#ifdef PROTOBUF_HAS_ABSEIL + messages::MessageType MessageMapper::get_message_wire_number(const absl::string_view& msg_name) { + return MessageMapper::get_message_wire_number(std::string{msg_name}); + } +#endif + } } diff --git a/src/device_trezor/trezor/messages_map.hpp b/src/device_trezor/trezor/messages_map.hpp index b1ea65e6e..30b8f875c 100644 --- a/src/device_trezor/trezor/messages_map.hpp +++ b/src/device_trezor/trezor/messages_map.hpp @@ -44,6 +44,10 @@ #include <google/protobuf/generated_enum_reflection.h> #include "google/protobuf/descriptor.pb.h" +#ifdef PROTOBUF_HAS_ABSEIL +#include <absl/strings/string_view.h> +#endif + #include "messages/messages.pb.h" namespace hw { @@ -62,6 +66,10 @@ namespace trezor { static messages::MessageType get_message_wire_number(const google::protobuf::Message & msg); static messages::MessageType get_message_wire_number(const std::string & msg_name); +#ifdef PROTOBUF_HAS_ABSEIL + static messages::MessageType get_message_wire_number(const absl::string_view & msg_name); // Protobuf 30 and up +#endif + template<class t_message=google::protobuf::Message> static messages::MessageType get_message_wire_number() { BOOST_STATIC_ASSERT(boost::is_base_of<google::protobuf::Message, t_message>::value); |
