summaryrefslogtreecommitdiffstats
path: root/base/observer_list.h
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 20:27:29 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 20:27:29 +0000
commitcb2f36323ab5dbecc2ecc6e00ec04956e49b356b (patch)
tree1147a72e3e49ffb869aa67e8084309ed4d616c54 /base/observer_list.h
parentedc286198b90c629bbf6081440512d02aef603d8 (diff)
downloadchromium_src-cb2f36323ab5dbecc2ecc6e00ec04956e49b356b.zip
chromium_src-cb2f36323ab5dbecc2ecc6e00ec04956e49b356b.tar.gz
chromium_src-cb2f36323ab5dbecc2ecc6e00ec04956e49b356b.tar.bz2
Fix some compiler warnings, and cleanup EXPECT_EQ comparisons. Hello "U" suffix :-)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/observer_list.h')
-rw-r--r--base/observer_list.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/observer_list.h b/base/observer_list.h
index 0242d6a..f4876df 100644
--- a/base/observer_list.h
+++ b/base/observer_list.h
@@ -87,7 +87,7 @@ class ObserverList {
// When check_empty is true, assert that the list is empty on destruction.
if (check_empty) {
Compact();
- DCHECK_EQ(observers_.size(), 0);
+ DCHECK_EQ(observers_.size(), 0U);
}
}
@@ -164,7 +164,7 @@ class ObserverList {
do { \
ObserverList<ObserverType>::Iterator it(observer_list); \
ObserverType* obs; \
- while (obs = it.GetNext()) \
+ while ((obs = it.GetNext()) != NULL) \
obs->func; \
} while (0)