Skip to content

Commit

Permalink
[wip] diagnose: fix for boost 1.87
Browse files Browse the repository at this point in the history
  • Loading branch information
div72 committed Dec 19, 2024
1 parent 94747c5 commit 85b2f62
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/wallet/diagnose.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bool Diagnose::m_hasPoolProjects = false;
bool Diagnose::m_configured_for_investor_mode = false;
std::unordered_map<Diagnose::TestNames, Diagnose*> Diagnose::m_name_to_test_map;
CCriticalSection Diagnose::cs_diagnostictests;
boost::asio::io_service Diagnose::s_ioService;
boost::asio::io_context Diagnose::s_ioService;

/**
* The function check the time is correct on your PC. It checks the skew in the clock.
Expand Down
10 changes: 5 additions & 5 deletions src/wallet/diagnose.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class Diagnose
static CCriticalSection cs_diagnostictests; //!< used to protect the critical sections, for multithreading
TestNames m_test_name; //!< This must be defined for derived classes. Each derived class must declare the name of the test and add to the TestNames enum
static std::unordered_map<Diagnose::TestNames, Diagnose*> m_name_to_test_map; //!< a map to save the test and a pointer to it. Some tests are related and need to access the results of each other.
static boost::asio::io_service s_ioService;
static boost::asio::io_context s_ioService;
};

/**
Expand Down Expand Up @@ -381,7 +381,7 @@ class VerifyClock : public Diagnose

connectToNTPHost();

s_ioService.reset();
s_ioService.restart();
s_ioService.run();
}
}
Expand Down Expand Up @@ -638,7 +638,7 @@ class VerifyTCPPort : public Diagnose
private:
boost::asio::ip::tcp::socket m_tcpSocket;
void handle_connect(const boost::system::error_code& err,
boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
boost::asio::ip::tcp::resolver::results_type::iterator endpoint_iterator);

void TCPFinished();

Expand All @@ -649,7 +649,7 @@ class VerifyTCPPort : public Diagnose
~VerifyTCPPort() {}
void runCheck()
{
s_ioService.reset();
s_ioService.restart();

m_results_string_arg.clear();
m_results_tip_arg.clear();
Expand All @@ -671,7 +671,7 @@ class VerifyTCPPort : public Diagnose
auto endpoint_iterator = resolver.resolve(query);
#endif

if (endpoint_iterator == boost::asio::ip::tcp::resolver::iterator()) {
if (endpoint_iterator == boost::asio::ip::tcp::resolver::results_type::iterator()) {
m_tcpSocket.close();
m_results = WARNING;
m_results_tip = _("Outbound communication to TCP port %1 appears to be blocked.");
Expand Down

0 comments on commit 85b2f62

Please sign in to comment.