From 919d247f7c62779a78df10e235811a24b0d0ecfd Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sat, 25 Apr 2026 14:29:17 +0200 Subject: [PATCH] trezor: replace use of boost::is_base_of with std::is_base_of --- src/device_trezor/device_trezor_base.hpp | 3 ++- src/device_trezor/trezor/debug_link.hpp | 3 ++- src/device_trezor/trezor/messages_map.hpp | 6 +++--- src/device_trezor/trezor/transport.hpp | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/device_trezor/device_trezor_base.hpp b/src/device_trezor/device_trezor_base.hpp index 5b6920313..f698e7014 100644 --- a/src/device_trezor/device_trezor_base.hpp +++ b/src/device_trezor/device_trezor_base.hpp @@ -33,6 +33,7 @@ #include #include +#include #include "device/device.hpp" #include "device/device_default.hpp" #include "device/device_cold.hpp" @@ -147,7 +148,7 @@ namespace trezor { bool open_session = false) { // Require strictly protocol buffers response in the template. - BOOST_STATIC_ASSERT(boost::is_base_of::value); + static_assert(std::is_base_of::value); const bool accepting_base = boost::is_same::value; if (resp_types && !accepting_base){ throw std::invalid_argument("Cannot specify list of accepted types and not using generic response"); diff --git a/src/device_trezor/trezor/debug_link.hpp b/src/device_trezor/trezor/debug_link.hpp index b7a252833..ba61dec9c 100644 --- a/src/device_trezor/trezor/debug_link.hpp +++ b/src/device_trezor/trezor/debug_link.hpp @@ -32,6 +32,7 @@ #include "transport.hpp" #include "messages/messages-debug.pb.h" +#include namespace hw { @@ -60,7 +61,7 @@ namespace trezor { const boost::optional &resp_type = boost::none, bool no_wait = false) { - BOOST_STATIC_ASSERT(boost::is_base_of::value); + static_assert(std::is_base_of::value); m_transport->write(req); if (no_wait){ diff --git a/src/device_trezor/trezor/messages_map.hpp b/src/device_trezor/trezor/messages_map.hpp index 30b8f875c..d2b50a3f9 100644 --- a/src/device_trezor/trezor/messages_map.hpp +++ b/src/device_trezor/trezor/messages_map.hpp @@ -72,14 +72,14 @@ namespace trezor { template static messages::MessageType get_message_wire_number() { - BOOST_STATIC_ASSERT(boost::is_base_of::value); + static_assert(std::is_base_of::value); return get_message_wire_number(t_message::default_instance().GetDescriptor()->name()); } }; template std::shared_ptr message_ptr_retype(std::shared_ptr & in){ - BOOST_STATIC_ASSERT(boost::is_base_of::value); + static_assert(std::is_base_of::value); if (!in){ return nullptr; } @@ -89,7 +89,7 @@ namespace trezor { template std::shared_ptr message_ptr_retype_static(std::shared_ptr & in){ - BOOST_STATIC_ASSERT(boost::is_base_of::value); + static_assert(std::is_base_of::value); if (!in){ return nullptr; } diff --git a/src/device_trezor/trezor/transport.hpp b/src/device_trezor/trezor/transport.hpp index 827b189fd..7ec07afde 100644 --- a/src/device_trezor/trezor/transport.hpp +++ b/src/device_trezor/trezor/transport.hpp @@ -383,7 +383,7 @@ namespace trezor { boost::optional resp_type = boost::none) { // Require strictly protocol buffers response in the template. - BOOST_STATIC_ASSERT(boost::is_base_of::value); + static_assert(std::is_base_of::value); // Write the request transport.write(req);