diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
| commit | b2968292db57db2a46c17b0b785f7224a0a63878 (patch) | |
| tree | f2a0b0c36e90393aaea82d567c3554606b354356 /base | |
| parent | 6fdd4411046d735e9dba5a163d03262cc618a27f (diff) | |
| download | chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.zip chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.gz chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.bz2 | |
Fix a few warnings that -Wnull-conversion of a future clang will complain about.
BUG=none
TEST=none
TBR=OWNERS
NOTRY=true
Review URL: http://codereview.chromium.org/9845017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/mac/scoped_ioobject.h | 8 | ||||
| -rw-r--r-- | base/process_util_mac.mm | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/base/mac/scoped_ioobject.h b/base/mac/scoped_ioobject.h index d5cb90c..9c4ebe2 100644 --- a/base/mac/scoped_ioobject.h +++ b/base/mac/scoped_ioobject.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,7 +20,7 @@ class ScopedIOObject { public: typedef IOT element_type; - explicit ScopedIOObject(IOT object = NULL) + explicit ScopedIOObject(IOT object = IO_OBJECT_NULL) : object_(object) { } @@ -29,7 +29,7 @@ class ScopedIOObject { IOObjectRelease(object_); } - void reset(IOT object = NULL) { + void reset(IOT object = IO_OBJECT_NULL) { if (object_) IOObjectRelease(object_); object_ = object; @@ -59,7 +59,7 @@ class ScopedIOObject { IOT release() WARN_UNUSED_RESULT { IOT temp = object_; - object_ = NULL; + object_ = IO_OBJECT_NULL; return temp; } diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index ae8e6f1..3ab2fb6 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -834,8 +834,8 @@ void EnableTerminationOnOutOfMemory() { ChromeMallocZone* purgeable_zone = reinterpret_cast<ChromeMallocZone*>(GetPurgeableZone()); - vm_address_t page_start_default = NULL; - vm_address_t page_start_purgeable = NULL; + vm_address_t page_start_default = 0; + vm_address_t page_start_purgeable = 0; vm_size_t len_default = 0; vm_size_t len_purgeable = 0; if (zone_allocators_protected) { |