diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/JavaScriptCore/runtime/JSLock.h | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSLock.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSLock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/runtime/JSLock.h b/Source/JavaScriptCore/runtime/JSLock.h index 05b388c..7b07b4f 100644 --- a/Source/JavaScriptCore/runtime/JSLock.h +++ b/Source/JavaScriptCore/runtime/JSLock.h @@ -53,7 +53,8 @@ namespace JSC { enum JSLockBehavior { SilenceAssertionsOnly, LockForReal }; - class JSLock : public Noncopyable { + class JSLock { + WTF_MAKE_NONCOPYABLE(JSLock); public: JSLock(ExecState*); JSLock(JSGlobalData*); @@ -89,7 +90,8 @@ namespace JSC { JSLockBehavior m_lockBehavior; - class DropAllLocks : public Noncopyable { + class DropAllLocks { + WTF_MAKE_NONCOPYABLE(DropAllLocks); public: DropAllLocks(ExecState* exec); DropAllLocks(JSLockBehavior); |