diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-01-03 22:21:05 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-06-13 17:29:37 +0100 |
| commit | 6e4f84448e49f7a69eb57ca2a54a474fd9da8632 (patch) | |
| tree | 763c69ca099299887055e2aa2b7aaa44bc7bdc83 /p2pvr/devices | |
| parent | Remove all the mess around symlinks and fancy structure in storage and add so... (diff) | |
| download | p2pvr-6e4f84448e49f7a69eb57ca2a54a474fd9da8632.tar.bz2 p2pvr-6e4f84448e49f7a69eb57ca2a54a474fd9da8632.tar.xz p2pvr-6e4f84448e49f7a69eb57ca2a54a474fd9da8632.zip | |
Use native for instead BOOST_FOREACH
Diffstat (limited to 'p2pvr/devices')
| -rw-r--r-- | p2pvr/devices/localDevices.cpp | 2 | ||||
| -rw-r--r-- | p2pvr/devices/mockTuner.cpp | 3 | ||||
| -rw-r--r-- | p2pvr/devices/pch.hpp | 1 | ||||
| -rw-r--r-- | p2pvr/devices/tuner.cpp | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/p2pvr/devices/localDevices.cpp b/p2pvr/devices/localDevices.cpp index 7a43a15..4f270dd 100644 --- a/p2pvr/devices/localDevices.cpp +++ b/p2pvr/devices/localDevices.cpp @@ -34,7 +34,7 @@ void LocalDevices::ClientCheck(Ice::ObjectAdapterPtr adapter) { std::lock_guard<std::mutex> g(lock); - BOOST_FOREACH(auto & device, devices) { + for (auto & device : devices) { if (device.second && device.second->tuner->GetLastUsedTime() < time(NULL) - 30) { Logger()->messagebf(LOG_DEBUG, "%s: Device %s no longer in use", __PRETTY_FUNCTION__, device.first); auto id = device.second->tuner->ice_getIdentity(); diff --git a/p2pvr/devices/mockTuner.cpp b/p2pvr/devices/mockTuner.cpp index b89d533..c7c51a7 100644 --- a/p2pvr/devices/mockTuner.cpp +++ b/p2pvr/devices/mockTuner.cpp @@ -1,5 +1,4 @@ #include "mockTuner.h" -#include <boost/foreach.hpp> #include <Ice/Service.h> #include <lzma.h> #include <logger.h> @@ -70,7 +69,7 @@ void MockTuner::DecompressAndSendPackets(const Ice::ByteSeq & dataxz, const P2PV istrm->read(packets); Logger()->messagebf(LOG_DEBUG, "%s: send", __PRETTY_FUNCTION__); - BOOST_FOREACH(const auto & packet, packets) { + for (const auto & packet : packets) { client->NewData(packet); } diff --git a/p2pvr/devices/pch.hpp b/p2pvr/devices/pch.hpp index 2eeeea5..435ce48 100644 --- a/p2pvr/devices/pch.hpp +++ b/p2pvr/devices/pch.hpp @@ -4,7 +4,6 @@ #include <Ice/Ice.h> #include <boost/bind.hpp> -#include <boost/foreach.hpp> #include <boost/function.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/shared_ptr.hpp> diff --git a/p2pvr/devices/tuner.cpp b/p2pvr/devices/tuner.cpp index fe90231..ee1625a 100644 --- a/p2pvr/devices/tuner.cpp +++ b/p2pvr/devices/tuner.cpp @@ -322,7 +322,7 @@ Tuner::senderThread() int n = backgroundClients.rbegin()->first + 1; fd_set rfds; FD_ZERO(&rfds); - BOOST_FOREACH(const auto & c, backgroundClients) { + for (const auto & c : backgroundClients) { FD_SET(c.first, &rfds); } lock.unlock(); |