From ed353faccfb805386f9f0bfc81dc36c96a85c3c4 Mon Sep 17 00:00:00 2001
From: Tom Lankhorst <hello@tomlankhorst.nl>
Date: Sat, 2 Mar 2019 14:50:15 +0100
Subject: [PATCH] Implement replace_if condition lambda Fix include typo and CS

---
 src/openrct2/platform/Shared.cpp  | 2 +-
 src/openrct2/platform/Windows.cpp | 4 ++--
 test/tests/Platform.cpp           | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/platform/Shared.cpp b/src/openrct2/platform/Shared.cpp
index 050cb2ac13..4c099b39d9 100644
--- a/src/openrct2/platform/Shared.cpp
+++ b/src/openrct2/platform/Shared.cpp
@@ -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();
         },
         '_');
diff --git a/src/openrct2/platform/Windows.cpp b/src/openrct2/platform/Windows.cpp
index 9ebc13ffc9..2dda11b53e 100644
--- a/src/openrct2/platform/Windows.cpp
+++ b/src/openrct2/platform/Windows.cpp
@@ -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();
         },
         '_');
diff --git a/test/tests/Platform.cpp b/test/tests/Platform.cpp
index d8e345c052..dccea3aad0 100644
--- a/test/tests/Platform.cpp
+++ b/test/tests/Platform.cpp
@@ -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
 }
-