diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 14:12:07 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 14:12:07 +0000 |
| commit | c56ce5b8bbc97712ded1cabcc3a26dca4cf06602 (patch) | |
| tree | e82a06a54662f8bbb96b3e068da869cf1729b70b /base | |
| parent | 534afb6612cc93b5054c6ffbf584137b42738964 (diff) | |
| download | chromium_src-c56ce5b8bbc97712ded1cabcc3a26dca4cf06602.zip chromium_src-c56ce5b8bbc97712ded1cabcc3a26dca4cf06602.tar.gz chromium_src-c56ce5b8bbc97712ded1cabcc3a26dca4cf06602.tar.bz2 | |
tcmalloc: Fix a C++11 error.
New clang versions complain in C++11 mode that:
error: cannot initialize a variable of type 'void *' with an rvalue of type 'uintptr_t' (aka 'unsigned long')
This same change was done for the google-internal version of tcmalloc too.
BUG=255201
Review URL: https://chromiumcodereview.appspot.com/18052009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 62bbf2c..4febed2 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -458,11 +458,6 @@ 'NO_HEAP_CHECK', ], }], - [ 'clang==1', { - 'cflags': [ - '-Wno-non-literal-null-conversion', - ], - }], ['order_profiling != 0', { 'target_conditions' : [ ['_toolset=="target"', { |