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

Merge pull request #8696 from howard0su/cleanup_shadow 

Cleanup warnings of -Wmissing-declarations
This commit is contained in:
Léo Lam 2020-04-27 15:33:01 +02:00 committed by GitHub
parent bab04155b6 b6ff15c130
commit 9d44af4c31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
View File

@ -344,7 +344,7 @@ private:
const ControlState m_value{}; const ControlState m_value{};
}; };
ParseResult MakeLiteralExpression(Token token) static ParseResult MakeLiteralExpression(Token token)
{ {
ControlState val{}; ControlState val{};
if (TryParse(token.data, &val)) if (TryParse(token.data, &val))

4
Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
View File

@ -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. // 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; 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) if (!unique_id)
return nullptr; return nullptr;
@ -223,7 +223,7 @@ std::shared_ptr<evdevDevice> FindDeviceWithUniqueID(const char* unique_id)
return nullptr; 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. // 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. // So we open it and see if it works with evdev ioctls or not.

6
Source/Core/VideoBackends/Vulkan/ShaderCompiler.cpp
View File

@ -107,8 +107,10 @@ static const char SUBGROUP_HELPER_HEADER[] = R"(
#define SUBGROUP_MAX(value) value = subgroupMax(value) #define SUBGROUP_MAX(value) value = subgroupMax(value)
)"; )";
std::optional<SPIRVCodeVector> CompileShaderToSPV(EShLanguage stage, const char* stage_filename, static std::optional<SPIRVCodeVector> CompileShaderToSPV(EShLanguage stage,
std::string_view source, std::string_view header) const char* stage_filename,
std::string_view source,
std::string_view header)
{ {
if (!InitializeGlslang()) if (!InitializeGlslang())
return std::nullopt; return std::nullopt;