From bbdd7640e885ce3a72bba05e0aaf2361751b9142 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 1 Mar 2014 14:48:57 +0000 Subject: [C++11] Replace verbose functors with succinct lambdas No functionality change. llvm-svn: 202590 --- clang/lib/Serialization/ModuleManager.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'clang/lib/Serialization/ModuleManager.cpp') diff --git a/clang/lib/Serialization/ModuleManager.cpp b/clang/lib/Serialization/ModuleManager.cpp index ce7e7af..201f8fa 100644 --- a/clang/lib/Serialization/ModuleManager.cpp +++ b/clang/lib/Serialization/ModuleManager.cpp @@ -134,22 +134,6 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type, return NewModule? NewlyLoaded : AlreadyLoaded; } -namespace { - /// \brief Predicate that checks whether a module file occurs within - /// the given set. - class IsInModuleFileSet : public std::unary_function { - llvm::SmallPtrSet &Removed; - - public: - IsInModuleFileSet(llvm::SmallPtrSet &Removed) - : Removed(Removed) { } - - bool operator()(ModuleFile *MF) const { - return Removed.count(MF); - } - }; -} - void ModuleManager::removeModules(ModuleIterator first, ModuleIterator last, ModuleMap *modMap) { if (first == last) @@ -159,7 +143,9 @@ void ModuleManager::removeModules(ModuleIterator first, ModuleIterator last, llvm::SmallPtrSet victimSet(first, last); // Remove any references to the now-destroyed modules. - IsInModuleFileSet checkInSet(victimSet); + std::function checkInSet = [&](ModuleFile *MF) { + return victimSet.count(MF); + }; for (unsigned i = 0, n = Chain.size(); i != n; ++i) { Chain[i]->ImportedBy.remove_if(checkInSet); } -- cgit v1.1