From 32fb105bca23efd7d93d98c6ddc416034d8f8e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Wed, 9 Aug 2023 19:52:44 +0200 Subject: [PATCH] Replaced boost::algorithm::join with standard algorithms Changes based on https://github.com/osiox/colobot/commit/f0f6f61cabbc9269c83d74974bb24c2933b4bde4 --- src/app/modman.cpp | 5 ++++- src/app/pausemanager.cpp | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/modman.cpp b/src/app/modman.cpp index 0a6f601f..4498011b 100644 --- a/src/app/modman.cpp +++ b/src/app/modman.cpp @@ -279,7 +279,10 @@ void CModManager::LoadModData(Mod& mod) auto major = StrUtils::ToString(line->GetParam("major")->AsInt()); auto minor = StrUtils::ToString(line->GetParam("minor")->AsInt()); auto patch = StrUtils::ToString(line->GetParam("patch")->AsInt()); - data.version = boost::algorithm::join(std::vector{ major, minor, patch }, "."); + + std::ostringstream stream; + stream << major << "." << minor << "." << patch; + data.version = stream.str(); } } diff --git a/src/app/pausemanager.cpp b/src/app/pausemanager.cpp index 18d7e52a..8d6a26a9 100644 --- a/src/app/pausemanager.cpp +++ b/src/app/pausemanager.cpp @@ -26,7 +26,7 @@ #include "level/robotmain.h" #include -#include +#include struct ActivePause { @@ -45,13 +45,19 @@ struct ActivePause static std::string GetPauseName(PauseType type) { std::vector x; + if ((type & PAUSE_ENGINE) != 0) x.push_back("engine"); if ((type & PAUSE_HIDE_SHORTCUTS) != 0) x.push_back("hide_shortcuts"); if ((type & PAUSE_PHOTO) != 0) x.push_back("photo"); if ((type & PAUSE_OBJECT_UPDATES) != 0) x.push_back("object_updates"); if ((type & PAUSE_MUTE_SOUND) != 0) x.push_back("mute_sound"); if ((type & PAUSE_CAMERA) != 0) x.push_back("camera"); - return boost::algorithm::join(x, "|"); + + return std::accumulate(x.cbegin(), x.cend(), std::string(), + [](auto& acc, auto& value) + { + return acc.empty() ? value : acc + "|" + value; + }); } CPauseManager::CPauseManager()