From e2a39f2a8bffcdc2197c5c37b9414ac04f34b1e4 Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Sat, 13 Jul 2024 03:26:32 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20gucc:=20use=20std=20ranges=20fro?=
 =?UTF-8?q?m=20C++23=20in=20umount?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gucc/src/umount_partitions.cpp | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/gucc/src/umount_partitions.cpp b/gucc/src/umount_partitions.cpp
index cdc973f..f327c4d 100644
--- a/gucc/src/umount_partitions.cpp
+++ b/gucc/src/umount_partitions.cpp
@@ -2,26 +2,9 @@
 #include "gucc/file_utils.hpp"
 #include "gucc/io_utils.hpp"
 #include "gucc/mtab.hpp"
-#include "gucc/string_utils.hpp"
 
 #include <algorithm>  // for sort
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuseless-cast"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-
-#include <range/v3/algorithm/sort.hpp>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+#include <ranges>     // for ranges::*
 
 #include <fmt/compile.h>
 #include <fmt/format.h>
@@ -38,7 +21,7 @@ auto umount_partitions(std::string_view root_mountpoint, const std::vector<std::
         spdlog::error("Failed to umount partitions: failed to parse /etc/mtab");
         return false;
     }
-    ranges::sort(*mtab_entries, {}, &mtab::MTabEntry::mountpoint);
+    std::ranges::sort(*mtab_entries, {}, &mtab::MTabEntry::mountpoint);
 
     spdlog::debug("Got {} entries from mountpoint {}", mtab_entries->size(), root_mountpoint);
     for (auto&& mtab_entry : std::move(*mtab_entries)) {