From 2781df7ce9a20b50047eba49fcc955c3e38434ab Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 6 Jun 2013 20:19:01 -0700 Subject: [PATCH] Use std::begin/std::end rather than countof --- aegisub/src/frame_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 63906709e..12c48c065 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -152,11 +152,11 @@ static void get_files_to_load(wxArrayString const& list, std::string &subs, std: wxString ext = file.GetExt().Lower(); - if (subs.empty() && std::binary_search(subsList, subsList + countof(subsList), ext)) + if (subs.empty() && std::binary_search(std::begin(subsList), std::end(subsList), ext)) subs = from_wx(file.GetFullPath()); - if (video.empty() && std::binary_search(videoList, videoList + countof(videoList), ext)) + if (video.empty() && std::binary_search(std::begin(videoList), std::end(videoList), ext)) video = from_wx(file.GetFullPath()); - if (audio.empty() && std::binary_search(audioList, audioList + countof(audioList), ext)) + if (audio.empty() && std::binary_search(std::begin(audioList), std::end(audioList), ext)) audio = from_wx(file.GetFullPath()); } }