Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1569)

Unified Diff: cc/scoped_ptr_vector.h

Issue 11196014: Revert "cc: Switch to Chromium DCHECKs LOGs" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/scoped_ptr_hash_map.h ('k') | cc/scoped_texture.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scoped_ptr_vector.h
diff --git a/cc/scoped_ptr_vector.h b/cc/scoped_ptr_vector.h
index 28c00141004fede6e357428ac1b43796941938ff..05e38d9bac9360518425e5512535c05d845bddb9 100644
--- a/cc/scoped_ptr_vector.h
+++ b/cc/scoped_ptr_vector.h
@@ -6,7 +6,6 @@
#define CC_SCOPED_PTR_VECTOR_H_
#include "base/basictypes.h"
-#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
@@ -32,7 +31,7 @@ class ScopedPtrVector {
}
T* Peek(size_t index) const {
- DCHECK(index < size());
+ ASSERT(index < size());
return data_[index];
}
@@ -41,12 +40,12 @@ class ScopedPtrVector {
}
T* first() const {
- DCHECK(!isEmpty());
+ ASSERT(!isEmpty());
return Peek(0);
}
T* last() const {
- DCHECK(!isEmpty());
+ ASSERT(!isEmpty());
return Peek(size() - 1);
}
@@ -55,14 +54,14 @@ class ScopedPtrVector {
}
scoped_ptr<T> take(size_t index) {
- DCHECK(index < size());
+ ASSERT(index < size());
scoped_ptr<T> ret(data_[index]);
data_[index] = NULL;
return ret.Pass();
}
void remove(size_t index) {
- DCHECK(index < size());
+ ASSERT(index < size());
delete data_[index];
data_.erase(data_.begin() + index);
}
@@ -76,7 +75,7 @@ class ScopedPtrVector {
}
void insert(size_t index, scoped_ptr<T> item) {
- DCHECK(index < size());
+ ASSERT(index < size());
data_.insert(data_.begin() + index, item.release());
}
« no previous file with comments | « cc/scoped_ptr_hash_map.h ('k') | cc/scoped_texture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698