diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 19:06:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-09 19:06:24 (GMT) |
| commit | 98445f62690278cd7343dbbf44d3cf2728a23a93 (patch) | |
| tree | ef371eab2f847262f05d36885308d6539a9b1261 /src | |
| parent | 5f4d30b2f0ee2c9e4cd9cb27d26298179d8ee3c9 (diff) | |
| download | Qt-98445f62690278cd7343dbbf44d3cf2728a23a93.zip Qt-98445f62690278cd7343dbbf44d3cf2728a23a93.tar.gz Qt-98445f62690278cd7343dbbf44d3cf2728a23a93.tar.bz2 | |
Fix compilation with aCC 6: cannot redefine a variable in the same scope
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 2927: error #2101: "h" has already been declared in the current scope
for (TCMalloc_ThreadCache* h = thread_heaps; h != NULL; h = h->next_) {
^
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp index f2148d0..4305c23 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp @@ -2902,7 +2902,7 @@ TCMalloc_ThreadCache* TCMalloc_ThreadCache::CreateCacheIfNecessary() { // Initialize per-thread data if necessary TCMalloc_ThreadCache* heap = NULL; { - SpinLockHolder h(&pageheap_lock); + SpinLockHolder lockholder(&pageheap_lock); #if COMPILER(MSVC) DWORD me; |