Fix error function CreateView and ReleaseSpace for another platforms

hrydgard · Apr 5, 2024 · b8c983f · b8c983f
1 parent d42a939
commit b8c983f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Common/MemArena.h b/Common/MemArena.h
@@ -37,7 +37,7 @@ class MemArena {
 public:
 	static size_t roundup(size_t x);
 	bool GrabMemSpace(size_t size);
-	void ReleaseSpace() const;
+	void ReleaseSpace();
 	void *CreateView(s64 offset, size_t size, void *base = 0) const;
 	static void ReleaseView(s64 offset, void *view, size_t size);
 

diff --git a/Common/MemArenaAndroid.cpp b/Common/MemArenaAndroid.cpp
@@ -120,7 +120,7 @@ void MemArena::ReleaseSpace() {
 	close(fd);
 }
 
-void *MemArena::CreateView(s64 offset, size_t size, void *base) {
+void *MemArena::CreateView(s64 offset, size_t size, void *base) const {
 	void *retval = mmap(base, size, PROT_READ | PROT_WRITE, MAP_SHARED | ((base == 0) ? 0 : MAP_FIXED), fd, offset);
 	if (retval == MAP_FAILED) {
 		NOTICE_LOG(MEMMAP, "mmap on ashmem (fd: %d) failed", (int)fd);

diff --git a/Common/MemArenaDarwin.cpp b/Common/MemArenaDarwin.cpp
@@ -56,7 +56,7 @@ void MemArena::ReleaseSpace() {
 	vm_mem = 0;
 }
 
-void *MemArena::CreateView(s64 offset, size_t size, void *base) {
+void *MemArena::CreateView(s64 offset, size_t size, void *base) const {
 	mach_port_t self = mach_task_self();
 	vm_address_t target = (vm_address_t)base;
 	uint64_t mask = 0;

diff --git a/Common/MemArenaHorizon.cpp b/Common/MemArenaHorizon.cpp
@@ -45,7 +45,7 @@ void MemArena::ReleaseSpace() {
 	memorySrcBase = 0;
 }
 
-void *MemArena::CreateView(s64 offset, size_t size, void *base) {
+void *MemArena::CreateView(s64 offset, size_t size, void *base) const {
 	Result rc = svcMapProcessMemory(base, envGetOwnProcessHandle(), (u64)(memoryCodeBase + offset), size);
 	if (R_FAILED(rc)) {
 		printf("Fatal error creating the view... base: %p offset: %p size: %p src: %p err: %d\n",

diff --git a/Common/MemArenaPosix.cpp b/Common/MemArenaPosix.cpp
@@ -103,7 +103,7 @@ bool MemArena::GrabMemSpace(size_t size) {
 	return true;
 }
 
-void MemArena::ReleaseSpace() const {
+void MemArena::ReleaseSpace() {
 #ifndef NO_MMAP
 	close(fd);
 #endif

diff --git a/Common/MemArenaWin32.cpp b/Common/MemArenaWin32.cpp
@@ -43,7 +43,7 @@ void MemArena::ReleaseSpace() {
 	hMemoryMapping = 0;
 }
 
-void *MemArena::CreateView(s64 offset, size_t size, void *viewbase) {
+void *MemArena::CreateView(s64 offset, size_t size, void *viewbase) const {
 	size = roundup(size);
 #if PPSSPP_PLATFORM(UWP)
 	// We just grabbed some RAM before using RESERVE. This commits it.

diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h
@@ -364,7 +364,7 @@ class SavedataParam
 	void SetFileInfo(int idx, PSPFileInfo &info, const std::string &saveName, const std::string &saveDir = "");
 	void SetFileInfo(SaveFileInfo &saveInfo, PSPFileInfo &info, const std::string &saveName, const std::string &saveDir = "");
 	void ClearFileInfo(SaveFileInfo &saveInfo, const std::string &saveName);
-	static static PSPFileInfo GetSaveInfo(const std::string &saveDir);
+	static PSPFileInfo GetSaveInfo(const std::string &saveDir);
 
 	int LoadSaveData(SceUtilitySavedataParam *param, const std::string &saveDirName, const std::string& dirPath, bool secureMode);
 	static u32 LoadCryptedSave(SceUtilitySavedataParam *param, u8 *data, const u8 *saveData, int &saveSize, int prevCryptMode, const u8 *expectedHash, bool &saveDone);