mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 02:13:23 +02:00
Merge pull request #1152 from lioncash/nullptr
Replace 0 literals with nullptr where applicable
This commit is contained in:
commit
5fdfd782cc
@ -150,7 +150,7 @@ void ProfilerWidget::setProfilingInfoUpdateEnabled(bool enable)
|
|||||||
|
|
||||||
class MicroProfileWidget : public QWidget {
|
class MicroProfileWidget : public QWidget {
|
||||||
public:
|
public:
|
||||||
MicroProfileWidget(QWidget* parent = 0);
|
MicroProfileWidget(QWidget* parent = nullptr);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void paintEvent(QPaintEvent* ev) override;
|
void paintEvent(QPaintEvent* ev) override;
|
||||||
|
@ -53,7 +53,7 @@ class MicroProfileDialog : public QWidget {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MicroProfileDialog(QWidget* parent = 0);
|
MicroProfileDialog(QWidget* parent = nullptr);
|
||||||
|
|
||||||
/// Returns a QAction that can be used to toggle visibility of this dialog.
|
/// Returns a QAction that can be used to toggle visibility of this dialog.
|
||||||
QAction* toggleViewAction();
|
QAction* toggleViewAction();
|
||||||
|
@ -575,10 +575,10 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class T, LinkedListItem<T>* (*TNew)(), void (*TFree)(LinkedListItem<T>*), void (*TDo)(PointerWrap&, T*)>
|
template<class T, LinkedListItem<T>* (*TNew)(), void (*TFree)(LinkedListItem<T>*), void (*TDo)(PointerWrap&, T*)>
|
||||||
void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end=0)
|
void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end = nullptr)
|
||||||
{
|
{
|
||||||
LinkedListItem<T>* list_cur = list_start;
|
LinkedListItem<T>* list_cur = list_start;
|
||||||
LinkedListItem<T>* prev = 0;
|
LinkedListItem<T>* prev = nullptr;
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
|
@ -28,9 +28,9 @@
|
|||||||
void* AllocateExecutableMemory(size_t size, bool low)
|
void* AllocateExecutableMemory(size_t size, bool low)
|
||||||
{
|
{
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
|
void* ptr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
|
||||||
#else
|
#else
|
||||||
static char *map_hint = 0;
|
static char* map_hint = nullptr;
|
||||||
#if defined(ARCHITECTURE_X64) && !defined(MAP_32BIT)
|
#if defined(ARCHITECTURE_X64) && !defined(MAP_32BIT)
|
||||||
// This OS has no flag to enforce allocation below the 4 GB boundary,
|
// This OS has no flag to enforce allocation below the 4 GB boundary,
|
||||||
// but if we hint that we want a low address it is very likely we will
|
// but if we hint that we want a low address it is very likely we will
|
||||||
@ -49,9 +49,6 @@ void* AllocateExecutableMemory(size_t size, bool low)
|
|||||||
, -1, 0);
|
, -1, 0);
|
||||||
#endif /* defined(_WIN32) */
|
#endif /* defined(_WIN32) */
|
||||||
|
|
||||||
// printf("Mapped executable memory at %p (size %ld)\n", ptr,
|
|
||||||
// (unsigned long)size);
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (ptr == nullptr)
|
if (ptr == nullptr)
|
||||||
{
|
{
|
||||||
@ -69,7 +66,6 @@ void* AllocateExecutableMemory(size_t size, bool low)
|
|||||||
{
|
{
|
||||||
map_hint += size;
|
map_hint += size;
|
||||||
map_hint = (char*)round_page(map_hint); /* round up to the next page */
|
map_hint = (char*)round_page(map_hint); /* round up to the next page */
|
||||||
// printf("Next map will (hopefully) be at %p\n", map_hint);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -85,18 +81,15 @@ void* AllocateExecutableMemory(size_t size, bool low)
|
|||||||
void* AllocateMemoryPages(size_t size)
|
void* AllocateMemoryPages(size_t size)
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
|
void* ptr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
|
||||||
#else
|
#else
|
||||||
void* ptr = mmap(0, size, PROT_READ | PROT_WRITE,
|
void* ptr = mmap(nullptr, size, PROT_READ | PROT_WRITE,
|
||||||
MAP_ANON | MAP_PRIVATE, -1, 0);
|
MAP_ANON | MAP_PRIVATE, -1, 0);
|
||||||
|
|
||||||
if (ptr == MAP_FAILED)
|
if (ptr == MAP_FAILED)
|
||||||
ptr = nullptr;
|
ptr = nullptr;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// printf("Mapped memory at %p (size %ld)\n", ptr,
|
|
||||||
// (unsigned long)size);
|
|
||||||
|
|
||||||
if (ptr == nullptr)
|
if (ptr == nullptr)
|
||||||
LOG_ERROR(Common_Memory, "Failed to allocate raw memory");
|
LOG_ERROR(Common_Memory, "Failed to allocate raw memory");
|
||||||
|
|
||||||
@ -117,9 +110,6 @@ void* AllocateAlignedMemory(size_t size,size_t alignment)
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// printf("Mapped memory at %p (size %ld)\n", ptr,
|
|
||||||
// (unsigned long)size);
|
|
||||||
|
|
||||||
if (ptr == nullptr)
|
if (ptr == nullptr)
|
||||||
LOG_ERROR(Common_Memory, "Failed to allocate aligned memory");
|
LOG_ERROR(Common_Memory, "Failed to allocate aligned memory");
|
||||||
|
|
||||||
@ -131,11 +121,8 @@ void FreeMemoryPages(void* ptr, size_t size)
|
|||||||
if (ptr)
|
if (ptr)
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
if (!VirtualFree(ptr, 0, MEM_RELEASE))
|
if (!VirtualFree(ptr, 0, MEM_RELEASE))
|
||||||
LOG_ERROR(Common_Memory, "FreeMemoryPages failed!\n%s", GetLastErrorMsg());
|
LOG_ERROR(Common_Memory, "FreeMemoryPages failed!\n%s", GetLastErrorMsg());
|
||||||
ptr = nullptr; // Is this our responsibility?
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
munmap(ptr, size);
|
munmap(ptr, size);
|
||||||
#endif
|
#endif
|
||||||
|
@ -207,7 +207,7 @@ void ScheduleEvent_Threadsafe(s64 cycles_into_future, int event_type, u64 userda
|
|||||||
Event* new_event = GetNewTsEvent();
|
Event* new_event = GetNewTsEvent();
|
||||||
new_event->time = GetTicks() + cycles_into_future;
|
new_event->time = GetTicks() + cycles_into_future;
|
||||||
new_event->type = event_type;
|
new_event->type = event_type;
|
||||||
new_event->next = 0;
|
new_event->next = nullptr;
|
||||||
new_event->userdata = userdata;
|
new_event->userdata = userdata;
|
||||||
if (!ts_first)
|
if (!ts_first)
|
||||||
ts_first = new_event;
|
ts_first = new_event;
|
||||||
|
Loading…
Reference in New Issue
Block a user