Fix Linux/gcc compilation (#795)

Fixes #803
This commit is contained in:
Alex Kremer
2023-08-02 13:44:03 +01:00
committed by GitHub
parent 98d0a963dc
commit 24f69acd9e
81 changed files with 1259 additions and 1282 deletions

View File

@@ -170,9 +170,7 @@ struct SyncAsioContextTest : virtual public NoLoggerFixture
using namespace boost::asio;
auto called = false;
auto strand = make_strand(ctx.get_executor());
spawn(strand, [&, _ = make_work_guard(strand)](yield_context yield) {
spawn(ctx, [&, _ = make_work_guard(ctx)](yield_context yield) {
f(yield);
called = true;
});

View File

@@ -33,31 +33,31 @@ struct MockBackend : public BackendInterface
MOCK_METHOD(
std::optional<ripple::LedgerInfo>,
fetchLedgerBySequence,
(std::uint32_t const, boost::asio::yield_context&),
(std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::optional<ripple::LedgerInfo>,
fetchLedgerByHash,
(ripple::uint256 const&, boost::asio::yield_context&),
(ripple::uint256 const&, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::optional<std::uint32_t>,
fetchLatestLedgerSequence,
(boost::asio::yield_context&),
(boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::optional<TransactionAndMetadata>,
fetchTransaction,
(ripple::uint256 const&, boost::asio::yield_context&),
(ripple::uint256 const&, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::vector<TransactionAndMetadata>,
fetchTransactions,
(std::vector<ripple::uint256> const&, boost::asio::yield_context&),
(std::vector<ripple::uint256> const&, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
@@ -67,25 +67,25 @@ struct MockBackend : public BackendInterface
std::uint32_t const,
bool,
std::optional<TransactionsCursor> const&,
boost::asio::yield_context&),
boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::vector<TransactionAndMetadata>,
fetchAllTransactionsInLedger,
(std::uint32_t const, boost::asio::yield_context&),
(std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::vector<ripple::uint256>,
fetchAllTransactionHashesInLedger,
(std::uint32_t const, boost::asio::yield_context&),
(std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::optional<NFT>,
fetchNFT,
(ripple::uint256 const&, std::uint32_t const, boost::asio::yield_context&),
(ripple::uint256 const&, std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
@@ -95,34 +95,34 @@ struct MockBackend : public BackendInterface
std::uint32_t const,
bool const,
std::optional<TransactionsCursor> const&,
boost::asio::yield_context&),
boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::vector<Blob>,
doFetchLedgerObjects,
(std::vector<ripple::uint256> const&, std::uint32_t const, boost::asio::yield_context&),
(std::vector<ripple::uint256> const&, std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::optional<Blob>,
doFetchLedgerObject,
(ripple::uint256 const&, std::uint32_t const, boost::asio::yield_context&),
(ripple::uint256 const&, std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::vector<LedgerObject>,
fetchLedgerDiff,
(std::uint32_t const, boost::asio::yield_context&),
(std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(
std::optional<ripple::uint256>,
doFetchSuccessorKey,
(ripple::uint256, std::uint32_t const, boost::asio::yield_context&),
(ripple::uint256, std::uint32_t const, boost::asio::yield_context),
(const, override));
MOCK_METHOD(std::optional<LedgerRange>, hardFetchLedgerRange, (boost::asio::yield_context&), (const, override));
MOCK_METHOD(std::optional<LedgerRange>, hardFetchLedgerRange, (boost::asio::yield_context), (const, override));
MOCK_METHOD(void, writeLedger, (ripple::LedgerInfo const&, std::string&&), (override));

View File

@@ -39,6 +39,6 @@ struct MockLoadBalancer
MOCK_METHOD(
std::optional<boost::json::object>,
forwardToRippled,
(boost::json::object const&, std::string const&, boost::asio::yield_context&),
(boost::json::object const&, std::string const&, boost::asio::yield_context),
(const));
};

View File

@@ -35,8 +35,9 @@ struct MockAsyncRPCEngine
using namespace boost::asio;
io_context ioc;
spawn(ioc, [handler = std::forward<Fn>(func), _ = make_work_guard(ioc.get_executor())](auto yield) mutable {
spawn(ioc, [handler = std::forward<Fn>(func), _ = make_work_guard(ioc)](auto yield) mutable {
handler(yield);
;
});
ioc.run();

View File

@@ -33,7 +33,7 @@ public:
{
}
MOCK_METHOD(boost::json::object, subLedger, (boost::asio::yield_context&, session_ptr), ());
MOCK_METHOD(boost::json::object, subLedger, (boost::asio::yield_context, session_ptr), ());
MOCK_METHOD(
void,