ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2210 from rohit-n/nullptr 

Core: Change NULLs to nullptrs.
This commit is contained in:
Lioncash 2015-03-15 04:42:19 -04:00
parent 2134770d7a 48ec42d4a0
commit 7be1498a43
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/JitRegister.cpp
View File

@ -51,7 +51,7 @@ void Init()
s_perf_map_file.Open(filename, "w"); s_perf_map_file.Open(filename, "w");
// Disable buffering in order to avoid missing some mappings // Disable buffering in order to avoid missing some mappings
// if the event of a crash: // if the event of a crash:
std::setvbuf(s_perf_map_file.GetHandle(), NULL, _IONBF, 0); std::setvbuf(s_perf_map_file.GetHandle(), nullptr, _IONBF, 0);
} }
} }

2
Source/Core/Common/StringUtil.cpp
View File

@ -29,7 +29,7 @@
#if !defined(_WIN32) && !defined(ANDROID) #if !defined(_WIN32) && !defined(ANDROID)
static locale_t GetCLocale() static locale_t GetCLocale()
{ {
static locale_t c_locale = newlocale(LC_ALL_MASK, "C", NULL); static locale_t c_locale = newlocale(LC_ALL_MASK, "C", nullptr);
return c_locale; return c_locale;
} }
#endif #endif

2
Source/Core/Common/TraversalServer.cpp
View File

@ -431,7 +431,7 @@ int main()
// note: switch to recvmmsg (yes, mmsg) if this becomes // note: switch to recvmmsg (yes, mmsg) if this becomes
// expensive // expensive
rv = recvfrom(sock, &packet, sizeof(packet), 0, (sockaddr*) &raddr, &addrLen); rv = recvfrom(sock, &packet, sizeof(packet), 0, (sockaddr*) &raddr, &addrLen);
if (gettimeofday(&tv, NULL) < 0) if (gettimeofday(&tv, nullptr) < 0)
{ {
perror("gettimeofday"); perror("gettimeofday");
exit(1); exit(1);

6
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -179,7 +179,7 @@ void Jit64::Init()
jo.optimizeGatherPipe = true; jo.optimizeGatherPipe = true;
jo.accurateSinglePrecision = true; jo.accurateSinglePrecision = true;
js.memcheck = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU; js.memcheck = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
js.fastmemLoadStore = NULL; js.fastmemLoadStore = nullptr;
js.compilerPC = 0; js.compilerPC = 0;
gpr.SetEmitter(this); gpr.SetEmitter(this);
@ -642,7 +642,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.instructionsLeft = (code_block.m_num_instructions - 1) - i; js.instructionsLeft = (code_block.m_num_instructions - 1) - i;
const GekkoOPInfo *opinfo = ops[i].opinfo; const GekkoOPInfo *opinfo = ops[i].opinfo;
js.downcountAmount += opinfo->numCycles; js.downcountAmount += opinfo->numCycles;
js.fastmemLoadStore = NULL; js.fastmemLoadStore = nullptr;
js.fixupExceptionHandler = false; js.fixupExceptionHandler = false;
js.revertGprLoad = -1; js.revertGprLoad = -1;
js.revertFprLoad = -1; js.revertFprLoad = -1;
@ -803,7 +803,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
SwitchToFarCode(); SwitchToFarCode();
if (!js.fastmemLoadStore) if (!js.fastmemLoadStore)
{ {
exceptionHandlerAtLoc[js.fastmemLoadStore] = NULL; exceptionHandlerAtLoc[js.fastmemLoadStore] = nullptr;
SetJumpTarget(js.fixupExceptionHandler ? js.exceptionHandler : memException); SetJumpTarget(js.fixupExceptionHandler ? js.exceptionHandler : memException);
} }
else else

2
Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
View File

@ -76,7 +76,7 @@ bool Jitx86Base::BackPatch(u32 emAddress, SContext* ctx)
BitSet32 registersInUse = it->second; BitSet32 registersInUse = it->second;
u8* exceptionHandler = NULL; u8* exceptionHandler = nullptr;
if (jit->js.memcheck) if (jit->js.memcheck)
{ {
auto it2 = exceptionHandlerAtLoc.find(codePtr); auto it2 = exceptionHandlerAtLoc.find(codePtr);