mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 654929. Fix fallout from 633653, failure on sparc64. Add some #ifdef JS_METHODJIT/JS_TRACER. r=nnethercode 

/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: expected type-specifier before 'MemoryReporter_XPConnectJSMjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: expected `)' before 'MemoryReporter_XPConnectJSMjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1485: error: expected type-specifier before 'MemoryReporter_XPConnectJSMjitData'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1485: error: expected `)' before 'MemoryReporter_XPConnectJSMjitData'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1485: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1486: error: expected type-specifier before 'MemoryReporter_XPConnectJSTjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1486: error: expected `)' before 'MemoryReporter_XPConnectJSTjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1486: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1487: error: expected type-specifier before 'MemoryReporter_XPConnectJSTjitDataAllocatorsMain'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1487: error: expected `)' before 'MemoryReporter_XPConnectJSTjitDataAllocatorsMain'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1487: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1488: error: expected type-specifier before 'MemoryReporter_XPConnectJSTjitDataAllocatorsReserve'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1488: error: expected `)' before 'MemoryReporter_XPConnectJSTjitDataAllocatorsReserve'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1488: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
This commit is contained in:
Landry Breuil 2011-05-05 17:13:59 -04:00
Родитель 145338b8cb
Коммит d3d5f4c3e2
1 изменённых файлов: 4 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
js/src/xpconnect/src/xpcjsruntime.cpp
Просмотреть файл

@ -1481,11 +1481,15 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSGCHeap));
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSStringData));
#ifdef JS_METHODJIT
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMjitCode));
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMjitData));
#endif
#ifdef JS_TRACER
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitCode));
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitDataAllocatorsMain));
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitDataAllocatorsReserve));
#endif
}
if(!JS_DHashTableInit(&mJSHolders, JS_DHashGetStubOps(), nsnull,