summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-07-19 08:47:06 -0700
committerGravatar GitHub2018-07-19 08:47:06 -0700
commit04f7a7036af107158195c8f8ea5e1ce58941141a (patch)
tree36fd7b4e013e1cc9d225ae2dfa9604eb7ef90618 /src
parentMerge pull request #704 from lioncash/string (diff)
parentfile_util: return string by const reference for GetExeDirectory() (diff)
downloadyuzu-04f7a7036af107158195c8f8ea5e1ce58941141a.tar.gz
yuzu-04f7a7036af107158195c8f8ea5e1ce58941141a.tar.xz
yuzu-04f7a7036af107158195c8f8ea5e1ce58941141a.zip
Merge pull request #705 from lioncash/string-ref
file_util: return string by const reference for GetExeDirectory()
Diffstat (limited to 'src')
-rw-r--r--src/common/file_util.cpp2
-rw-r--r--src/common/file_util.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index bf955386c..c882ab39f 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -592,7 +592,7 @@ std::string GetBundleDirectory() {
592#endif 592#endif
593 593
594#ifdef _WIN32 594#ifdef _WIN32
595std::string& GetExeDirectory() { 595const std::string& GetExeDirectory() {
596 static std::string exe_path; 596 static std::string exe_path;
597 if (exe_path.empty()) { 597 if (exe_path.empty()) {
598 wchar_t wchar_exe_path[2048]; 598 wchar_t wchar_exe_path[2048];
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 026c84d94..1f38b1560 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -133,7 +133,7 @@ std::string GetBundleDirectory();
133#endif 133#endif
134 134
135#ifdef _WIN32 135#ifdef _WIN32
136std::string& GetExeDirectory(); 136const std::string& GetExeDirectory();
137std::string AppDataRoamingDirectory(); 137std::string AppDataRoamingDirectory();
138#endif 138#endif
139 139