Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace BOOST_REVERSE_FOREACH with ranged for

This commit is contained in:
Miguel Herranz 2017-01-22 21:47:39 +01:00
parent 629e3101ab
commit 36dd3e238f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptonote_core/blockchain.cpp
View File

@ -31,6 +31,7 @@
#include <algorithm> #include <algorithm>
#include <cstdio> #include <cstdio>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/range/adaptor/reversed.hpp>
#include "include_base_utils.h" #include "include_base_utils.h"
#include "cryptonote_basic_impl.h" #include "cryptonote_basic_impl.h"
@ -933,7 +934,7 @@ difficulty_type Blockchain::get_next_difficulty_for_alternative_chain(const std:
size_t count = 0; size_t count = 0;
size_t max_i = timestamps.size()-1; size_t max_i = timestamps.size()-1;
// get difficulties and timestamps from most recent blocks in alt chain // get difficulties and timestamps from most recent blocks in alt chain
BOOST_REVERSE_FOREACH(auto it, alt_chain) for(auto it: boost::adaptors::reverse(alt_chain))
{ {
timestamps[max_i - count] = it->second.bl.timestamp; timestamps[max_i - count] = it->second.bl.timestamp;
cumulative_difficulties[max_i - count] = it->second.cumulative_difficulty; cumulative_difficulties[max_i - count] = it->second.cumulative_difficulty;

7
src/p2p/net_peerlist.h
View File

@ -45,6 +45,7 @@
#include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/identity.hpp> #include <boost/multi_index/identity.hpp>
#include <boost/multi_index/member.hpp> #include <boost/multi_index/member.hpp>
#include <boost/range/adaptor/reversed.hpp>
#include "syncobj.h" #include "syncobj.h"
@ -283,7 +284,7 @@ namespace nodetool
CRITICAL_REGION_LOCAL(m_peerlist_lock); CRITICAL_REGION_LOCAL(m_peerlist_lock);
peers_indexed::index<by_time>::type& by_time_index=m_peers_white.get<by_time>(); peers_indexed::index<by_time>::type& by_time_index=m_peers_white.get<by_time>();
uint32_t cnt = 0; uint32_t cnt = 0;
BOOST_REVERSE_FOREACH(const peers_indexed::value_type& vl, by_time_index) for(const peers_indexed::value_type& vl: boost::adaptors::reverse(by_time_index))
{ {
if(!vl.last_seen) if(!vl.last_seen)
continue; continue;
@ -301,13 +302,13 @@ namespace nodetool
{ {
CRITICAL_REGION_LOCAL(m_peerlist_lock); CRITICAL_REGION_LOCAL(m_peerlist_lock);
peers_indexed::index<by_time>::type& by_time_index_gr=m_peers_gray.get<by_time>(); peers_indexed::index<by_time>::type& by_time_index_gr=m_peers_gray.get<by_time>();
BOOST_REVERSE_FOREACH(const peers_indexed::value_type& vl, by_time_index_gr) for(const peers_indexed::value_type& vl: boost::adaptors::reverse(by_time_index_gr))
{ {
pl_gray.push_back(vl); pl_gray.push_back(vl);
} }
peers_indexed::index<by_time>::type& by_time_index_wt=m_peers_white.get<by_time>(); peers_indexed::index<by_time>::type& by_time_index_wt=m_peers_white.get<by_time>();
BOOST_REVERSE_FOREACH(const peers_indexed::value_type& vl, by_time_index_wt) for(const peers_indexed::value_type& vl: boost::adaptors::reverse(by_time_index_wt))
{ {
pl_white.push_back(vl); pl_white.push_back(vl);
} }