From ad20f6c3ab69f9e4574f595bfa76ebf220da94ed Mon Sep 17 00:00:00 2001 From: evoskuil Date: Thu, 14 May 2026 17:33:42 -0400 Subject: [PATCH] Style (match file name to class name). --- Makefile.am | 2 +- .../vs2022/libbitcoin-network/libbitcoin-network.vcxproj | 2 +- .../libbitcoin-network.vcxproj.filters | 2 +- .../vs2026/libbitcoin-network/libbitcoin-network.vcxproj | 2 +- .../libbitcoin-network.vcxproj.filters | 2 +- include/bitcoin/network.hpp | 2 +- .../messages/http/{file_writer.hpp => file_body.hpp} | 9 ++++++--- include/bitcoin/network/messages/http/http.hpp | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) rename include/bitcoin/network/messages/http/{file_writer.hpp => file_body.hpp} (90%) diff --git a/Makefile.am b/Makefile.am index 83a2964c0..a009d02d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -580,7 +580,7 @@ include_bitcoin_network_messages_HEADERS = \ include_bitcoin_network_messages_httpdir = ${includedir}/bitcoin/network/messages/http include_bitcoin_network_messages_http_HEADERS = \ include/bitcoin/network/messages/http/fields.hpp \ - include/bitcoin/network/messages/http/file_writer.hpp \ + include/bitcoin/network/messages/http/file_body.hpp \ include/bitcoin/network/messages/http/http.hpp include_bitcoin_network_messages_http_enumsdir = ${includedir}/bitcoin/network/messages/http/enums diff --git a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj index d51267951..d0b2e1954 100644 --- a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj @@ -338,7 +338,7 @@ - + diff --git a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters index 2b28f9ac3..99bc2ee3b 100644 --- a/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters +++ b/builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters @@ -779,7 +779,7 @@ include\bitcoin\network\messages\http - + include\bitcoin\network\messages\http diff --git a/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj b/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj index 4b85360f2..6c08abec4 100644 --- a/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj @@ -338,7 +338,7 @@ - + diff --git a/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj.filters b/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj.filters index 2b28f9ac3..99bc2ee3b 100644 --- a/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj.filters +++ b/builds/msvc/vs2026/libbitcoin-network/libbitcoin-network.vcxproj.filters @@ -779,7 +779,7 @@ include\bitcoin\network\messages\http - + include\bitcoin\network\messages\http diff --git a/include/bitcoin/network.hpp b/include/bitcoin/network.hpp index 03499bdf3..4bca021b9 100644 --- a/include/bitcoin/network.hpp +++ b/include/bitcoin/network.hpp @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/bitcoin/network/messages/http/file_writer.hpp b/include/bitcoin/network/messages/http/file_body.hpp similarity index 90% rename from include/bitcoin/network/messages/http/file_writer.hpp rename to include/bitcoin/network/messages/http/file_body.hpp index b7eb19d2b..087fa9b29 100644 --- a/include/bitcoin/network/messages/http/file_writer.hpp +++ b/include/bitcoin/network/messages/http/file_body.hpp @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -#ifndef LIBBITCOIN_NETWORK_MESSAGES_HTTP_FILE_WRITER_HPP -#define LIBBITCOIN_NETWORK_MESSAGES_HTTP_FILE_WRITER_HPP +#ifndef LIBBITCOIN_NETWORK_MESSAGES_HTTP_FILE_BODY_HPP +#define LIBBITCOIN_NETWORK_MESSAGES_HTTP_FILE_BODY_HPP #include #include @@ -26,6 +26,7 @@ namespace libbitcoin { namespace network { namespace http { + /// BOOST_BEAST_FILE_BUFFER_SIZE reduced from 4k to 1k in beast.hpp. /// beast_body::writer would eat up 1k in variant so wrap in this custom body. struct file_body @@ -42,7 +43,9 @@ struct file_body template explicit writer(http::message_header& header, beast_body::value_type& value) NOEXCEPT + BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT) : writer_(std::make_unique(header, value)) + BC_POP_WARNING() { } @@ -77,7 +80,7 @@ struct file_body std::unique_ptr writer_; }; - static inline uint64_t size(value_type const& body) NOEXCEPT + static inline uint64_t size(const value_type& body) NOEXCEPT { return beast_body::size(body); } diff --git a/include/bitcoin/network/messages/http/http.hpp b/include/bitcoin/network/messages/http/http.hpp index d4576eaaf..0b32b7769 100644 --- a/include/bitcoin/network/messages/http/http.hpp +++ b/include/bitcoin/network/messages/http/http.hpp @@ -25,6 +25,6 @@ #include #include #include -#include +#include #endif