diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:16:53 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:16:54 +0200 |
| commit | 73bc82e67431b163a520d2c52a79fe9964b9c92e (patch) | |
| tree | 635ff80b5ebd30d16181c48de193d3cde56cf933 /Source/JavaScriptCore/runtime | |
| parent | dc79ad17bf7f40ace6b988e687e4d193615aa576 (diff) | |
| parent | ca982741975ad9e1222a284ede2de387e4fffa61 (diff) | |
| download | qtwebkit-73bc82e67431b163a520d2c52a79fe9964b9c92e.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie4e6728e997c474f9ad7cd17c0675b05ceb7c71b
Diffstat (limited to 'Source/JavaScriptCore/runtime')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSCell.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/runtime/JSCell.h b/Source/JavaScriptCore/runtime/JSCell.h index 76acb1e55..04bf4b420 100644 --- a/Source/JavaScriptCore/runtime/JSCell.h +++ b/Source/JavaScriptCore/runtime/JSCell.h @@ -49,6 +49,9 @@ enum EnumerationMode { IncludeDontEnumProperties }; +template<typename T> void* allocateCell(Heap&); +template<typename T> void* allocateCell(Heap&, size_t); + class JSCell { friend class JSValue; friend class MarkedBlock; |