diff options
| author | наб <nabijaczleweli@nabijaczleweli.xyz> | 2024-11-11 21:40:07 +0100 |
|---|---|---|
| committer | наб <nabijaczleweli@nabijaczleweli.xyz> | 2024-11-11 21:40:20 +0100 |
| commit | 14353ab9a1b03eff5ebb4927f254928ee21a2f90 (patch) | |
| tree | 3fad797212852023a152b39c2df4a523678d9d32 | |
| parent | dce938527ac064955a0fb04172635127c9e2fe98 (diff) | |
Replace std::bind with lambdas
| -rw-r--r-- | apt-private/private-cachefile.cc | 2 | ||||
| -rw-r--r-- | apt-private/private-output.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc index d46f2acc4..96e45be10 100644 --- a/apt-private/private-cachefile.cc +++ b/apt-private/private-cachefile.cc @@ -46,7 +46,7 @@ void SortedPackageUniverse::LazyInit() const List.reserve(Owner->Head().GroupCount); for (pkgCache::GrpIterator I{Owner->GrpBegin()}; I.end() != true; ++I) GrpList.emplace_back(I - Owner->GrpP); - std::stable_sort(GrpList.begin(), GrpList.end(), std::bind( &SortPackagesByName, Owner, std::placeholders::_1, std::placeholders::_2 )); + std::stable_sort(GrpList.begin(), GrpList.end(), [&](auto && l, auto && r) { return SortPackagesByName(Owner, l, r); }); List.reserve(Owner->Head().PackageCount); for (auto G : GrpList) { diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index 3d234727f..79a97128c 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -902,7 +902,7 @@ std::string CurrentVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator con } std::function<std::string(pkgCache::PkgIterator const &)> CurrentVersion(pkgCacheFile * const Cache) { - return std::bind(static_cast<std::string(*)(pkgCacheFile * const, pkgCache::PkgIterator const&)>(&CurrentVersion), Cache, std::placeholders::_1); + return [=](pkgCache::PkgIterator const &i) { return CurrentVersion(Cache, i); }; } std::string CandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg) { @@ -910,7 +910,7 @@ std::string CandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator c } std::function<std::string(pkgCache::PkgIterator const &)> CandidateVersion(pkgCacheFile * const Cache) { - return std::bind(static_cast<std::string(*)(pkgCacheFile * const, pkgCache::PkgIterator const&)>(&CandidateVersion), Cache, std::placeholders::_1); + return [=](pkgCache::PkgIterator const &i) { return CandidateVersion(Cache, i); }; } std::string CurrentToCandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg) { @@ -926,7 +926,7 @@ std::string CurrentToCandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgI } std::function<std::string(pkgCache::PkgIterator const &)> CurrentToCandidateVersion(pkgCacheFile * const Cache) { - return std::bind(static_cast<std::string(*)(pkgCacheFile * const, pkgCache::PkgIterator const&)>(&CurrentToCandidateVersion), Cache, std::placeholders::_1); + return [=](pkgCache::PkgIterator const &i) { return CurrentToCandidateVersion(Cache, i); }; } bool AlwaysTrue(pkgCache::PkgIterator const &) { |