summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/MainAndroid.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-09-22 16:20:53 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2014-09-22 16:20:53 -0500
commit7f1185b941b540d9c6e641c39e50057fb2ad01da (patch)
tree89028f1191d889d366a72cb10c87fd6fea49c06c /Source/Core/DolphinWX/MainAndroid.cpp
parentd4952c7637b5e0f820eb2278df9b89c0fb22d819 (diff)
parentdc79755303b4ea7334322d77426378096d02667d (diff)
Merge pull request #1140 from lioncash/android
Android: Silence a few warnings
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
-rw-r--r--Source/Core/DolphinWX/MainAndroid.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index 0f2c5eddce..99c77c2017 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -133,7 +133,7 @@ static inline u32 GetPixel(u32 *buffer, unsigned int x, unsigned int y) {
return buffer[y * 192 + x];
}
-bool LoadBanner(std::string filename, u32 *Banner)
+static bool LoadBanner(std::string filename, u32 *Banner)
{
DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
@@ -188,7 +188,8 @@ bool LoadBanner(std::string filename, u32 *Banner)
return false;
}
-std::string GetName(std::string filename)
+
+static std::string GetName(std::string filename)
{
if (!m_names.empty())
return m_names[0];
@@ -202,7 +203,7 @@ std::string GetName(std::string filename)
return name;
}
-std::string GetJString(JNIEnv *env, jstring jstr)
+static std::string GetJString(JNIEnv *env, jstring jstr)
{
std::string result = "";
if (!jstr)