Browse Source

Merge pull request #705 from lioncash/string-ref

file_util: return string by const reference for GetExeDirectory()
nce_cpp
bunnei 8 years ago
committed by GitHub
parent
commit
4b6bc818bf
  1. 2
      src/common/file_util.cpp
  2. 2
      src/common/file_util.h

2
src/common/file_util.cpp

@ -592,7 +592,7 @@ std::string GetBundleDirectory() {
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
std::string& GetExeDirectory() {
const std::string& GetExeDirectory() {
static std::string exe_path; static std::string exe_path;
if (exe_path.empty()) { if (exe_path.empty()) {
wchar_t wchar_exe_path[2048]; wchar_t wchar_exe_path[2048];

2
src/common/file_util.h

@ -133,7 +133,7 @@ std::string GetBundleDirectory();
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
std::string& GetExeDirectory();
const std::string& GetExeDirectory();
std::string AppDataRoamingDirectory(); std::string AppDataRoamingDirectory();
#endif #endif

Loading…
Cancel
Save