diff options
author | viettrungluu <viettrungluu@chromium.org> | 2014-09-24 16:32:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 23:46:17 +0000 |
commit | f538bf10cbad94f7a63c5b6cbaaed61e7ff698db (patch) | |
tree | b53f31c0b4f750d4880cc81efdf6ca4e4dad9824 /mojo/system/data_pipe.cc | |
parent | e9bc87f33688e6b8f9bdaa71031ad07fb6da086c (diff) | |
download | chromium_src-f538bf10cbad94f7a63c5b6cbaaed61e7ff698db.zip chromium_src-f538bf10cbad94f7a63c5b6cbaaed61e7ff698db.tar.gz chromium_src-f538bf10cbad94f7a63c5b6cbaaed61e7ff698db.tar.bz2 |
Mojo: NULL -> nullptr in mojo/system and mojo/embedder.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/597413002
Cr-Commit-Position: refs/heads/master@{#296560}
Diffstat (limited to 'mojo/system/data_pipe.cc')
-rw-r--r-- | mojo/system/data_pipe.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/system/data_pipe.cc b/mojo/system/data_pipe.cc index dfef4c4..767657d 100644 --- a/mojo/system/data_pipe.cc +++ b/mojo/system/data_pipe.cc @@ -436,8 +436,8 @@ DataPipe::DataPipe(bool has_local_producer, capacity_num_bytes_(validated_options.capacity_num_bytes), producer_open_(true), consumer_open_(true), - producer_waiter_list_(has_local_producer ? new WaiterList() : NULL), - consumer_waiter_list_(has_local_consumer ? new WaiterList() : NULL), + producer_waiter_list_(has_local_producer ? new WaiterList() : nullptr), + consumer_waiter_list_(has_local_consumer ? new WaiterList() : nullptr), producer_two_phase_max_num_bytes_written_(0), consumer_two_phase_max_num_bytes_read_(0) { // Check that the passed in options actually are validated. |