diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-05-11 20:34:39 +0200 |
|---|---|---|
| committer | Léo Lam <leo@innovatetechnologi.es> | 2018-05-12 14:30:18 +0200 |
| commit | 7dca7c237eb9ae40765e581317df6df4b4fc1ad4 (patch) | |
| tree | 05b455cac6424a82939198cbc423bcb837c78bd2 /Source/Core/DolphinWX/VideoConfigDiag.cpp | |
| parent | f0c5b761865946f273b6b6937aa47f8b10c745a5 (diff) | |
Config: Fix template deduction for implicit conversions
This excludes the second argument from template deduction.
Otherwise, it is required to manually cast the second argument to
the ConfigInfo type (because implicit conversions won't work).
e.g. to set the value for a ConfigInfo<std::string> from a string
literal, you'd need a ugly `std::string("yourstring")`.
Diffstat (limited to 'Source/Core/DolphinWX/VideoConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/VideoConfigDiag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 8947ab0aa8..c29ce83e1b 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -1233,11 +1233,11 @@ void VideoConfigDiag::PopulatePostProcessingShaders() if (vconfig.stereo_mode == StereoMode::Anaglyph) { - Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("dubois")); + Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, "dubois"); choice_ppshader->SetStringSelection(StrToWxStr(vconfig.sPostProcessingShader)); } else - Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("")); + Config::SetBaseOrCurrent(Config::GFX_ENHANCE_POST_SHADER, ""); } // Should the configuration button be loaded by default? |