Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / system_wrappers / interface / scoped_vector.h

diff --git a/src/third_party/webrtc/system_wrappers/interface/scoped_vector.h b/src/third_party/webrtc/system_wrappers/interface/scoped_vector.h
index 68db3a1..7b8c678 100644 (file)
--- a/src/third_party/webrtc/system_wrappers/interface/scoped_vector.h
+++ b/src/third_party/webrtc/system_wrappers/interface/scoped_vector.h
@@ -13,10 +13,9 @@
 #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_VECTOR_H_
 #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_SCOPED_VECTOR_H_
 
-#include <assert.h>
-#include <algorithm>
 #include <vector>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/system_wrappers/interface/stl_util.h"
 #include "webrtc/system_wrappers/source/move.h"
 
@@ -26,7 +25,7 @@ namespace webrtc {
 // destructor.
 template <class T>
 class ScopedVector {
-  WEBRTC_MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector, RValue)
+  RTC_MOVE_ONLY_TYPE_FOR_CPP_03(ScopedVector, RValue)
 
  public:
   typedef typename std::vector<T*>::allocator_type allocator_type;
@@ -76,7 +75,7 @@ class ScopedVector {
   void push_back(T* elem) { v_.push_back(elem); }
 
   void pop_back() {
-    assert(!empty());
+    DCHECK(!empty());
     delete v_.back();
     v_.pop_back();
   }