diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-01-09 11:33:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 19:34:12 +0000 |
| commit | c5f104b31e1a640e4adaeaac7fca30c72eb04138 (patch) | |
| tree | f1de6d1828d8eaef25a9aa4e07a4a4d46764f045 /remoting/host/desktop_session_proxy.cc | |
| parent | a261cb0d164c411e916fb62f4c560ce5acb260f3 (diff) | |
| download | chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.zip chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.tar.gz chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.tar.bz2 | |
replace NULL->nullptr in src/remoting.
Review URL: https://codereview.chromium.org/810133003
Cr-Commit-Position: refs/heads/master@{#310816}
Diffstat (limited to 'remoting/host/desktop_session_proxy.cc')
| -rw-r--r-- | remoting/host/desktop_session_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc index ec163ca..cb928dd 100644 --- a/remoting/host/desktop_session_proxy.cc +++ b/remoting/host/desktop_session_proxy.cc @@ -448,7 +448,7 @@ DesktopSessionProxy::GetSharedBufferCore(int id) { return i->second; } else { LOG(ERROR) << "Failed to find the shared buffer " << id; - return NULL; + return nullptr; } } @@ -478,7 +478,7 @@ void DesktopSessionProxy::OnCreateSharedBuffer( scoped_refptr<IpcSharedBufferCore> shared_buffer = new IpcSharedBufferCore(id, handle, desktop_process_, size); - if (shared_buffer->memory() != NULL && + if (shared_buffer->memory() != nullptr && !shared_buffers_.insert(std::make_pair(id, shared_buffer)).second) { LOG(ERROR) << "Duplicate shared buffer id " << id << " encountered"; } |