gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-04-28 11:53:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10449

Browse Source 
befdeb7 trezor: replace use of boost::is_base_of with std::is_base_of_v (tobtoht)
This commit is contained in:
tobtoht
2026-04-25 12:33:28 +00:00
parent f09c2c8584 befdeb7da5
commit f6e7431c94
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/device_trezor/device_trezor_base.hpp
View File

@@ -34,6 +34,7 @@
#include <cstddef>
#include <mutex>
#include <string>
#include <type_traits>
#include "device/device.hpp"
#include "device/device_default.hpp"
#include "device/device_cold.hpp"
@@ -146,7 +147,7 @@ namespace trezor {
bool open_session = false)
{
// Require strictly protocol buffers response in the template.
BOOST_STATIC_ASSERT(boost::is_base_of<google::protobuf::Message, t_message>::value);
static_assert(std::is_base_of_v<google::protobuf::Message, t_message>);
const bool accepting_base = boost::is_same<google::protobuf::Message, t_message>::value;
if (resp_types && !accepting_base){
throw std::invalid_argument("Cannot specify list of accepted types and not using generic response");

3
src/device_trezor/trezor/debug_link.hpp
View File

@@ -32,6 +32,7 @@
#include "transport.hpp"
#include "messages/messages-debug.pb.h"
#include <type_traits>
namespace hw {
@@ -60,7 +61,7 @@ namespace trezor {
const boost::optional<messages::MessageType> &resp_type = boost::none,
bool no_wait = false)
{
BOOST_STATIC_ASSERT(boost::is_base_of<google::protobuf::Message, t_message>::value);
static_assert(std::is_base_of_v<google::protobuf::Message, t_message>);
m_transport->write(req);
if (no_wait){

6
src/device_trezor/trezor/messages_map.hpp
View File

@@ -72,14 +72,14 @@ namespace trezor {
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);
static_assert(std::is_base_of_v<google::protobuf::Message, t_message>);
return get_message_wire_number(t_message::default_instance().GetDescriptor()->name());
}
};
template<class t_message=google::protobuf::Message>
std::shared_ptr<t_message> message_ptr_retype(std::shared_ptr<google::protobuf::Message> & in){
BOOST_STATIC_ASSERT(boost::is_base_of<google::protobuf::Message, t_message>::value);
static_assert(std::is_base_of_v<google::protobuf::Message, t_message>);
if (!in){
return nullptr;
}
@@ -89,7 +89,7 @@ namespace trezor {
template<class t_message=google::protobuf::Message>
std::shared_ptr<t_message> message_ptr_retype_static(std::shared_ptr<google::protobuf::Message> & in){
BOOST_STATIC_ASSERT(boost::is_base_of<google::protobuf::Message, t_message>::value);
static_assert(std::is_base_of_v<google::protobuf::Message, t_message>);
if (!in){
return nullptr;
}

2
src/device_trezor/trezor/transport.hpp
View File

@@ -383,7 +383,7 @@ namespace trezor {
boost::optional<messages::MessageType> resp_type = boost::none)
{
// Require strictly protocol buffers response in the template.
BOOST_STATIC_ASSERT(boost::is_base_of<google::protobuf::Message, t_message>::value);
static_assert(std::is_base_of_v<google::protobuf::Message, t_message>);
// Write the request
transport.write(req);