From 43b6c836150ae9bd48fee3e3f10ea17c8542dcf4 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 3 Jan 2015 21:43:53 +0000 Subject: Use native for instead BOOST_FOREACH --- netfs/daemon/daemon.cpp | 1 - netfs/fuse/fuse.cpp | 9 ++++----- netfs/fuse/fuseDirs.cpp | 3 +-- netfs/lib/pch.hpp | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp index 4611d30..d36e63f 100644 --- a/netfs/daemon/daemon.cpp +++ b/netfs/daemon/daemon.cpp @@ -1,6 +1,5 @@ #include "pch.hpp" #include -#include #include "daemon.h" #include "daemonService.h" #include "daemonVolume.h" diff --git a/netfs/fuse/fuse.cpp b/netfs/fuse/fuse.cpp index ceb1515..ca504ac 100644 --- a/netfs/fuse/fuse.cpp +++ b/netfs/fuse/fuse.cpp @@ -1,6 +1,5 @@ #include "pch.hpp" #include -#include #include "fuse.h" #include "lockHelpers.h" #include "cache.impl.h" @@ -21,10 +20,10 @@ NetFS::FuseApp::FuseApp(int & argc, char ** argv) : NetFS::FuseApp::~FuseApp() { - BOOST_FOREACH(const OpenDirs::value_type & of, openDirs) { + for (const OpenDirs::value_type & of : openDirs) { of.second->remote->close(); } - BOOST_FOREACH(const OpenFiles::value_type & of, openFiles) { + for (const OpenFiles::value_type & of : openFiles) { of.second->remote->close(); } volume->disconnect(); @@ -102,7 +101,7 @@ NetFS::FuseApp::connectToVolume() void NetFS::FuseApp::connectHandles() { - BOOST_FOREACH(const OpenFiles::value_type & of, openFiles) { + for (const OpenFiles::value_type & of : openFiles) { try { of.second->remote->ice_ping(); } @@ -110,7 +109,7 @@ NetFS::FuseApp::connectHandles() of.second->remote = volume->open(reqEnv(), of.second->path, of.second->flags); } } - BOOST_FOREACH(const OpenDirs::value_type & of, openDirs) { + for (const OpenDirs::value_type & of : openDirs) { try { of.second->remote->ice_ping(); } diff --git a/netfs/fuse/fuseDirs.cpp b/netfs/fuse/fuseDirs.cpp index 2f80711..75cb5a5 100644 --- a/netfs/fuse/fuseDirs.cpp +++ b/netfs/fuse/fuseDirs.cpp @@ -1,5 +1,4 @@ #include "pch.hpp" -#include #include "fuse.h" #include "misc.h" #include "lockHelpers.h" @@ -73,7 +72,7 @@ NetFS::FuseApp::readdir(const char * p, void * buf, fuse_fill_dir_t filler, off_ NetFS::NameList ds = remote->readdir(); std::string path(p); NetFS::VolumePrx vc = volume; - BOOST_FOREACH(const auto & e, ds) { + for (const auto & e : ds) { filler(buf, e.c_str(), NULL, 0); std::string epath = path + "/" + e; auto asga = volume->begin_getattr(reqEnv(), epath); diff --git a/netfs/lib/pch.hpp b/netfs/lib/pch.hpp index 91b6a5b..ffd9890 100644 --- a/netfs/lib/pch.hpp +++ b/netfs/lib/pch.hpp @@ -2,7 +2,6 @@ #ifndef NETFS_PCH #define NETFS_PCH -#include #include #include #include -- cgit v1.2.3