From a2a1e04fc9c26c7d4ae8af5d1229a906c0ae066d Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 8 Jul 2019 13:35:53 +0200 Subject: StringUtil: Use std::string_view more --- Source/Core/VideoCommon/PostProcessing.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoCommon/PostProcessing.cpp') diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp index 77f77cb9ce..859715542b 100644 --- a/Source/Core/VideoCommon/PostProcessing.cpp +++ b/Source/Core/VideoCommon/PostProcessing.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "Common/Assert.h" #include "Common/CommonPaths.h" @@ -117,16 +118,15 @@ void PostProcessingConfiguration::LoadOptions(const std::string& code) GLSLStringOption* current_strings = nullptr; while (!in.eof()) { - std::string line; - - if (std::getline(in, line)) + std::string line_str; + if (std::getline(in, line_str)) { + std::string_view line = line_str; + #ifndef _WIN32 // Check for CRLF eol and convert it to LF if (!line.empty() && line.at(line.size() - 1) == '\r') - { - line.erase(line.size() - 1); - } + line.remove_suffix(1); #endif if (!line.empty()) @@ -138,8 +138,8 @@ void PostProcessingConfiguration::LoadOptions(const std::string& code) if (endpos != std::string::npos) { // New section! - std::string sub = line.substr(1, endpos - 1); - option_strings.push_back({sub}); + std::string_view sub = line.substr(1, endpos - 1); + option_strings.push_back({std::string(sub)}); current_strings = &option_strings.back(); } } -- cgit v1.2.3