diff --git a/src/Menus.cpp b/src/Menus.cpp index 361b50aa4..2661fce53 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -5433,14 +5433,14 @@ void AudacityProject::OnSelectClip(bool next) int i = 0; if (next) { - auto result = find_if(clips.begin(), clips.end(), [&] (WaveClip* const& clip) { + auto result = std::find_if(clips.begin(), clips.end(), [&] (WaveClip* const& clip) { return clip->GetStartTime() == t0; }); if (result != clips.end() && (*result)->GetEndTime() != t1 ) { clip = *result; i = result - clips.begin(); } else { - auto result = find_if(clips.begin(), clips.end(), [&] (WaveClip* const& clip) { + auto result = std::find_if(clips.begin(), clips.end(), [&] (WaveClip* const& clip) { return clip->GetStartTime() > t0; }); if (result != clips.end()) { clip = *result; @@ -5449,7 +5449,7 @@ void AudacityProject::OnSelectClip(bool next) } } else { - auto result = find_if(clips.rbegin(), clips.rend(), [&] (WaveClip* const& clip) { + auto result = std::find_if(clips.rbegin(), clips.rend(), [&] (WaveClip* const& clip) { return clip->GetStartTime() < t0; }); if (result != clips.rend()) { clip = *result; @@ -6301,9 +6301,9 @@ AudacityProject::FoundClipBoundary AudacityProject::FindNextClipBoundary(const W AudacityProject::FoundClipBoundary result{}; const auto clips = wt->SortedClipArray(); - auto resultStart = find_if(clips.begin(), clips.end(), [&] (const WaveClip* const& clip) { + auto resultStart = std::find_if(clips.begin(), clips.end(), [&] (const WaveClip* const& clip) { return clip->GetStartTime() > time; }); - auto resultEnd = find_if(clips.begin(), clips.end(), [&] (const WaveClip* const& clip) { + auto resultEnd = std::find_if(clips.begin(), clips.end(), [&] (const WaveClip* const& clip) { return clip->GetEndTime() > time; }); if (resultStart != clips.end() && resultEnd != clips.end()) { @@ -6343,9 +6343,9 @@ AudacityProject::FoundClipBoundary AudacityProject::FindPrevClipBoundary(const W AudacityProject::FoundClipBoundary result{}; const auto clips = wt->SortedClipArray(); - auto resultStart = find_if(clips.rbegin(), clips.rend(), [&] (const WaveClip* const& clip) { + auto resultStart = std::find_if(clips.rbegin(), clips.rend(), [&] (const WaveClip* const& clip) { return clip->GetStartTime() < time; }); - auto resultEnd = find_if(clips.rbegin(), clips.rend(), [&] (const WaveClip* const& clip) { + auto resultEnd = std::find_if(clips.rbegin(), clips.rend(), [&] (const WaveClip* const& clip) { return clip->GetEndTime() < time; }); if (resultStart != clips.rend() && resultEnd != clips.rend()) { diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index ef320012d..7b6a15349 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -2220,7 +2220,7 @@ WaveClip* WaveTrack::GetClipAtTime(double time) // When the time is both the end of a clip and the start of the next clip, the // latter clip is returned. const auto clips = SortedClipArray(); - auto result = find_if(clips.rbegin(), clips.rend(), [&] (WaveClip* const& clip) { + auto result = std::find_if(clips.rbegin(), clips.rend(), [&] (WaveClip* const& clip) { return time >= clip->GetStartTime() && time <= clip->GetEndTime(); }); return result != clips.rend() ? *result : nullptr;