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

Unified Diff: webrtc/examples/peerconnection/client/linux/main.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/examples/peerconnection/client/linux/main.cc
diff --git a/webrtc/examples/peerconnection/client/linux/main.cc b/webrtc/examples/peerconnection/client/linux/main.cc
index 2982c287f12beb4ee61072820fa1e825d588b9a2..9dd09d215883ca5f741c399991ce54bd9a1b022e 100644
--- a/webrtc/examples/peerconnection/client/linux/main.cc
+++ b/webrtc/examples/peerconnection/client/linux/main.cc
@@ -21,7 +21,7 @@
class CustomSocketServer : public rtc::PhysicalSocketServer {
public:
CustomSocketServer(rtc::Thread* thread, GtkMainWnd* wnd)
- : thread_(thread), wnd_(wnd), conductor_(NULL), client_(NULL) {}
+ : thread_(thread), wnd_(wnd), conductor_(nullptr), client_(nullptr) {}
virtual ~CustomSocketServer() {}
void set_client(PeerConnectionClient* client) { client_ = client; }
@@ -37,9 +37,9 @@ class CustomSocketServer : public rtc::PhysicalSocketServer {
while (gtk_events_pending())
gtk_main_iteration();
- if (!wnd_->IsWindow() && !conductor_->connection_active() &&
- client_ != NULL && !client_->is_connected()) {
- thread_->Quit();
+ if (!wnd_->IsWindow() && !conductor_->connection_active() &&
+ client_ != nullptr && !client_->is_connected()) {
+ thread_->Quit();
}
return rtc::PhysicalSocketServer::Wait(0/*cms == -1 ? 1 : cms*/,
process_io);
@@ -62,12 +62,12 @@ int main(int argc, char* argv[]) {
// g_thread_init API is deprecated since glib 2.31.0, see release note:
// http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html
#if !GLIB_CHECK_VERSION(2, 31, 0)
- g_thread_init(NULL);
+ g_thread_init(nullptr);
#endif
rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
if (FLAG_help) {
- rtc::FlagList::Print(NULL, false);
+ rtc::FlagList::Print(nullptr, false);
return 0;
}
@@ -99,7 +99,7 @@ int main(int argc, char* argv[]) {
// gtk_main();
wnd.Destroy();
- thread->set_socketserver(NULL);
+ thread->set_socketserver(nullptr);
// TODO(henrike): Run the Gtk main loop to tear down the connection.
/*
while (gtk_events_pending()) {

Powered by Google App Engine
This is Rietveld 408576698