Fix some warnings/errors in android build

project64 · Aug 21, 2019 · c78260c · c78260c
1 parent 23770d8
commit c78260c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Source/Project64-core/MemoryExceptionFilter.cpp b/Source/Project64-core/MemoryExceptionFilter.cpp
@@ -377,7 +377,7 @@ bool CMipsMemoryVM::FilterX86Exception(uint32_t MemAddress, X86_CONTEXT & contex
 #endif
 
 #ifdef __arm__
-bool CMipsMemoryVM::DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context)
+void CMipsMemoryVM::DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context)
 {
     ArmThumbOpcode * OpCode = (ArmThumbOpcode *)context.arm_pc;
     Arm32Opcode * OpCode32 = (Arm32Opcode *)context.arm_pc;

diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h
@@ -185,7 +185,7 @@ class CMipsMemoryVM :
     static bool FilterX86Exception(uint32_t MemAddress, X86_CONTEXT & context);
 #endif
 #ifdef __arm__
-    static bool DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context);
+    static void DumpArmExceptionInfo(uint32_t MemAddress, mcontext_t & context);
     static bool FilterArmException(uint32_t MemAddress, mcontext_t & context);
 #endif
 

diff --git a/Source/Project64-core/N64System/N64DiskClass.cpp b/Source/Project64-core/N64System/N64DiskClass.cpp
@@ -478,10 +478,10 @@ bool CN64Disk::LoadDiskRAMImage()
     filename[filename.length() - 2] = 'a';
     filename[filename.length() - 3] = 'r';
 
-    WriteTrace(TraceN64System, TraceDebug, "Trying to open %s", filename);
+    WriteTrace(TraceN64System, TraceDebug, "Trying to open %s", filename.c_str());
     if (!ramfile.Open(filename.c_str(), CFileBase::modeRead))
     {
-        WriteTrace(TraceN64System, TraceError, "Failed to open %s", filename);
+        WriteTrace(TraceN64System, TraceError, "Failed to open %s", filename.c_str());
         return false;
     }
 
@@ -783,12 +783,12 @@ Country CN64Disk::GetDiskCountryCode()
     switch (*(uint32_t*)&GetDiskAddressSys()[0])
     {
         case DISK_COUNTRY_JPN:
-            return Country::Japan;
+            return Japan;
         case DISK_COUNTRY_USA:
-            return Country::USA;
+            return USA;
         case DISK_COUNTRY_DEV:
         default:
-            return Country::UnknownCountry;
+            return UnknownCountry;
     }
 }