summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-06-08 20:56:13 +1000
committerGitHub <noreply@github.com>2019-06-08 20:56:13 +1000
commitb13e00b0031efa596c7ddef8a4cd8dc2006ade59 (patch)
tree784429d452759122bb3f7fedb28e9aa0fca0f3c5 /Source/Core
parentab66e91766f66110e8c4f4d0ba7ddac969e21fe7 (diff)
parenteb15a52fd58613f4494acb6feae533156d3d6c7c (diff)
Merge pull request #8165 from lioncash/linkage
{Android/ButtonManager, ResourcePack/Manager}: Make file-scope variables/functions internally linked where applicable
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/UICommon/ResourcePack/Manager.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/UICommon/ResourcePack/Manager.cpp b/Source/Core/UICommon/ResourcePack/Manager.cpp
index 0d2327e56e..1be409f6e6 100644
--- a/Source/Core/UICommon/ResourcePack/Manager.cpp
+++ b/Source/Core/UICommon/ResourcePack/Manager.cpp
@@ -11,15 +11,13 @@
#include <algorithm>
+namespace ResourcePack
+{
namespace
{
-std::vector<ResourcePack::ResourcePack> packs;
-
+std::vector<ResourcePack> packs;
std::string packs_path;
-} // namespace
-namespace ResourcePack
-{
IniFile GetPackConfig()
{
packs_path = File::GetUserPath(D_RESOURCEPACK_IDX) + "/Packs.ini";
@@ -29,6 +27,7 @@ IniFile GetPackConfig()
return file;
}
+} // Anonymous namespace
bool Init()
{