summaryrefslogtreecommitdiffstats
path: root/third_party/tcmalloc/chromium/src/base/spinlock.h
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-16 09:15:05 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-16 09:15:05 +0000
commit9beaf2987dfc53dc150ac8c22336ea5046da005c (patch)
tree691df5aca5967b5827c7040fc579230a4d674500 /third_party/tcmalloc/chromium/src/base/spinlock.h
parent59e2c39984b9a34bbb72db1f3a02be171dc9726d (diff)
downloadchromium_src-9beaf2987dfc53dc150ac8c22336ea5046da005c.zip
chromium_src-9beaf2987dfc53dc150ac8c22336ea5046da005c.tar.gz
chromium_src-9beaf2987dfc53dc150ac8c22336ea5046da005c.tar.bz2
Revert 38882 - Land http://codereview.chromium.org/576001 again temporarily.
TBR=jar,antonm Review URL: http://codereview.chromium.org/596083 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/604063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/base/spinlock.h')
-rw-r--r--third_party/tcmalloc/chromium/src/base/spinlock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/tcmalloc/chromium/src/base/spinlock.h b/third_party/tcmalloc/chromium/src/base/spinlock.h
index 9e633c4..dda59a6 100644
--- a/third_party/tcmalloc/chromium/src/base/spinlock.h
+++ b/third_party/tcmalloc/chromium/src/base/spinlock.h
@@ -134,7 +134,7 @@ class LOCKABLE SpinLock {
void SlowLock();
void SlowUnlock(int64 wait_timestamp);
- DISALLOW_COPY_AND_ASSIGN(SpinLock);
+ DISALLOW_EVIL_CONSTRUCTORS(SpinLock);
};
// Corresponding locker object that arranges to acquire a spinlock for