(mesos) branch master updated: [cgroups2] Fix a compilation error on CentOS 7 due to move operations.

[bmahler]

This is an automated email from the ASF dual-hosted git repository.

bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 1990f11da [cgroups2] Fix a compilation error on CentOS 7 due to move 
operations.
1990f11da is described below

commit 1990f11dacebc32930d31ec794897f019bc31723
Author: Benjamin Mahler <bmah...@apache.org>
AuthorDate: Tue Jun 11 01:28:38 2024 -0400

    [cgroups2] Fix a compilation error on CentOS 7 due to move operations.
---
 src/tests/mesos.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp
index 53f35be16..6c29e1b29 100644
--- a/src/tests/mesos.cpp
+++ b/src/tests/mesos.cpp
@@ -795,20 +795,17 @@ void 
ContainerizerTest<slave::MesosContainerizer>::SetUpCgroupsV2()
     ASSERT_SOME(cgroups2::create(TEST_CGROUPS_ROOT));
   }
 
-  Try<set<string>> _controllers = cgroups2::controllers::available(
+  Try<set<string>> controllers = cgroups2::controllers::available(
       cgroups2::ROOT_CGROUP);
-  ASSERT_SOME(_controllers);
-  subsystems = *_controllers;
-  set<string> controllers(
-      std::make_move_iterator(_controllers->begin()),
-      std::make_move_iterator(_controllers->end()));
+  ASSERT_SOME(controllers);
+  subsystems = *controllers;
 
   // Enable all of the controllers inside of the test root cgroup so they
   // are accessible from the child container cgroups.
   ASSERT_TRUE(cgroups2::exists(TEST_CGROUPS_ROOT));
   ASSERT_SOME(
-      cgroups2::controllers::enable(cgroups2::ROOT_CGROUP, controllers));
-  ASSERT_SOME(cgroups2::controllers::enable(TEST_CGROUPS_ROOT, controllers));
+      cgroups2::controllers::enable(cgroups2::ROOT_CGROUP, *controllers));
+  ASSERT_SOME(cgroups2::controllers::enable(TEST_CGROUPS_ROOT, *controllers));
 }