summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-05 16:10:07 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-05 16:10:07 +0100
commit3a19d7480fdcd01cf85be1a55da743ea7cbcb305 (patch)
tree31710219c263e124ff3cd9a9bf2368ef3d83aaa0 /src
parent0e2b36f03f6b5614492d16565d2ef6a98e48dcc9 (diff)
Another OS X build tweak.v2.13.33
Diffstat (limited to 'src')
-rw-r--r--src/wx/timeline.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 0ddd78ae0..e96b474cf 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -48,8 +48,6 @@ using std::list;
using std::cout;
using std::min;
using std::max;
-using std::begin;
-using std::end;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
@@ -318,13 +316,13 @@ struct AudioMappingComparator {
shared_ptr<TimelineAudioContentView> cva = dynamic_pointer_cast<TimelineAudioContentView>(a);
if (cva) {
list<int> oc = cva->content()->audio->mapping().mapped_output_channels();
- la = *min_element(begin(oc), end(oc));
+ la = *min_element(boost::begin(oc), boost::end(oc));
}
int lb = -1;
shared_ptr<TimelineAudioContentView> cvb = dynamic_pointer_cast<TimelineAudioContentView>(b);
if (cvb) {
list<int> oc = cvb->content()->audio->mapping().mapped_output_channels();
- lb = *min_element(begin(oc), end(oc));
+ lb = *min_element(boost::begin(oc), boost::end(oc));
}
return la < lb;
}