summaryrefslogtreecommitdiffstats
path: root/base/allocator/allocator_shim.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 20:29:07 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 20:29:07 +0000
commit97d95a83f75cc8f1b9879543f1f9f6ef4f10bb10 (patch)
treefc33aad6f13fa16f948dee6efea2685744a976b5 /base/allocator/allocator_shim.cc
parent107541ab7e63445e7799f90a9714d2d37a584d3b (diff)
downloadchromium_src-97d95a83f75cc8f1b9879543f1f9f6ef4f10bb10.zip
chromium_src-97d95a83f75cc8f1b9879543f1f9f6ef4f10bb10.tar.gz
chromium_src-97d95a83f75cc8f1b9879543f1f9f6ef4f10bb10.tar.bz2
windows: Fix a few things clang complains about.
No functionality change. BUG=82385 TEST=none Review URL: http://codereview.chromium.org/9200009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator/allocator_shim.cc')
-rw-r--r--base/allocator/allocator_shim.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc
index 97bbf90..097fff2 100644
--- a/base/allocator/allocator_shim.cc
+++ b/base/allocator/allocator_shim.cc
@@ -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.
@@ -294,7 +294,7 @@ void SetupSubprocessAllocator() {
buffer[sizeof(buffer) - 1] = '\0';
if (secondary_length || !primary_length) {
- char* secondary_value = secondary_length ? buffer : "TCMALLOC";
+ const char* secondary_value = secondary_length ? buffer : "TCMALLOC";
// Force renderer (or other subprocesses) to use secondary_value.
int ret_val = _putenv_s(primary_name, secondary_value);
DCHECK_EQ(0, ret_val);