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

Android: Silence some more warnings.

This commit is contained in:
Rohit Nirmal 2014-09-22 17:45:42 -04:00
parent 7f1185b941
commit 3168361e32
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/ArmCPUDetect.cpp
View File

@ -14,7 +14,7 @@
#if !defined(BLACKBERRY) && !defined(IOS) && !defined(__SYMBIAN32__)
const char procfile[] = "/proc/cpuinfo";
std::string GetCPUString()
static std::string GetCPUString()
{
const std::string marker = "Hardware\t: ";
std::string cpu_string = "Unknown";
@ -38,7 +38,7 @@ std::string GetCPUString()
return cpu_string;
}
unsigned char GetCPUImplementer()
static unsigned char GetCPUImplementer()
{
const std::string marker = "CPU implementer\t: ";
unsigned char implementer = 0;
@ -62,7 +62,7 @@ unsigned char GetCPUImplementer()
return implementer;
}
unsigned short GetCPUPart()
static unsigned short GetCPUPart()
{
const std::string marker = "CPU part\t: ";
unsigned short part = 0;
@ -86,7 +86,7 @@ unsigned short GetCPUPart()
return part;
}
bool CheckCPUFeature(const std::string& feature)
static bool CheckCPUFeature(const std::string& feature)
{
const std::string marker = "Features\t: ";
@ -115,7 +115,7 @@ bool CheckCPUFeature(const std::string& feature)
}
#endif
int GetCoreCount()
static int GetCoreCount()
{
#ifdef __SYMBIAN32__
return 1;

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

@ -28,7 +28,7 @@
#ifdef ANDROID
#define ASHMEM_DEVICE "/dev/ashmem"
int AshmemCreateFileMapping(const char *name, size_t size)
static int AshmemCreateFileMapping(const char *name, size_t size)
{
int fd, ret;
fd = open(ASHMEM_DEVICE, O_RDWR);

2
Source/Core/DolphinWX/Android/ButtonManager.cpp
View File

@ -58,7 +58,7 @@ namespace ButtonManager
TRIGGER_R
};
void AddBind(std::string dev, sBind *bind)
static void AddBind(std::string dev, sBind *bind)
{
auto it = m_controllers.find(dev);
if (it != m_controllers.end())