Merge pull request #8696 from howard0su/cleanup_shadow

Cleanup warnings of -Wmissing-declarations
dolphin-emu · Apr 27, 2020 · 9d44af4 · 9d44af4
2 parents bab0415 + b6ff15c
commit 9d44af4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
@@ -344,7 +344,7 @@ class LiteralReal : public LiteralExpression
   const ControlState m_value{};
 };
 
-ParseResult MakeLiteralExpression(Token token)
+static ParseResult MakeLiteralExpression(Token token)
 {
   ControlState val{};
   if (TryParse(token.data, &val))

diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
@@ -204,7 +204,7 @@ static int s_wakeup_eventfd;
 // sysfs is not stable, so this is probably the easiest way to get a name for a node.
 static std::map<std::string, std::weak_ptr<evdevDevice>> s_devnode_objects;
 
-std::shared_ptr<evdevDevice> FindDeviceWithUniqueID(const char* unique_id)
+static std::shared_ptr<evdevDevice> FindDeviceWithUniqueID(const char* unique_id)
 {
   if (!unique_id)
     return nullptr;
@@ -223,7 +223,7 @@ std::shared_ptr<evdevDevice> FindDeviceWithUniqueID(const char* unique_id)
   return nullptr;
 }
 
-void AddDeviceNode(const char* devnode)
+static void AddDeviceNode(const char* devnode)
 {
   // Unfortunately udev gives us no way to filter out the non event device interfaces.
   // So we open it and see if it works with evdev ioctls or not.

diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp b/Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp
@@ -107,8 +107,10 @@ static const char SUBGROUP_HELPER_HEADER[] = R"(
   #define SUBGROUP_MAX(value) value = subgroupMax(value)
 )";
 
-std::optional<SPIRVCodeVector> CompileShaderToSPV(EShLanguage stage, const char* stage_filename,
-                                                  std::string_view source, std::string_view header)
+static std::optional<SPIRVCodeVector> CompileShaderToSPV(EShLanguage stage,
+                                                         const char* stage_filename,
+                                                         std::string_view source,
+                                                         std::string_view header)
 {
   if (!InitializeGlslang())
     return std::nullopt;