aboutsummaryrefslogtreecommitdiff
path: root/src/clients
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-04 07:06:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-04 07:06:25 +0000
commit48bdff1a499e40190adef7c32ee6469540a50b6e (patch)
tree7b9f4f0aa831ec13f9110b21b783d79ed29beaaf /src/clients
parent2415f6b3f34965628f50ef42b77367e0aea0ecc8 (diff)
downloadpaludis-48bdff1a499e40190adef7c32ee6469540a50b6e.tar.gz
paludis-48bdff1a499e40190adef7c32ee6469540a50b6e.tar.xz
Nuke futures, parallel_for_each for now
Diffstat (limited to 'src/clients')
-rw-r--r--src/clients/inquisitio/do_search.cc3
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc7
2 files changed, 4 insertions, 6 deletions
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index 1c961ff66..d7276e7a6 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -34,7 +34,6 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/tr1_functional.hh>
-#include <paludis/util/parallel_for_each.hh>
#include <paludis/util/create_iterator-impl.hh>
#include <list>
#include <set>
@@ -272,7 +271,7 @@ do_search(const Environment & env)
extractors
);
- parallel_for_each(ids.begin(), ids.end(), tr1::bind(&set_id, tr1::cref(env), tr1::cref(repos), _1, eligible, matches));
+ std::for_each(ids.begin(), ids.end(), tr1::bind(&set_id, tr1::cref(env), tr1::cref(repos), _1, eligible, matches));
bool any(false);
InquisitioQueryTask task(&env);
diff --git a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc b/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
index 3ea1aabc5..3fad1173c 100644
--- a/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
+++ b/src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc
@@ -29,7 +29,6 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/log.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/parallel_for_each.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/set-impl.hh>
#include <paludis/util/tr1_functional.hh>
@@ -156,7 +155,7 @@ BrokenLinkageFinder::BrokenLinkageFinder(const Environment * env, const std::str
std::inserter(_imp->extra_lib_dirs, _imp->extra_lib_dirs.begin()),
tr1::bind(realpath_with_current_and_root, _1, FSEntry("/"), env->root()));
- parallel_for_each(search_dirs_pruned.begin(), search_dirs_pruned.end(),
+ std::for_each(search_dirs_pruned.begin(), search_dirs_pruned.end(),
tr1::bind(&Implementation<BrokenLinkageFinder>::search_directory, _imp.get(), _1));
for (Configuration::DirsIterator it(_imp->extra_lib_dirs.begin()),
@@ -221,7 +220,7 @@ Implementation<BrokenLinkageFinder>::walk_directory(const FSEntry & directory)
try
{
- parallel_for_each(DirIterator(directory, false), DirIterator(),
+ std::for_each(DirIterator(directory, false), DirIterator(),
tr1::bind(&Implementation<BrokenLinkageFinder>::check_file, this, _1));
}
catch (const FSError & ex)
@@ -278,7 +277,7 @@ Implementation<BrokenLinkageFinder>::add_breakage(const FSEntry & file, const st
tr1::shared_ptr<const PackageIDSequence> pkgs(
db->query(query::InstalledAtRoot(env->root()), qo_whatever));
- parallel_for_each(pkgs->begin(), pkgs->end(),
+ std::for_each(pkgs->begin(), pkgs->end(),
tr1::bind(&Implementation<BrokenLinkageFinder>::gather_package, this, _1));
}