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

Unified Diff: webrtc/base/physicalsocketserver_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/physicalsocketserver.cc ('k') | webrtc/base/platform_file.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/physicalsocketserver_unittest.cc
diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc
index 63d2f0d92c80a14fad1965ef77be2de851094ce6..0eea1d55c1c8c7477efb0fb342ce30365adc577f 100644
--- a/webrtc/base/physicalsocketserver_unittest.cc
+++ b/webrtc/base/physicalsocketserver_unittest.cc
@@ -483,9 +483,9 @@ class PosixSignalDeliveryTest : public testing::Test {
}
void TearDown() {
- ss_.reset(NULL);
+ ss_.reset(nullptr);
signals_received_.clear();
- signaled_thread_ = NULL;
+ signaled_thread_ = nullptr;
}
bool ExpectSignal(int signum) {
@@ -518,7 +518,7 @@ class PosixSignalDeliveryTest : public testing::Test {
};
std::vector<int> PosixSignalDeliveryTest::signals_received_;
-Thread *PosixSignalDeliveryTest::signaled_thread_ = NULL;
+Thread* PosixSignalDeliveryTest::signaled_thread_ = nullptr;
// Test receiving a synchronous signal while not in Wait() and then entering
// Wait() afterwards.
@@ -563,7 +563,7 @@ class RaiseSigTermRunnable : public Runnable {
// be delivered to us.
sigset_t mask;
sigemptyset(&mask);
- pthread_sigmask(SIG_SETMASK, &mask, NULL);
+ pthread_sigmask(SIG_SETMASK, &mask, nullptr);
// Raise it.
raise(SIGTERM);
@@ -578,7 +578,7 @@ TEST_F(PosixSignalDeliveryTest, SignalOnDifferentThread) {
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGTERM);
- EXPECT_EQ(0, pthread_sigmask(SIG_SETMASK, &mask, NULL));
+ EXPECT_EQ(0, pthread_sigmask(SIG_SETMASK, &mask, nullptr));
// Start a new thread that raises it. It will have to be delivered to that
// thread. Our implementation should safely handle it and dispatch
// RecordSignal() on this thread.
« no previous file with comments | « webrtc/base/physicalsocketserver.cc ('k') | webrtc/base/platform_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698