diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-03-15 00:57:56 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-03-15 00:57:56 +0100 |
| commit | 8d679e76d299956a1521bc14502466be8d8b2df8 (patch) | |
| tree | 97db9ad6a45a8e5d711d7763199579e400a65bc8 /Source/Core/VideoBackends/OGL/main.cpp | |
| parent | 12c2e345a35a571aadc842e30c38b3b4d8f70dce (diff) | |
| parent | a82675b7d581421fa80d5d5c53253cf1d5c1a26d (diff) | |
Merge pull request #164 from lioncash/cstr-cull
Kill off some usages of c_str.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index d902485bb8..3821225031 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -123,7 +123,7 @@ void GetShaders(std::vector<std::string> &shaders) File::ScanDirectoryTree(directory, entry); for (auto& file : entry.children) { - std::string name = file.virtualName.c_str(); + std::string name = file.virtualName; if (name.size() < 5) continue; if (strcasecmp(name.substr(name.size() - 5).c_str(), ".glsl")) @@ -176,7 +176,7 @@ bool VideoBackend::Initialize(void *&window_handle) frameCount = 0; - g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str()); + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini"); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); |