Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Don't enable JITs when they can interfere with profiling.

Browse Source 
Fix dangerous trailing slashes.

This was SVN commit r9103.
This commit is contained in:
Ykkrosh 2011-03-23 00:36:34 +00:00
parent e825a98671
commit 575e3b0a69
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/graphics/MapReader.cpp
View File

@ -1203,7 +1203,7 @@ int CMapReader::ParseEnvironment()
#define GET_ENVIRONMENT_PROPERTY(val, prop, out)\ #define GET_ENVIRONMENT_PROPERTY(val, prop, out)\
if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\ if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
LOGWARNING(L"CMapReader::ParseEnvironment() failed to get '%hs' property", #prop);\ LOGWARNING(L"CMapReader::ParseEnvironment() failed to get '%hs' property", #prop);
CScriptValRooted envObj; CScriptValRooted envObj;
GET_ENVIRONMENT_PROPERTY(m_MapData.get(), Environment, envObj) GET_ENVIRONMENT_PROPERTY(m_MapData.get(), Environment, envObj)
@ -1281,7 +1281,7 @@ int CMapReader::ParseCamera()
#define GET_CAMERA_PROPERTY(val, prop, out)\ #define GET_CAMERA_PROPERTY(val, prop, out)\
if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\ if (!pSimulation2->GetScriptInterface().GetProperty(val, #prop, out))\
LOGWARNING(L"CMapReader::ParseCamera() failed to get '%hs' property", #prop);\ LOGWARNING(L"CMapReader::ParseCamera() failed to get '%hs' property", #prop);
CScriptValRooted cameraObj; CScriptValRooted cameraObj;
GET_CAMERA_PROPERTY(m_MapData.get(), Camera, cameraObj) GET_CAMERA_PROPERTY(m_MapData.get(), Camera, cameraObj)

2
source/scriptinterface/ScriptInterface.cpp
View File

@ -434,11 +434,11 @@ ScriptInterface_impl::ScriptInterface_impl(const char* nativeScopeName, const sh
// hooks are incompatible with the JIT) // hooks are incompatible with the JIT)
#if !ENABLE_SCRIPT_PROFILING #if !ENABLE_SCRIPT_PROFILING
options |= JSOPTION_METHODJIT; options |= JSOPTION_METHODJIT;
#endif
// Some other JIT flags to experiment with: // Some other JIT flags to experiment with:
options |= JSOPTION_JIT; options |= JSOPTION_JIT;
options |= JSOPTION_PROFILING; options |= JSOPTION_PROFILING;
#endif
JS_SetOptions(m_cx, options); JS_SetOptions(m_cx, options);