From 7ba1d76d0543c94e74df3c634b11448b293cdaf8 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 2 Jul 2026 21:02:55 +0100 Subject: [PATCH] chore: Enable modernize-use-auto (#7707) --- .clang-tidy | 1 - include/xrpl/beast/hash/hash_append.h | 2 +- include/xrpl/beast/utility/rngfill.h | 4 ++-- include/xrpl/core/JobTypes.h | 2 +- include/xrpl/ledger/helpers/EscrowHelpers.h | 2 +- include/xrpl/nodestore/detail/codec.h | 8 ++++---- include/xrpl/nodestore/detail/varint.h | 4 ++-- include/xrpl/protocol/Quality.h | 2 +- include/xrpl/protocol/STBitString.h | 2 +- include/xrpl/protocol/STInteger.h | 2 +- src/libxrpl/basics/Number.cpp | 2 +- src/libxrpl/beast/insight/StatsDCollector.cpp | 4 ++-- src/libxrpl/core/detail/JobQueue.cpp | 10 +++++----- src/libxrpl/crypto/RFC1751.cpp | 2 +- src/libxrpl/json/json_reader.cpp | 2 +- src/libxrpl/json/json_value.cpp | 16 ++++++++-------- src/libxrpl/json/json_writer.cpp | 6 +++--- src/libxrpl/nodestore/DecodedBlob.cpp | 2 +- src/libxrpl/nodestore/backend/MemoryFactory.cpp | 2 +- src/libxrpl/nodestore/backend/NuDBFactory.cpp | 2 +- src/libxrpl/nodestore/backend/RocksDBFactory.cpp | 2 +- src/libxrpl/protocol/IOUAmount.cpp | 2 +- src/libxrpl/protocol/MPTIssue.cpp | 3 +-- src/libxrpl/protocol/NFTokenID.cpp | 3 +-- src/libxrpl/protocol/STAmount.cpp | 2 +- src/libxrpl/protocol/STBlob.cpp | 2 +- src/libxrpl/protocol/STCurrency.cpp | 2 +- src/libxrpl/protocol/STIssue.cpp | 2 +- src/libxrpl/protocol/STNumber.cpp | 2 +- src/libxrpl/protocol/STObject.cpp | 10 +++++----- src/libxrpl/protocol/STPathSet.cpp | 4 ++-- src/libxrpl/protocol/STVector256.cpp | 2 +- src/libxrpl/protocol/STXChainBridge.cpp | 2 +- .../tx/transactors/escrow/EscrowCreate.cpp | 2 +- src/test/app/ConfidentialTransfer_test.cpp | 2 +- src/test/app/Loan_test.cpp | 2 +- src/test/app/Offer_test.cpp | 2 +- src/test/beast/LexicalCast_test.cpp | 6 +++--- .../beast/aged_associative_container_test.cpp | 2 +- src/test/shamap/FetchPack_test.cpp | 2 +- src/xrpld/app/consensus/RCLConsensus.cpp | 2 +- src/xrpld/app/ledger/detail/InboundLedgers.cpp | 2 +- src/xrpld/app/main/Application.cpp | 2 +- src/xrpld/app/misc/NetworkOPs.cpp | 4 ++-- src/xrpld/app/misc/detail/Transaction.cpp | 2 +- src/xrpld/app/misc/detail/TxQ.cpp | 10 +++++----- src/xrpld/app/rdb/backend/detail/Node.cpp | 2 +- src/xrpld/core/detail/Config.cpp | 2 +- src/xrpld/rpc/CTID.h | 6 +++--- src/xrpld/rpc/handlers/orderbook/BookOffers.cpp | 2 +- 50 files changed, 82 insertions(+), 85 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 2b0b7e4418..6a24cbc8d3 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -80,7 +80,6 @@ Checks: "-*, -modernize-replace-random-shuffle, -modernize-return-braced-init-list, -modernize-shrink-to-fit, - -modernize-use-auto, -modernize-use-bool-literals, -modernize-use-constraints, -modernize-use-default-member-init, diff --git a/include/xrpl/beast/hash/hash_append.h b/include/xrpl/beast/hash/hash_append.h index 0b36d4c983..5f77f41e5d 100644 --- a/include/xrpl/beast/hash/hash_append.h +++ b/include/xrpl/beast/hash/hash_append.h @@ -26,7 +26,7 @@ template inline void reverseBytes(T& t) { - unsigned char* bytes = + auto* bytes = static_cast(std::memmove(std::addressof(t), std::addressof(t), sizeof(T))); for (unsigned i = 0; i < sizeof(T) / 2; ++i) std::swap(bytes[i], bytes[sizeof(T) - 1 - i]); diff --git a/include/xrpl/beast/utility/rngfill.h b/include/xrpl/beast/utility/rngfill.h index 0fc3ffe0d0..ee7a5e2434 100644 --- a/include/xrpl/beast/utility/rngfill.h +++ b/include/xrpl/beast/utility/rngfill.h @@ -14,7 +14,7 @@ rngfill(void* const buffer, std::size_t const bytes, Generator& g) using result_type = Generator::result_type; constexpr std::size_t kResultSize = sizeof(result_type); - std::uint8_t* const bufferStart = static_cast(buffer); + auto* const bufferStart = static_cast(buffer); std::size_t const completeIterations = bytes / kResultSize; std::size_t const bytesRemaining = bytes % kResultSize; @@ -42,7 +42,7 @@ rngfill(std::array& a, Generator& g) { using result_type = Generator::result_type; auto i = N / sizeof(result_type); - result_type* p = reinterpret_cast(a.data()); + auto* p = reinterpret_cast(a.data()); while (i--) *p++ = g(); } diff --git a/include/xrpl/core/JobTypes.h b/include/xrpl/core/JobTypes.h index f338b19f6c..cc2f3ecbf5 100644 --- a/include/xrpl/core/JobTypes.h +++ b/include/xrpl/core/JobTypes.h @@ -118,7 +118,7 @@ public: [[nodiscard]] JobTypeInfo const& get(JobType jt) const { - Map::const_iterator const iter(map.find(jt)); + auto const iter = map.find(jt); XRPL_ASSERT(iter != map.end(), "xrpl::JobTypes::get : valid input"); if (iter != map.end()) diff --git a/include/xrpl/ledger/helpers/EscrowHelpers.h b/include/xrpl/ledger/helpers/EscrowHelpers.h index 001dc9cb25..d173c33c56 100644 --- a/include/xrpl/ledger/helpers/EscrowHelpers.h +++ b/include/xrpl/ledger/helpers/EscrowHelpers.h @@ -54,7 +54,7 @@ escrowUnlockApplyHelper( bool createAsset, beast::Journal journal) { - Issue const& issue = amount.get(); + auto const& issue = amount.get(); Keylet const trustLineKey = keylet::trustLine(receiver, issue); bool const recvLow = issuer > receiver; bool const senderIssuer = issuer == sender; diff --git a/include/xrpl/nodestore/detail/codec.h b/include/xrpl/nodestore/detail/codec.h index 56e1fbcf73..2f69d532be 100644 --- a/include/xrpl/nodestore/detail/codec.h +++ b/include/xrpl/nodestore/detail/codec.h @@ -62,7 +62,7 @@ lz4Compress(void const* in, std::size_t inSize, BufferFactory&& bf) std::array::kMax> vi{}; auto const n = writeVarint(vi.data(), inSize); auto const outMax = LZ4_compressBound(inSize); - std::uint8_t* out = reinterpret_cast(bf(n + outMax)); + auto* out = reinterpret_cast(bf(n + outMax)); result.first = out; std::memcpy(out, vi.data(), n); auto const outSize = LZ4_compress_default( @@ -90,7 +90,7 @@ nodeobjectDecompress(void const* in, std::size_t inSize, BufferFactory&& bf) { using namespace nudb::detail; - std::uint8_t const* p = reinterpret_cast(in); + auto const* p = reinterpret_cast(in); std::size_t type = 0; auto const vn = readVarint(p, inSize, type); if (vn == 0) @@ -237,7 +237,7 @@ nodeobjectCompress(void const* in, std::size_t inSize, BufferFactory&& bf) auto const vs = sizeVarint(type); result.second = vs + field::size + // mask (n * 32); // hashes - std::uint8_t* out = reinterpret_cast(bf(result.second)); + auto* out = reinterpret_cast(bf(result.second)); result.first = out; ostream os(out, result.second); write(os, type); @@ -249,7 +249,7 @@ nodeobjectCompress(void const* in, std::size_t inSize, BufferFactory&& bf) auto const type = 3U; auto const vs = sizeVarint(type); result.second = vs + (n * 32); // hashes - std::uint8_t* out = reinterpret_cast(bf(result.second)); + auto* out = reinterpret_cast(bf(result.second)); result.first = out; ostream os(out, result.second); write(os, type); diff --git a/include/xrpl/nodestore/detail/varint.h b/include/xrpl/nodestore/detail/varint.h index 21a13bd6de..6102c0cf2d 100644 --- a/include/xrpl/nodestore/detail/varint.h +++ b/include/xrpl/nodestore/detail/varint.h @@ -39,7 +39,7 @@ readVarint(void const* buf, std::size_t buflen, std::size_t& t) if (buflen == 0) return 0; t = 0; - std::uint8_t const* p = reinterpret_cast(buf); + auto const* p = reinterpret_cast(buf); std::size_t n = 0; while (p[n] & 0x80) { @@ -86,7 +86,7 @@ std::size_t writeVarint(void* p0, std::size_t v) { // NOLINTNEXTLINE(misc-const-correctness) - std::uint8_t* p = reinterpret_cast(p0); + auto* p = reinterpret_cast(p0); do { std::uint8_t d = v % 127; diff --git a/include/xrpl/protocol/Quality.h b/include/xrpl/protocol/Quality.h index 6bb2033dc0..de61d79ca5 100644 --- a/include/xrpl/protocol/Quality.h +++ b/include/xrpl/protocol/Quality.h @@ -282,7 +282,7 @@ public: auto const maxVMantissa = mantissa(maxV); auto const expDiff = exponent(maxV) - exponent(minV); - double const minVD = static_cast(minVMantissa); + auto const minVD = static_cast(minVMantissa); double const maxVD = (expDiff != 0) ? maxVMantissa * pow(10, expDiff) : static_cast(maxVMantissa); diff --git a/include/xrpl/protocol/STBitString.h b/include/xrpl/protocol/STBitString.h index 4f25eccca6..6f71f48f25 100644 --- a/include/xrpl/protocol/STBitString.h +++ b/include/xrpl/protocol/STBitString.h @@ -148,7 +148,7 @@ template bool STBitString::isEquivalent(STBase const& t) const { - STBitString const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return v && (value_ == v->value_); } diff --git a/include/xrpl/protocol/STInteger.h b/include/xrpl/protocol/STInteger.h index 1c7ac98f3e..951c4fc52f 100644 --- a/include/xrpl/protocol/STInteger.h +++ b/include/xrpl/protocol/STInteger.h @@ -115,7 +115,7 @@ template inline bool STInteger::isEquivalent(STBase const& t) const { - STInteger const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return v && (value_ == v->value_); } diff --git a/src/libxrpl/basics/Number.cpp b/src/libxrpl/basics/Number.cpp index 23e913bbdc..4d7a821040 100644 --- a/src/libxrpl/basics/Number.cpp +++ b/src/libxrpl/basics/Number.cpp @@ -876,7 +876,7 @@ Number::operator/=(Number const& y) int const ds = (dp ? -1 : 1); // Create the denominator as 128-bit unsigned, since that's what we // need to work with. - uint128_t const dm = static_cast(y.mantissa_); + auto const dm = static_cast(y.mantissa_); auto const de = y.exponent_; auto const& range = kRange.get(); diff --git a/src/libxrpl/beast/insight/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp index 0d0e013274..1da5315de1 100644 --- a/src/libxrpl/beast/insight/StatsDCollector.cpp +++ b/src/libxrpl/beast/insight/StatsDCollector.cpp @@ -640,14 +640,14 @@ StatsDGaugeImpl::doIncrement(GaugeImpl::difference_type amount) if (amount > 0) { - GaugeImpl::value_type const d(static_cast(amount)); + auto const d = static_cast(amount); value += (d >= std::numeric_limits::max() - value_) ? std::numeric_limits::max() - value_ : d; } else if (amount < 0) { - GaugeImpl::value_type const d(static_cast(-amount)); + auto const d = static_cast(-amount); value = (d >= value) ? 0 : value - d; } diff --git a/src/libxrpl/core/detail/JobQueue.cpp b/src/libxrpl/core/detail/JobQueue.cpp index ffb91db72d..f773270af3 100644 --- a/src/libxrpl/core/detail/JobQueue.cpp +++ b/src/libxrpl/core/detail/JobQueue.cpp @@ -122,7 +122,7 @@ JobQueue::getJobCount(JobType t) const { std::scoped_lock const lock(mutex_); - JobDataMap::const_iterator const c = jobData_.find(t); + auto const c = jobData_.find(t); return (c == jobData_.end()) ? 0 : c->second.waiting; } @@ -132,7 +132,7 @@ JobQueue::getJobCountTotal(JobType t) const { std::scoped_lock const lock(mutex_); - JobDataMap::const_iterator const c = jobData_.find(t); + auto const c = jobData_.find(t); return (c == jobData_.end()) ? 0 : (c->second.waiting + c->second.running); } @@ -157,7 +157,7 @@ JobQueue::getJobCountGE(JobType t) const std::unique_ptr JobQueue::makeLoadEvent(JobType t, std::string const& name) { - JobDataMap::iterator const iter(jobData_.find(t)); + auto const iter = jobData_.find(t); XRPL_ASSERT(iter != jobData_.end(), "xrpl::JobQueue::makeLoadEvent : valid job type input"); if (iter == jobData_.end()) @@ -172,7 +172,7 @@ JobQueue::addLoadEvents(JobType t, int count, std::chrono::milliseconds elapsed) if (isStopped()) logicError("JobQueue::addLoadEvents() called after JobQueue stopped"); - JobDataMap::iterator const iter(jobData_.find(t)); + auto const iter = jobData_.find(t); XRPL_ASSERT(iter != jobData_.end(), "xrpl::JobQueue::addLoadEvents : valid job type input"); iter->second.load().addSamples(count, elapsed); } @@ -250,7 +250,7 @@ JobQueue::rendezvous() JobTypeData& JobQueue::getJobTypeData(JobType type) { - JobDataMap::iterator const c(jobData_.find(type)); + auto const c = jobData_.find(type); XRPL_ASSERT(c != jobData_.end(), "xrpl::JobQueue::getJobTypeData : valid job type input"); // NIKB: This is ugly and I hate it. We must remove JtInvalid completely diff --git a/src/libxrpl/crypto/RFC1751.cpp b/src/libxrpl/crypto/RFC1751.cpp index 16482945d2..41e29ee00c 100644 --- a/src/libxrpl/crypto/RFC1751.cpp +++ b/src/libxrpl/crypto/RFC1751.cpp @@ -434,7 +434,7 @@ RFC1751::getWordFromBlob(void const* blob, size_t bytes) // This is a simple implementation of the Jenkins one-at-a-time hash // algorithm: // http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time - unsigned char const* data = static_cast(blob); + auto const* data = static_cast(blob); std::uint32_t hash = 0; for (size_t i = 0; i < bytes; ++i) diff --git a/src/libxrpl/json/json_reader.cpp b/src/libxrpl/json/json_reader.cpp index 3786f51fdd..45e448c480 100644 --- a/src/libxrpl/json/json_reader.cpp +++ b/src/libxrpl/json/json_reader.cpp @@ -908,7 +908,7 @@ Reader::getFormattedErrorMessages() const { std::string formattedMessage; - for (Errors::const_iterator itError = errors_.begin(); itError != errors_.end(); ++itError) + for (auto itError = errors_.begin(); itError != errors_.end(); ++itError) { ErrorInfo const& error = *itError; formattedMessage += "* " + getLocationLineAndColumn(error.token.start) + "\n"; diff --git a/src/libxrpl/json/json_value.cpp b/src/libxrpl/json/json_value.cpp index 074a88428c..7218b8c6cf 100644 --- a/src/libxrpl/json/json_value.cpp +++ b/src/libxrpl/json/json_value.cpp @@ -802,7 +802,7 @@ Value::size() const case ValueType::Array: // size of the array is highest index + 1 if (!value_.mapVal->empty()) { - ObjectValues::const_iterator itLast = value_.mapVal->end(); + auto itLast = value_.mapVal->end(); --itLast; return (*itLast).first.index() + 1; } @@ -866,7 +866,7 @@ Value::operator[](UInt index) *this = Value(ValueType::Array); CZString const key(index); - ObjectValues::iterator it = value_.mapVal->lower_bound(key); + auto it = value_.mapVal->lower_bound(key); if (it != value_.mapVal->end() && (*it).first == key) return (*it).second; @@ -887,7 +887,7 @@ Value::operator[](UInt index) const return kNull; CZString const key(index); - ObjectValues::const_iterator const it = value_.mapVal->find(key); + auto const it = value_.mapVal->find(key); if (it == value_.mapVal->end()) return kNull; @@ -915,7 +915,7 @@ Value::resolveReference(char const* key, bool isStatic) key, isStatic ? CZString::DuplicationPolicy::NoDuplication : CZString::DuplicationPolicy::DuplicateOnCopy); - ObjectValues::iterator it = value_.mapVal->lower_bound(actualKey); + auto it = value_.mapVal->lower_bound(actualKey); if (it != value_.mapVal->end() && (*it).first == actualKey) return (*it).second; @@ -950,7 +950,7 @@ Value::operator[](char const* key) const return kNull; CZString const actualKey(key, CZString::DuplicationPolicy::NoDuplication); - ObjectValues::const_iterator const it = value_.mapVal->find(actualKey); + auto const it = value_.mapVal->find(actualKey); if (it == value_.mapVal->end()) return kNull; @@ -1018,7 +1018,7 @@ Value::removeMember(char const* key) return kNull; CZString const actualKey(key, CZString::DuplicationPolicy::NoDuplication); - ObjectValues::iterator const it = value_.mapVal->find(actualKey); + auto const it = value_.mapVal->find(actualKey); if (it == value_.mapVal->end()) return kNull; @@ -1068,8 +1068,8 @@ Value::getMemberNames() const Members members; members.reserve(value_.mapVal->size()); - ObjectValues::const_iterator it = value_.mapVal->begin(); - ObjectValues::const_iterator const itEnd = value_.mapVal->end(); + auto it = value_.mapVal->begin(); + auto const itEnd = value_.mapVal->end(); for (; it != itEnd; ++it) members.emplace_back((*it).first.cStr()); diff --git a/src/libxrpl/json/json_writer.cpp b/src/libxrpl/json/json_writer.cpp index 4c38bdcf92..c9f8cb688b 100644 --- a/src/libxrpl/json/json_writer.cpp +++ b/src/libxrpl/json/json_writer.cpp @@ -232,7 +232,7 @@ FastWriter::writeValue(Value const& value) Value::Members members(value.getMemberNames()); document_ += "{"; - for (Value::Members::iterator it = members.begin(); it != members.end(); ++it) + for (auto it = members.begin(); it != members.end(); ++it) { std::string const& name = *it; @@ -310,7 +310,7 @@ StyledWriter::writeValue(Value const& value) { writeWithIndent("{"); indent(); - Value::Members::iterator it = members.begin(); + auto it = members.begin(); while (true) { @@ -545,7 +545,7 @@ StyledStreamWriter::writeValue(Value const& value) { writeWithIndent("{"); indent(); - Value::Members::iterator it = members.begin(); + auto it = members.begin(); while (true) { diff --git a/src/libxrpl/nodestore/DecodedBlob.cpp b/src/libxrpl/nodestore/DecodedBlob.cpp index fb7569bd8c..fe07252f23 100644 --- a/src/libxrpl/nodestore/DecodedBlob.cpp +++ b/src/libxrpl/nodestore/DecodedBlob.cpp @@ -33,7 +33,7 @@ DecodedBlob::DecodedBlob(void const* key, void const* value, int valueBytes) if (valueBytes > 8) { - unsigned char const* byte = static_cast(value); + auto const* byte = static_cast(value); objectType_ = safeCast(byte[8]); } diff --git a/src/libxrpl/nodestore/backend/MemoryFactory.cpp b/src/libxrpl/nodestore/backend/MemoryFactory.cpp index 70578c8613..22557d652e 100644 --- a/src/libxrpl/nodestore/backend/MemoryFactory.cpp +++ b/src/libxrpl/nodestore/backend/MemoryFactory.cpp @@ -136,7 +136,7 @@ public: std::scoped_lock const _(db_->mutex); - Map::iterator const iter = db_->table.find(hash); + auto const iter = db_->table.find(hash); if (iter == db_->table.end()) { pObject->reset(); diff --git a/src/libxrpl/nodestore/backend/NuDBFactory.cpp b/src/libxrpl/nodestore/backend/NuDBFactory.cpp index 749d4020b5..38ea34258f 100644 --- a/src/libxrpl/nodestore/backend/NuDBFactory.cpp +++ b/src/libxrpl/nodestore/backend/NuDBFactory.cpp @@ -367,7 +367,7 @@ private: try { - std::size_t const parsedBlockSize = beast::lexicalCastThrow(blockSizeStr); + auto const parsedBlockSize = beast::lexicalCastThrow(blockSizeStr); // Validate: must be power of 2 between 4K and 32K if (parsedBlockSize < 4096 || parsedBlockSize > 32768 || diff --git a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp index 69a648f2f4..bcf4ba4a49 100644 --- a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp +++ b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp @@ -80,7 +80,7 @@ public: void StartThread(void (*f)(void*), void* a) override { - ThreadParams* const p(new ThreadParams(f, a)); + auto* const p = new ThreadParams(f, a); EnvWrapper::StartThread(&RocksDBEnv::threadEntry, p); } }; diff --git a/src/libxrpl/protocol/IOUAmount.cpp b/src/libxrpl/protocol/IOUAmount.cpp index acbf6724e1..111edbf8b5 100644 --- a/src/libxrpl/protocol/IOUAmount.cpp +++ b/src/libxrpl/protocol/IOUAmount.cpp @@ -181,7 +181,7 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU hasRem = bool(sav - low * kPowerTable[mustShrink]); } - std::int64_t mantissa = low.convert_to(); + auto mantissa = low.convert_to(); // normalize before rounding if (neg) diff --git a/src/libxrpl/protocol/MPTIssue.cpp b/src/libxrpl/protocol/MPTIssue.cpp index e9ec852d1d..35ee743b2a 100644 --- a/src/libxrpl/protocol/MPTIssue.cpp +++ b/src/libxrpl/protocol/MPTIssue.cpp @@ -31,8 +31,7 @@ MPTIssue::getIssuer() const // MPTID is concatenation of sequence + account static_assert(sizeof(MPTID) == (sizeof(std::uint32_t) + sizeof(AccountID))); // copy from id skipping the sequence - AccountID const* account = - reinterpret_cast(mptID_.data() + sizeof(std::uint32_t)); + auto const* account = reinterpret_cast(mptID_.data() + sizeof(std::uint32_t)); return *account; } diff --git a/src/libxrpl/protocol/NFTokenID.cpp b/src/libxrpl/protocol/NFTokenID.cpp index cd2c46b66b..729f052101 100644 --- a/src/libxrpl/protocol/NFTokenID.cpp +++ b/src/libxrpl/protocol/NFTokenID.cpp @@ -72,8 +72,7 @@ getNFTokenIDFromPage(TxMeta const& transactionMeta) // However, there will always be NFTs listed in the final fields, // as xrpld outputs all fields in final fields even if they were // not changed. - STObject const& previousFields = - node.peekAtField(sfPreviousFields).downcast(); + auto const& previousFields = node.peekAtField(sfPreviousFields).downcast(); if (!previousFields.isFieldPresent(sfNFTokens)) continue; diff --git a/src/libxrpl/protocol/STAmount.cpp b/src/libxrpl/protocol/STAmount.cpp index 748d00f25a..212c34322b 100644 --- a/src/libxrpl/protocol/STAmount.cpp +++ b/src/libxrpl/protocol/STAmount.cpp @@ -789,7 +789,7 @@ STAmount::add(Serializer& s) const bool STAmount::isEquivalent(STBase const& t) const { - STAmount const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (*v == *this); } diff --git a/src/libxrpl/protocol/STBlob.cpp b/src/libxrpl/protocol/STBlob.cpp index 3f44c9b529..14d09b633c 100644 --- a/src/libxrpl/protocol/STBlob.cpp +++ b/src/libxrpl/protocol/STBlob.cpp @@ -53,7 +53,7 @@ STBlob::add(Serializer& s) const bool STBlob::isEquivalent(STBase const& t) const { - STBlob const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (value_ == v->value_); } diff --git a/src/libxrpl/protocol/STCurrency.cpp b/src/libxrpl/protocol/STCurrency.cpp index 9b761864d9..fc8bd756ed 100644 --- a/src/libxrpl/protocol/STCurrency.cpp +++ b/src/libxrpl/protocol/STCurrency.cpp @@ -56,7 +56,7 @@ STCurrency::add(Serializer& s) const bool STCurrency::isEquivalent(STBase const& t) const { - STCurrency const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (*v == *this); } diff --git a/src/libxrpl/protocol/STIssue.cpp b/src/libxrpl/protocol/STIssue.cpp index c9b8109e32..10403d2c50 100644 --- a/src/libxrpl/protocol/STIssue.cpp +++ b/src/libxrpl/protocol/STIssue.cpp @@ -107,7 +107,7 @@ STIssue::add(Serializer& s) const bool STIssue::isEquivalent(STBase const& t) const { - STIssue const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (*v == *this); } diff --git a/src/libxrpl/protocol/STNumber.cpp b/src/libxrpl/protocol/STNumber.cpp index fcc0077f6b..79f7655869 100644 --- a/src/libxrpl/protocol/STNumber.cpp +++ b/src/libxrpl/protocol/STNumber.cpp @@ -142,7 +142,7 @@ STNumber::isEquivalent(STBase const& t) const { XRPL_ASSERT( t.getSType() == this->getSType(), "xrpl::STNumber::isEquivalent : field type match"); - STNumber const& v = dynamic_cast(t); + auto const& v = dynamic_cast(t); return value_ == v; } diff --git a/src/libxrpl/protocol/STObject.cpp b/src/libxrpl/protocol/STObject.cpp index c493ba65af..ea8553dc4f 100644 --- a/src/libxrpl/protocol/STObject.cpp +++ b/src/libxrpl/protocol/STObject.cpp @@ -338,7 +338,7 @@ STObject::getText() const bool STObject::isEquivalent(STBase const& t) const { - STObject const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); if (v == nullptr) return false; @@ -474,7 +474,7 @@ STObject::peekFieldArray(SField const& field) bool STObject::setFlag(std::uint32_t f) { - STUInt32* t = dynamic_cast(getPField(sfFlags, true)); + auto* t = dynamic_cast(getPField(sfFlags, true)); if (t == nullptr) return false; @@ -486,7 +486,7 @@ STObject::setFlag(std::uint32_t f) bool STObject::clearFlag(std::uint32_t f) { - STUInt32* t = dynamic_cast(getPField(sfFlags)); + auto* t = dynamic_cast(getPField(sfFlags)); if (t == nullptr) return false; @@ -504,7 +504,7 @@ STObject::isFlag(std::uint32_t f) const std::uint32_t STObject::getFlags(void) const { - STUInt32 const* t = dynamic_cast(peekAtPField(sfFlags)); + auto const* t = dynamic_cast(peekAtPField(sfFlags)); if (t == nullptr) return 0; @@ -651,7 +651,7 @@ Blob STObject::getFieldVL(SField const& field) const { STBlob const empty; - STBlob const& b = getFieldByConstRef(field, empty); + auto const& b = getFieldByConstRef(field, empty); return Blob(b.data(), b.data() + b.size()); } diff --git a/src/libxrpl/protocol/STPathSet.cpp b/src/libxrpl/protocol/STPathSet.cpp index cb70ac36fe..d61f17ecc6 100644 --- a/src/libxrpl/protocol/STPathSet.cpp +++ b/src/libxrpl/protocol/STPathSet.cpp @@ -127,7 +127,7 @@ STPathSet::assembleAdd(STPath const& base, STPathElement const& tail) { // assemble base+tail and add it to the set if it's not a duplicate value_.push_back(base); - std::vector::reverse_iterator it = value_.rbegin(); + auto it = value_.rbegin(); STPath& newPath = *it; newPath.pushBack(tail); @@ -146,7 +146,7 @@ STPathSet::assembleAdd(STPath const& base, STPathElement const& tail) bool STPathSet::isEquivalent(STBase const& t) const { - STPathSet const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (value_ == v->value_); } diff --git a/src/libxrpl/protocol/STVector256.cpp b/src/libxrpl/protocol/STVector256.cpp index 7aca309667..877e34c73c 100644 --- a/src/libxrpl/protocol/STVector256.cpp +++ b/src/libxrpl/protocol/STVector256.cpp @@ -68,7 +68,7 @@ STVector256::add(Serializer& s) const bool STVector256::isEquivalent(STBase const& t) const { - STVector256 const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (value_ == v->value_); } diff --git a/src/libxrpl/protocol/STXChainBridge.cpp b/src/libxrpl/protocol/STXChainBridge.cpp index ce6ad2368a..005c9ccbce 100644 --- a/src/libxrpl/protocol/STXChainBridge.cpp +++ b/src/libxrpl/protocol/STXChainBridge.cpp @@ -168,7 +168,7 @@ STXChainBridge::getSType() const bool STXChainBridge::isEquivalent(STBase const& t) const { - STXChainBridge const* v = dynamic_cast(&t); + auto const* v = dynamic_cast(&t); return (v != nullptr) && (*v == *this); } diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp index 0d83885349..531098bd1c 100644 --- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp +++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp @@ -194,7 +194,7 @@ escrowCreatePreclaimHelper( AccountID const& dest, STAmount const& amount) { - Issue const& issue = amount.get(); + auto const& issue = amount.get(); AccountID const& issuer = amount.getIssuer(); // If the issuer is the same as the account, return tecNO_PERMISSION if (issuer == account) diff --git a/src/test/app/ConfidentialTransfer_test.cpp b/src/test/app/ConfidentialTransfer_test.cpp index e6faf0a2ae..d3e0182db5 100644 --- a/src/test/app/ConfidentialTransfer_test.cpp +++ b/src/test/app/ConfidentialTransfer_test.cpp @@ -6920,7 +6920,7 @@ class ConfidentialTransfer_test : public ConfidentialTransferTestBase auto& mptAlice = confEnv.mpt; uint64_t const sendAmount = 10; - uint64_t const negativeRemaining = static_cast(-10); // 0xFFFFFFFFFFFFFFF6 + auto const negativeRemaining = static_cast(-10); // 0xFFFFFFFFFFFFFFF6 ConfidentialSendSetup const setup(mptAlice, bob, carol, alice, sendAmount); diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp index 56a7cab47a..3e62af48ff 100644 --- a/src/test/app/Loan_test.cpp +++ b/src/test/app/Loan_test.cpp @@ -8651,7 +8651,7 @@ protected: Account const borrower("borrower"); // Determine all the random parameters at once - AssetType const assetType = static_cast(assetDist_(engine_)); + auto const assetType = static_cast(assetDist_(engine_)); auto const principalRequest = principalDist_(engine_); TenthBips16 const managementFeeRate{managementFeeRateDist_(engine_)}; auto const serviceFee = serviceFeeDist_(engine_); diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp index 804bd9b86c..2724a6474b 100644 --- a/src/test/app/Offer_test.cpp +++ b/src/test/app/Offer_test.cpp @@ -2195,7 +2195,7 @@ public: jtx::Account const& account, jtx::PrettyAmount const& expectBalance) { - Issue const& issue = expectBalance.value().get(); + auto const& issue = expectBalance.value().get(); auto const sleTrust = env.le(keylet::trustLine(account.id(), issue)); BEAST_EXPECT(sleTrust); if (sleTrust) diff --git a/src/test/beast/LexicalCast_test.cpp b/src/test/beast/LexicalCast_test.cpp index f988aa03cf..b1d37daab8 100644 --- a/src/test/beast/LexicalCast_test.cpp +++ b/src/test/beast/LexicalCast_test.cpp @@ -24,7 +24,7 @@ public: testInteger(IntType in) { std::string s; - IntType out = static_cast(~in); // Ensure out != in + auto out = static_cast(~in); // Ensure out != in expect(lexicalCastChecked(s, in)); expect(lexicalCastChecked(out, s)); @@ -42,7 +42,7 @@ public: for (int i = 0; i < 1000; ++i) { - IntType const value(nextRandomInt(r)); + auto const value = nextRandomInt(r); testInteger(value); } } @@ -229,7 +229,7 @@ public: while (i <= std::numeric_limits::max()) { - std::int16_t const j = static_cast(i); + auto const j = static_cast(i); auto actual = std::to_string(j); diff --git a/src/test/beast/aged_associative_container_test.cpp b/src/test/beast/aged_associative_container_test.cpp index 3dbaf74040..df61824c99 100644 --- a/src/test/beast/aged_associative_container_test.cpp +++ b/src/test/beast/aged_associative_container_test.cpp @@ -1391,7 +1391,7 @@ AgedAssociativeContainerTestBase::reverseFillAgedContainer(Container& c, Values // c.clock() returns an abstract_clock, so dynamic_cast to ManualClock. // VFALCO NOTE This is sketchy using ManualClock = TestTraitsBase::ManualClock; - ManualClock& clk(dynamic_cast(c.clock())); + auto& clk = dynamic_cast(c.clock()); clk.set(0); Values rev(values); diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp index b2fc185b31..bcc5129f01 100644 --- a/src/test/shamap/FetchPack_test.cpp +++ b/src/test/shamap/FetchPack_test.cpp @@ -68,7 +68,7 @@ public: [[nodiscard]] std::optional getNode(SHAMapHash const& nodeHash) const override { - Map::iterator const it = map.find(nodeHash); + auto const it = map.find(nodeHash); if (it == map.end()) { JLOG(journal.fatal()) << "Test filter missing node"; diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp index a7c2b26c04..2abc881adc 100644 --- a/src/xrpld/app/consensus/RCLConsensus.cpp +++ b/src/xrpld/app/consensus/RCLConsensus.cpp @@ -690,7 +690,7 @@ RCLConsensus::Adaptor::doAccept( JLOG(j_.info()) << "We closed at " << closeTime.time_since_epoch().count(); using usec64_t = std::chrono::duration; - usec64_t closeTotal = std::chrono::duration_cast(closeTime.time_since_epoch()); + auto closeTotal = std::chrono::duration_cast(closeTime.time_since_epoch()); int closeCount = 1; for (auto const& [t, v] : rawCloseTimes.peers) diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp index 95e3e46f73..07daa7560e 100644 --- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp @@ -378,7 +378,7 @@ public: { ScopedLockType const sl(lock_); - MapType::iterator it(ledgers_.begin()); + auto it = ledgers_.begin(); total = ledgers_.size(); stuffToSweep.reserve(total); diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp index 594195b93e..d329475874 100644 --- a/src/xrpld/app/main/Application.cpp +++ b/src/xrpld/app/main/Application.cpp @@ -2178,7 +2178,7 @@ fixConfigPorts(Config& config, Endpoints const& endpoints) auto const optPort = section.get(Keys::kPort); if (optPort) { - std::uint16_t const port = beast::lexicalCast(*optPort); + auto const port = beast::lexicalCast(*optPort); if (port == 0u) section.set(Keys::kPort, std::to_string(ep.port())); } diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp index 82445f3625..d1f794b74d 100644 --- a/src/xrpld/app/misc/NetworkOPs.cpp +++ b/src/xrpld/app/misc/NetworkOPs.cpp @@ -4392,7 +4392,7 @@ NetworkOPsImp::findRpcSub(std::string const& strUrl) { std::scoped_lock const sl(subLock_); - subRpcMapType::iterator const it = rpcSubMap_.find(strUrl); + auto const it = rpcSubMap_.find(strUrl); if (it != rpcSubMap_.end()) return it->second; @@ -4827,7 +4827,7 @@ NetworkOPsImp::StateAccounting::json(json::Value& obj) const counters[static_cast(mode)].dur += current; obj[jss::state_accounting] = json::ValueType::Object; - for (std::size_t i = static_cast(OperatingMode::DISCONNECTED); + for (auto i = static_cast(OperatingMode::DISCONNECTED); i <= static_cast(OperatingMode::FULL); ++i) { diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp index 2c55c474eb..e29181bfe9 100644 --- a/src/xrpld/app/misc/detail/Transaction.cpp +++ b/src/xrpld/app/misc/detail/Transaction.cpp @@ -103,7 +103,7 @@ Transaction::transactionFromSQL( Blob const& rawTxn, Application& app) { - std::uint32_t const inLedger = rangeCheckedCast(ledgerSeq.value_or(0)); + auto const inLedger = rangeCheckedCast(ledgerSeq.value_or(0)); SerialIter it(makeSlice(rawTxn)); auto txn = std::make_shared(it); diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp index 5d1020d296..f6d00974b4 100644 --- a/src/xrpld/app/misc/detail/TxQ.cpp +++ b/src/xrpld/app/misc/detail/TxQ.cpp @@ -788,7 +788,7 @@ TxQ::apply( std::scoped_lock const lock(mutex_); // accountIter is not const because it may be updated further down. - AccountMap::iterator accountIter = byAccount_.find(account); + auto accountIter = byAccount_.find(account); bool const accountIsInQueue = accountIter != byAccount_.end(); // _If_ the account is in the queue, then ignore any sequence-based @@ -817,7 +817,7 @@ TxQ::apply( // Find the first transaction in the queue that we might apply. TxQAccount::TxMap& acctTxs = accountIter->second.transactions; - TxQAccount::TxMap::iterator const firstIter = acctTxs.lower_bound(acctSeqProx); + auto const firstIter = acctTxs.lower_bound(acctSeqProx); if (firstIter == acctTxs.end()) { @@ -996,7 +996,7 @@ TxQ::apply( // Find the entry in the queue that precedes the new // transaction, if one does. - TxQAccount::TxMap::const_iterator const prevIter = txQAcct.getPrevTx(txSeqProx); + auto const prevIter = txQAcct.getPrevTx(txSeqProx); // Does the new transaction go to the front of the queue? // This can happen if: @@ -1615,7 +1615,7 @@ TxQ::nextQueuableSeqImpl(SLE::const_ref sleAccount, std::scoped_lock // Ignore any sequence-based queued transactions that slipped into the // ledger while we were not watching. This does actually happen in the // wild, but it's uncommon. - TxQAccount::TxMap::const_iterator txIter = acctTxs.lower_bound(acctSeqProx); + auto txIter = acctTxs.lower_bound(acctSeqProx); if (txIter == acctTxs.end() || !txIter->first.isSeq() || txIter->first != acctSeqProx) { @@ -1700,7 +1700,7 @@ TxQ::tryDirectApply( // queue then remove the replaced transaction. std::scoped_lock const lock(mutex_); - AccountMap::iterator const accountIter = byAccount_.find(account); + auto const accountIter = byAccount_.find(account); if (accountIter != byAccount_.end()) { TxQAccount& txQAcct = accountIter->second; diff --git a/src/xrpld/app/rdb/backend/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/Node.cpp index 6e92a0de60..f8dc4a6981 100644 --- a/src/xrpld/app/rdb/backend/detail/Node.cpp +++ b/src/xrpld/app/rdb/backend/detail/Node.cpp @@ -1273,7 +1273,7 @@ getTransaction( if (!ledgerSeq) return std::pair{std::move(txn), nullptr}; - std::uint32_t const inLedger = rangeCheckedCast(ledgerSeq.value()); + auto const inLedger = rangeCheckedCast(ledgerSeq.value()); auto txMeta = std::make_shared(id, inLedger, rawMeta); diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp index 523cde743a..07c780118a 100644 --- a/src/xrpld/core/detail/Config.cpp +++ b/src/xrpld/core/detail/Config.cpp @@ -926,7 +926,7 @@ Config::loadFromString(std::string const& fileContents) ", must be: [0-9]+ [minutes|hours|days|weeks]"); } - std::uint32_t const duration = beast::lexicalCastThrow(match[1].str()); + auto const duration = beast::lexicalCastThrow(match[1].str()); if (boost::iequals(match[2], "minutes")) { diff --git a/src/xrpld/rpc/CTID.h b/src/xrpld/rpc/CTID.h index c2133a19b5..7566e0e143 100644 --- a/src/xrpld/rpc/CTID.h +++ b/src/xrpld/rpc/CTID.h @@ -104,9 +104,9 @@ decodeCTID(T const ctid) noexcept if ((ctidValue & kCtidPrefixMask) != kCtidPrefix) return std::nullopt; - uint32_t const ledgerSeq = static_cast((ctidValue >> 32) & 0x0FFF'FFFF); - uint16_t const txnIndex = static_cast((ctidValue >> 16) & 0xFFFF); - uint16_t const networkID = static_cast(ctidValue & 0xFFFF); + auto const ledgerSeq = static_cast((ctidValue >> 32) & 0x0FFF'FFFF); + auto const txnIndex = static_cast((ctidValue >> 16) & 0xFFFF); + auto const networkID = static_cast(ctidValue & 0xFFFF); return std::make_tuple(ledgerSeq, txnIndex, networkID); } diff --git a/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp b/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp index 5d031c2c74..63dee76f1b 100644 --- a/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp +++ b/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp @@ -107,7 +107,7 @@ parseTakerIssuerJSON( if (taker.isMember(jss::currency)) { - Issue& issue = asset.get(); + auto& issue = asset.get(); if (taker.isMember(jss::issuer)) {