diff --git a/include/bitcoin/network/async/subscriber.hpp b/include/bitcoin/network/async/subscriber.hpp index 7a1aa2680..b4b676c01 100644 --- a/include/bitcoin/network/async/subscriber.hpp +++ b/include/bitcoin/network/async/subscriber.hpp @@ -62,7 +62,7 @@ class subscriber final // These are not thread safe. bool stopped_{ false }; - std::vector queue_{}; + std_vector queue_{}; }; } // namespace network diff --git a/include/bitcoin/network/async/threadpool.hpp b/include/bitcoin/network/async/threadpool.hpp index 664af899e..aaa4a5e59 100644 --- a/include/bitcoin/network/async/threadpool.hpp +++ b/include/bitcoin/network/async/threadpool.hpp @@ -64,7 +64,7 @@ class BCT_API threadpool final asio::io_context service_{}; // These are not thread safe. - std::vector threads_{}; + std_vector threads_{}; work_guard work_; }; diff --git a/include/bitcoin/network/config/address.hpp b/include/bitcoin/network/config/address.hpp index 223aefbb6..4c4bd4702 100644 --- a/include/bitcoin/network/config/address.hpp +++ b/include/bitcoin/network/config/address.hpp @@ -99,7 +99,7 @@ class BCT_API address messages::address_item::cptr address_; }; -typedef std::vector
addresses; +typedef std_vector
addresses; } // namespace config } // namespace network diff --git a/include/bitcoin/network/config/authority.hpp b/include/bitcoin/network/config/authority.hpp index edadea176..d92e21f80 100644 --- a/include/bitcoin/network/config/authority.hpp +++ b/include/bitcoin/network/config/authority.hpp @@ -112,7 +112,7 @@ class BCT_API authority uint8_t cidr_; }; -typedef std::vector authorities; +typedef std_vector authorities; } // namespace config } // namespace network diff --git a/include/bitcoin/network/config/endpoint.hpp b/include/bitcoin/network/config/endpoint.hpp index 826be5453..78067c0eb 100644 --- a/include/bitcoin/network/config/endpoint.hpp +++ b/include/bitcoin/network/config/endpoint.hpp @@ -113,7 +113,7 @@ class BCT_API endpoint uint16_t port_; }; -typedef std::vector endpoints; +typedef std_vector endpoints; } // namespace config } // namespace network diff --git a/include/bitcoin/network/messages/address_item.hpp b/include/bitcoin/network/messages/address_item.hpp index f7af3a6a2..86d0058a6 100644 --- a/include/bitcoin/network/messages/address_item.hpp +++ b/include/bitcoin/network/messages/address_item.hpp @@ -50,7 +50,7 @@ struct BCT_API address_item bool operator==(const address_item& left, const address_item& right) NOEXCEPT; bool operator!=(const address_item& left, const address_item& right) NOEXCEPT; -typedef std::vector address_items; +typedef std_vector address_items; typedef std::shared_ptr address_items_ptr; // tools.ietf.org/html/rfc4291#section-2.5.3 diff --git a/include/bitcoin/network/messages/alert_item.hpp b/include/bitcoin/network/messages/alert_item.hpp index 94bcf6e24..779fa7b9f 100644 --- a/include/bitcoin/network/messages/alert_item.hpp +++ b/include/bitcoin/network/messages/alert_item.hpp @@ -29,8 +29,8 @@ namespace messages { struct BCT_API alert_item { - typedef std::vector cancels_t; - typedef std::vector sub_versions_t; + typedef std_vector cancels_t; + typedef std_vector sub_versions_t; static const system::ec_uncompressed satoshi_public_key; static alert_item deserialize(uint32_t version, diff --git a/include/bitcoin/network/messages/compact_block_item.hpp b/include/bitcoin/network/messages/compact_block_item.hpp index 0b2b0d74d..72c43771f 100644 --- a/include/bitcoin/network/messages/compact_block_item.hpp +++ b/include/bitcoin/network/messages/compact_block_item.hpp @@ -44,7 +44,7 @@ struct BCT_API compact_block_item system::chain::transaction::cptr transaction_ptr; }; -typedef std::vector compact_block_items; +typedef std_vector compact_block_items; } // namespace messages } // namespace network diff --git a/include/bitcoin/network/messages/get_blocks.hpp b/include/bitcoin/network/messages/get_blocks.hpp index 6986de2ba..eb57b5be2 100644 --- a/include/bitcoin/network/messages/get_blocks.hpp +++ b/include/bitcoin/network/messages/get_blocks.hpp @@ -30,7 +30,7 @@ namespace messages { struct BCT_API get_blocks { - typedef std::vector indexes; + typedef std_vector indexes; typedef std::shared_ptr cptr; static const identifier id; diff --git a/include/bitcoin/network/messages/get_compact_transactions.hpp b/include/bitcoin/network/messages/get_compact_transactions.hpp index 1824be835..4d4d18970 100644 --- a/include/bitcoin/network/messages/get_compact_transactions.hpp +++ b/include/bitcoin/network/messages/get_compact_transactions.hpp @@ -50,7 +50,7 @@ struct BCT_API get_compact_transactions size_t size(uint32_t version) const NOEXCEPT; system::hash_digest block_hash; - std::vector indexes; + std_vector indexes; }; } // namespace messages diff --git a/include/bitcoin/network/messages/get_headers.hpp b/include/bitcoin/network/messages/get_headers.hpp index 87ba8f3d7..797950f68 100644 --- a/include/bitcoin/network/messages/get_headers.hpp +++ b/include/bitcoin/network/messages/get_headers.hpp @@ -31,7 +31,7 @@ namespace messages { /// see also get_blocks. struct BCT_API get_headers { - typedef std::vector indexes; + typedef std_vector indexes; typedef std::shared_ptr cptr; static const identifier id; diff --git a/include/bitcoin/network/messages/inventory_item.hpp b/include/bitcoin/network/messages/inventory_item.hpp index 189467dc3..df099332d 100644 --- a/include/bitcoin/network/messages/inventory_item.hpp +++ b/include/bitcoin/network/messages/inventory_item.hpp @@ -70,7 +70,7 @@ struct BCT_API inventory_item bool operator==(const inventory_item& left, const inventory_item& right) NOEXCEPT; bool operator!=(const inventory_item& left, const inventory_item& right) NOEXCEPT; -typedef std::vector inventory_items; +typedef std_vector inventory_items; } // namespace messages } // namespace network diff --git a/include/bitcoin/network/messages/merkle_block.hpp b/include/bitcoin/network/messages/merkle_block.hpp index e27c5294b..398d61bba 100644 --- a/include/bitcoin/network/messages/merkle_block.hpp +++ b/include/bitcoin/network/messages/merkle_block.hpp @@ -57,7 +57,7 @@ struct BCT_API merkle_block system::data_chunk flags; }; -typedef std::vector merkle_blocks; +typedef std_vector merkle_blocks; } // namespace messages } // namespace network diff --git a/include/bitcoin/network/net/connector.hpp b/include/bitcoin/network/net/connector.hpp index 91fd6da40..a13be3586 100644 --- a/include/bitcoin/network/net/connector.hpp +++ b/include/bitcoin/network/net/connector.hpp @@ -113,7 +113,7 @@ class BCT_API connector const socket::ptr& socket) NOEXCEPT; }; -typedef std::vector connectors; +typedef std_vector connectors; typedef std::shared_ptr connectors_ptr; } // namespace network diff --git a/src/messages/get_compact_transactions.cpp b/src/messages/get_compact_transactions.cpp index a7239c98c..7cf27ad30 100644 --- a/src/messages/get_compact_transactions.cpp +++ b/src/messages/get_compact_transactions.cpp @@ -55,7 +55,7 @@ get_compact_transactions get_compact_transactions::deserialize(uint32_t version, const auto read_indexes = [](reader& source) NOEXCEPT { const auto size = source.read_size(chain::max_block_size); - std::vector indexes; + std_vector indexes; indexes.reserve(size); for (size_t index = 0; index < size; ++index) diff --git a/test/test.hpp b/test/test.hpp index e24f544e5..3669be8ed 100644 --- a/test/test.hpp +++ b/test/test.hpp @@ -58,7 +58,7 @@ std::ostream& operator<<(std::ostream& stream, // vector -> join(< std::ostream& operator<<(std::ostream& stream, - const std::vector& values) noexcept + const std_vector& values) noexcept { // Ok when testing serialize because only used for error message out. BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT) @@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& stream, // array -> join(< std::ostream& operator<<(std::ostream& stream, - const std::array& values) noexcept + const std_array& values) noexcept { // Ok when testing serialize because only used for error message out. BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)