diff options
| author | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
| commit | 180d9189e8098d98848367f673fff723ddd1d068 (patch) | |
| tree | b052fb1b8361e962884f54aa4d6e6d8dd6f67e73 /src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp | |
| parent | 18acf933474577a4cec31560eeee22de04111e1e (diff) | |
| parent | 0f6909e8e1be93d16798d31f18c4da2b0b5a084c (diff) | |
| download | Qt-180d9189e8098d98848367f673fff723ddd1d068.zip Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.gz Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp index aa93252..fae056e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp @@ -78,11 +78,7 @@ extern const double Inf = NaNInf.doubles.Inf_Double; void* JSCell::operator new(size_t size, ExecState* exec) { -#ifdef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE - return exec->heap()->inlineAllocate(size); -#else return exec->heap()->allocate(size); -#endif } bool JSCell::getUInt32(uint32_t&) const |