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

Unified Diff: mojo/embedder/simple_platform_shared_buffer_posix.cc

Issue 612923002: Revert of Revert of Mojo: Convert scoped_ptr<...>() to nullptr in mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « mojo/embedder/simple_platform_shared_buffer.cc ('k') | mojo/embedder/simple_platform_shared_buffer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/embedder/simple_platform_shared_buffer_posix.cc
diff --git a/mojo/embedder/simple_platform_shared_buffer_posix.cc b/mojo/embedder/simple_platform_shared_buffer_posix.cc
index 9a111735eef9b97512c75373512b88b64fb8af1a..f6af3f56d5c6b4ec3e65b0ccc0729c6d2cb12517 100644
--- a/mojo/embedder/simple_platform_shared_buffer_posix.cc
+++ b/mojo/embedder/simple_platform_shared_buffer_posix.cc
@@ -137,7 +137,7 @@
// return null either.
if (real_base == MAP_FAILED || !real_base) {
PLOG(ERROR) << "mmap";
- return scoped_ptr<PlatformSharedBufferMapping>();
+ return nullptr;
}
void* base = static_cast<char*>(real_base) + offset_rounding;
« no previous file with comments | « mojo/embedder/simple_platform_shared_buffer.cc ('k') | mojo/embedder/simple_platform_shared_buffer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698