From 9165f1fe91b1b9be0f7c75570d85c69d9a64169e Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Fri, 20 Jan 2012 01:39:13 +0000 Subject: [PATCH] Changed to use std::sort Review URL: https://webrtc-codereview.appspot.com/356003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1488 4adac7df-926f-26a2-2b94-8c16560cd09d --- Android.mk | 2 +- src/modules/audio_coding/main/source/acm_neteq.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 2abae3faa..0486b7ea7 100644 --- a/Android.mk +++ b/Android.mk @@ -20,7 +20,7 @@ include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk -#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk diff --git a/src/modules/audio_coding/main/source/acm_neteq.cc b/src/modules/audio_coding/main/source/acm_neteq.cc index dd02cc6f3..7b391613f 100644 --- a/src/modules/audio_coding/main/source/acm_neteq.cc +++ b/src/modules/audio_coding/main/source/acm_neteq.cc @@ -479,7 +479,7 @@ ACMNetEQ::NetworkStatistics( { std::vector waiting_times_vec(waiting_times, waiting_times + waiting_times_len); - sort(waiting_times_vec.begin(), waiting_times_vec.end()); + std::sort(waiting_times_vec.begin(), waiting_times_vec.end()); size_t size = waiting_times_vec.size(); assert(size == static_cast(waiting_times_len)); if (size % 2 == 0)