Merge pull request #2210 from rohit-n/nullptr
Core: Change NULLs to nullptrs.
This commit is contained in:
commit
7be1498a43
|
@ -51,7 +51,7 @@ void Init()
|
|||
s_perf_map_file.Open(filename, "w");
|
||||
// Disable buffering in order to avoid missing some mappings
|
||||
// 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#if !defined(_WIN32) && !defined(ANDROID)
|
||||
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;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -431,7 +431,7 @@ int main()
|
|||
// note: switch to recvmmsg (yes, mmsg) if this becomes
|
||||
// expensive
|
||||
rv = recvfrom(sock, &packet, sizeof(packet), 0, (sockaddr*) &raddr, &addrLen);
|
||||
if (gettimeofday(&tv, NULL) < 0)
|
||||
if (gettimeofday(&tv, nullptr) < 0)
|
||||
{
|
||||
perror("gettimeofday");
|
||||
exit(1);
|
||||
|
|
|
@ -179,7 +179,7 @@ void Jit64::Init()
|
|||
jo.optimizeGatherPipe = true;
|
||||
jo.accurateSinglePrecision = true;
|
||||
js.memcheck = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
|
||||
js.fastmemLoadStore = NULL;
|
||||
js.fastmemLoadStore = nullptr;
|
||||
js.compilerPC = 0;
|
||||
|
||||
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;
|
||||
const GekkoOPInfo *opinfo = ops[i].opinfo;
|
||||
js.downcountAmount += opinfo->numCycles;
|
||||
js.fastmemLoadStore = NULL;
|
||||
js.fastmemLoadStore = nullptr;
|
||||
js.fixupExceptionHandler = false;
|
||||
js.revertGprLoad = -1;
|
||||
js.revertFprLoad = -1;
|
||||
|
@ -803,7 +803,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
|
|||
SwitchToFarCode();
|
||||
if (!js.fastmemLoadStore)
|
||||
{
|
||||
exceptionHandlerAtLoc[js.fastmemLoadStore] = NULL;
|
||||
exceptionHandlerAtLoc[js.fastmemLoadStore] = nullptr;
|
||||
SetJumpTarget(js.fixupExceptionHandler ? js.exceptionHandler : memException);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -76,7 +76,7 @@ bool Jitx86Base::BackPatch(u32 emAddress, SContext* ctx)
|
|||
|
||||
BitSet32 registersInUse = it->second;
|
||||
|
||||
u8* exceptionHandler = NULL;
|
||||
u8* exceptionHandler = nullptr;
|
||||
if (jit->js.memcheck)
|
||||
{
|
||||
auto it2 = exceptionHandlerAtLoc.find(codePtr);
|
||||
|
|
Loading…
Reference in New Issue