ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated abstract_clock::elapsed

Browse Source
This commit is contained in:
Vinnie Falco
2015-07-17 09:55:24 -07:00
parent b38a96ae82
commit fad9998f9d
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/beast/beast/chrono/abstract_clock.h
View File

@@ -69,12 +69,6 @@ public:
/** Returns the current time. */
virtual time_point now() const = 0;
/** Returning elapsed ticks since the epoch. */
rep elapsed() const
{
return now().time_since_epoch().count();
}
};
//------------------------------------------------------------------------------

10
src/ripple/resource/impl/Logic.h
View File

@@ -316,13 +316,13 @@ public:
void importConsumers (std::string const& origin, Gossip const& gossip)
{
clock_type::rep const elapsed (m_clock.elapsed());
clock_type::rep const elapsed (m_clock.now().time_since_epoch().count());
{
SharedState::Access state (m_state);
std::pair <Imports::iterator, bool> result (
state->import_table.emplace (std::piecewise_construct,
std::make_tuple(origin), // Key
std::make_tuple(m_clock.elapsed()))); // Import
std::make_tuple(m_clock.now().time_since_epoch().count()))); // Import
if (result.second)
{
@@ -384,7 +384,7 @@ public:
{
SharedState::Access state (m_state);
clock_type::rep const elapsed (m_clock.elapsed());
clock_type::rep const elapsed (m_clock.now().time_since_epoch().count());
for (auto iter (state->inactive.begin()); iter != state->inactive.end();)
{
@@ -466,7 +466,7 @@ public:
break;
}
state->inactive.push_back (entry);
entry.whenExpires = m_clock.elapsed() + secondsUntilExpiration;
entry.whenExpires = m_clock.now().time_since_epoch().count() + secondsUntilExpiration;
}
}
@@ -491,7 +491,7 @@ public:
bool warn (Entry& entry, SharedState::Access& state)
{
bool notify (false);
clock_type::rep const elapsed (m_clock.elapsed());
clock_type::rep const elapsed (m_clock.now().time_since_epoch().count());
if (entry.balance (m_clock.now()) >= warningThreshold &&
elapsed != entry.lastWarningTime)
{