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

Unified Diff: webrtc/base/sigslottester_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 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 | « webrtc/base/sigslot_unittest.cc ('k') | webrtc/base/socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/sigslottester_unittest.cc
diff --git a/webrtc/base/sigslottester_unittest.cc b/webrtc/base/sigslottester_unittest.cc
index 778e352f43d6d8927fc52f5b3cb39abeb20fb4a2..00b25771097ad98d974aaa35abf3828a2f800e46 100755
--- a/webrtc/base/sigslottester_unittest.cc
+++ b/webrtc/base/sigslottester_unittest.cc
@@ -68,9 +68,9 @@ TEST(SigslotTester, TestSignalWithPointerToConstArgs) {
SigslotTester1<const std::string*, const std::string*> slot1(&source1,
&capture1);
EXPECT_EQ(0, slot1.callback_count());
- source1.emit(NULL);
+ source1.emit(nullptr);
EXPECT_EQ(1, slot1.callback_count());
- EXPECT_EQ(NULL, capture1);
+ EXPECT_EQ(nullptr, capture1);
}
TEST(SigslotTester, TestSignalWithConstPointerArgs) {
@@ -78,9 +78,9 @@ TEST(SigslotTester, TestSignalWithConstPointerArgs) {
std::string* capture1;
SigslotTester1<std::string* const, std::string*> slot1(&source1, &capture1);
EXPECT_EQ(0, slot1.callback_count());
- source1.emit(NULL);
+ source1.emit(nullptr);
EXPECT_EQ(1, slot1.callback_count());
- EXPECT_EQ(NULL, capture1);
+ EXPECT_EQ(nullptr, capture1);
}
} // namespace rtc
« no previous file with comments | « webrtc/base/sigslot_unittest.cc ('k') | webrtc/base/socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698