PublicArchive/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2026-05-06 07:56:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement replace_if condition lambda

Browse Source 
Fix include typo and CS
This commit is contained in:
Tom Lankhorst
2019-03-02 14:50:15 +01:00
committed by Ted John
parent 744f2225ed
commit ed353faccf
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/openrct2/platform/Shared.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ std::string platform_sanitise_filename(const std::string& path)
std::replace_if(
sanitised.begin(), sanitised.end(),
[&prohibited](const std::string::value_type& ch) {
[&prohibited](const std::string::value_type& ch) -> bool {
return std::find(prohibited.begin(), prohibited.end(), ch) != prohibited.end();
},
'_');
src/openrct2/platform/Windows.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
# include "../OpenRCT2.h"
# include "../Version.h"
# include "../config/Config.h"
# include "../core/String.h"
# include "../core/String.hpp"
# include "../localisation/Date.h"
# include "../localisation/Language.h"
# include "../rct2/RCT2.h"
@@ -264,7 +264,7 @@ std::string platform_sanitise_filename(const std::string& path)
std::replace_if(
sanitised.begin(), sanitised.end(),
[](const std::string::value_type& ch) {
[&prohibited](const std::string::value_type& ch) -> bool {
return std::find(prohibited.begin(), prohibited.end(), ch) != prohibited.end();
},
'_');
test/tests/Platform.cpp
+1 -3
View File
@@ -7,9 +7,8 @@
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#include <openrct2/platform/platform.h>
#include <gtest/gtest.h>
#include <openrct2/platform/platform.h>
TEST(platform, sanitise_filename)
{
@@ -27,4 +26,3 @@ TEST(platform, sanitise_filename)
ASSERT_EQ("non trimmed", platform_sanitise_filename(" non trimmed "));
#endif
}