From 9ad1434f375775da8d010da794feffa5c275d1cb Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 29 Sep 2011 02:33:22 +0000 Subject: [PATCH] Don't rely on ADL for std algorithms called on wxArrayInt as wxArrayInt doesn't always inherit from std::vector Originally committed to SVN as r5671. --- aegisub/src/audio_karaoke.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/audio_karaoke.cpp b/aegisub/src/audio_karaoke.cpp index c34b06770..aab45cf68 100644 --- a/aegisub/src/audio_karaoke.cpp +++ b/aegisub/src/audio_karaoke.cpp @@ -264,10 +264,10 @@ void AudioKaraoke::SetDisplayText() { dc.GetPartialTextExtents(spaced_text, p_char_x); // Convert the partial sub to the the width of each character - adjacent_difference(p_char_x.begin(), p_char_x.end(), p_char_x.begin()); + std::adjacent_difference(p_char_x.begin(), p_char_x.end(), p_char_x.begin()); // Get the maximum character width - char_width = *max_element(p_char_x.begin(), p_char_x.end()); + char_width = *std::max_element(p_char_x.begin(), p_char_x.end()); // Center each character within the space available to it char_x.resize(p_char_x.size());