summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 02:10:18 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-07 02:10:18 +0000
commit73a797fb8e6c05e7756d30d7baef447267deacd1 (patch)
treee5be765e7deee04ee7c75195659a6fabb08ecfef /tools
parent347dc0a147199514afaaaa1f0d5949a41083efcb (diff)
downloadchromium_src-73a797fb8e6c05e7756d30d7baef447267deacd1.zip
chromium_src-73a797fb8e6c05e7756d30d7baef447267deacd1.tar.gz
chromium_src-73a797fb8e6c05e7756d30d7baef447267deacd1.tar.bz2
Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base.
TODO: Fix the remaining usages in third_party libraries and get rid of the macro in question. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/2657005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/memory_watcher/call_stack.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/memory_watcher/call_stack.h b/tools/memory_watcher/call_stack.h
index aa3685d..264ad901 100644
--- a/tools/memory_watcher/call_stack.h
+++ b/tools/memory_watcher/call_stack.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
//
@@ -138,7 +138,7 @@ class CallStack {
PrivateHookAllocator<int32> > SymbolCache;
static SymbolCache* symbol_cache_;
- DISALLOW_EVIL_CONSTRUCTORS(CallStack);
+ DISALLOW_COPY_AND_ASSIGN(CallStack);
};
// An AllocationStack is a type of CallStack which represents a CallStack where
@@ -162,7 +162,7 @@ class AllocationStack : public CallStack {
static AllocationStack* freelist_;
static Lock freelist_lock_;
- DISALLOW_EVIL_CONSTRUCTORS(AllocationStack);
+ DISALLOW_COPY_AND_ASSIGN(AllocationStack);
};
#endif // MEMORY_WATCHER_CALL_STACK_H_