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

Unified Diff: webrtc/system_wrappers/source/event_timer_win.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. 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
Index: webrtc/system_wrappers/source/event_timer_win.cc
diff --git a/webrtc/system_wrappers/source/event_timer_win.cc b/webrtc/system_wrappers/source/event_timer_win.cc
index 4c586988df65af8dff43721eee9aaae06104b776..9908a20a6a8ccfd451fc33378fdf673db7f2490e 100644
--- a/webrtc/system_wrappers/source/event_timer_win.cc
+++ b/webrtc/system_wrappers/source/event_timer_win.cc
@@ -20,12 +20,11 @@ EventTimerWrapper* EventTimerWrapper::Create() {
}
EventTimerWin::EventTimerWin()
- : event_(::CreateEvent(NULL, // security attributes
- FALSE, // manual reset
- FALSE, // initial state
- NULL)), // name of event
- timerID_(NULL) {
-}
+ : event_(::CreateEvent(nullptr, // security attributes
+ FALSE, // manual reset
+ FALSE, // initial state
+ nullptr)), // name of event
+ timerID_(nullptr) {}
EventTimerWin::~EventTimerWin() {
StopTimer();
@@ -50,9 +49,9 @@ EventTypeWrapper EventTimerWin::Wait(unsigned long max_time) {
}
bool EventTimerWin::StartTimer(bool periodic, unsigned long time) {
- if (timerID_ != NULL) {
+ if (timerID_ != nullptr) {
timeKillEvent(timerID_);
- timerID_ = NULL;
+ timerID_ = nullptr;
}
if (periodic) {
@@ -63,13 +62,13 @@ bool EventTimerWin::StartTimer(bool periodic, unsigned long time) {
TIME_ONESHOT | TIME_CALLBACK_EVENT_SET);
}
- return timerID_ != NULL;
+ return timerID_ != nullptr;
}
bool EventTimerWin::StopTimer() {
- if (timerID_ != NULL) {
+ if (timerID_ != nullptr) {
timeKillEvent(timerID_);
- timerID_ = NULL;
+ timerID_ = nullptr;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698