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

Unified Diff: mojo/public/cpp/bindings/lib/fixed_buffer.cc

Issue 613053002: Mojo: NULL -> nullptr in mojo/public/cpp/bindings and also for the bindings generator. (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
Index: mojo/public/cpp/bindings/lib/fixed_buffer.cc
diff --git a/mojo/public/cpp/bindings/lib/fixed_buffer.cc b/mojo/public/cpp/bindings/lib/fixed_buffer.cc
index 6293233765b533ee5ce976f105f6e2c7c2692193..9542ef8dea40cd690d724b6c5aae95972b7b3507 100644
--- a/mojo/public/cpp/bindings/lib/fixed_buffer.cc
+++ b/mojo/public/cpp/bindings/lib/fixed_buffer.cc
@@ -15,7 +15,7 @@ namespace mojo {
namespace internal {
FixedBuffer::FixedBuffer(size_t size)
- : ptr_(NULL),
+ : ptr_(nullptr),
cursor_(0),
size_(internal::Align(size)) {
// calloc() required to zero memory and thus avoid info leaks.
@@ -31,7 +31,7 @@ void* FixedBuffer::Allocate(size_t delta) {
if (delta == 0 || delta > size_ - cursor_) {
MOJO_DCHECK(false) << "Not reached";
- return NULL;
+ return nullptr;
}
char* result = ptr_ + cursor_;
@@ -42,7 +42,7 @@ void* FixedBuffer::Allocate(size_t delta) {
void* FixedBuffer::Leak() {
char* ptr = ptr_;
- ptr_ = NULL;
+ ptr_ = nullptr;
cursor_ = 0;
size_ = 0;
return ptr;
« no previous file with comments | « mojo/public/cpp/bindings/lib/filter_chain.cc ('k') | mojo/public/cpp/bindings/lib/interface_impl_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698