Merge pull request #9850

bdcfd32f6 trezor: fix protobuf 30 compatibility (tobtoht)

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);