diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index 135283dc09..4609437104 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -2202,8 +2202,8 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters) info[jss::server_state] = strOperatingMode(admin); - info[jss::time] = to_string( - floor(std::chrono::system_clock::now())); + info[jss::time] = to_string(std::chrono::floor( + std::chrono::system_clock::now())); if (needNetworkLedger_) info[jss::network_ledger] = "waiting"; diff --git a/src/ripple/app/reporting/ETLSource.h b/src/ripple/app/reporting/ETLSource.h index 4efde9778d..b4bb5ccf92 100644 --- a/src/ripple/app/reporting/ETLSource.h +++ b/src/ripple/app/reporting/ETLSource.h @@ -238,7 +238,7 @@ public: auto last = getLastMsgTime(); if (last.time_since_epoch().count() != 0) result["last_message_arrival_time"] = - to_string(floor(last)); + to_string(std::chrono::floor(last)); return result; } diff --git a/src/ripple/app/reporting/ReportingETL.h b/src/ripple/app/reporting/ReportingETL.h index 9265f4a0ac..aa795fb6d0 100644 --- a/src/ripple/app/reporting/ReportingETL.h +++ b/src/ripple/app/reporting/ReportingETL.h @@ -316,7 +316,8 @@ public: auto last = getLastPublish(); if (last.time_since_epoch().count() != 0) result["last_publish_time"] = - to_string(floor(getLastPublish())); + to_string(std::chrono::floor( + getLastPublish())); return result; } diff --git a/src/ripple/basics/impl/PerfLogImp.cpp b/src/ripple/basics/impl/PerfLogImp.cpp index 8f6da21664..c09545d5fd 100644 --- a/src/ripple/basics/impl/PerfLogImp.cpp +++ b/src/ripple/basics/impl/PerfLogImp.cpp @@ -288,7 +288,7 @@ PerfLogImp::report() lastLog_ = present; Json::Value report(Json::objectValue); - report[jss::time] = to_string(floor(present)); + report[jss::time] = to_string(std::chrono::floor(present)); { std::lock_guard lock{counters_.jobsMutex_}; report[jss::workers] = diff --git a/src/ripple/beast/net/IPAddress.h b/src/ripple/beast/net/IPAddress.h index 1dd71f2e86..d8820ec40b 100644 --- a/src/ripple/beast/net/IPAddress.h +++ b/src/ripple/beast/net/IPAddress.h @@ -100,20 +100,6 @@ hash_append(Hasher& h, beast::IP::Address const& addr) noexcept } } // namespace beast -namespace std { -template <> -struct hash -{ - explicit hash() = default; - - std::size_t - operator()(beast::IP::Address const& addr) const - { - return beast::uhash<>{}(addr); - } -}; -} // namespace std - namespace boost { template <> struct hash<::beast::IP::Address> diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp index fae5538b16..6659301ad3 100644 --- a/src/test/unit_test/multi_runner.cpp +++ b/src/test/unit_test/multi_runner.cpp @@ -27,6 +27,7 @@ #include #include #include +#include namespace ripple { namespace test {