| 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;
|
|
|