aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-10-08 19:25:38 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-10-08 19:25:38 +0300
commite2955b064d13a7e2bb8107c810e1d5f74282f0a0 (patch)
tree1941e8053a2ba2131f2bd3b2b55d741f18071944
parent539d23829e2857c480882bc9a1168c0007feaf67 (diff)
Fix worker crash
-rw-r--r--bbot/worker/worker.cxx36
1 files changed, 8 insertions, 28 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 957c74c..8fda4c8 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -1925,13 +1925,8 @@ build (size_t argc, const char* argv[])
common_args.push_back ("--checkout-root");
common_args.push_back (dist_root.string ());
- common_args.insert (pkg_args.end (),
- make_move_iterator (eas.begin ()),
- make_move_iterator (eas.end ()));
-
- common_args.insert (pkg_args.end (),
- make_move_iterator (cas.begin ()),
- make_move_iterator (cas.end ()));
+ common_args.insert (common_args.end (), eas.begin (), eas.end ());
+ common_args.insert (common_args.end (), cas.begin (), cas.end ());
pkg_args.push_back (pkg_rev);
@@ -2007,13 +2002,8 @@ build (size_t argc, const char* argv[])
if (bootstrap_import)
pkg_args.push_back (*bootstrap_import);
- pkg_args.insert (pkg_args.end (),
- make_move_iterator (eas.begin ()),
- make_move_iterator (eas.end ()));
-
- pkg_args.insert (pkg_args.end (),
- make_move_iterator (cas.begin ()),
- make_move_iterator (cas.end ()));
+ pkg_args.insert (pkg_args.end (), eas.begin (), eas.end ());
+ pkg_args.insert (pkg_args.end (), cas.begin (), cas.end ());
pkg_args.push_back ("}+");
@@ -2057,13 +2047,8 @@ build (size_t argc, const char* argv[])
pkg_args.push_back ("--checkout-root");
pkg_args.push_back (dist_install_root.string ());
- pkg_args.insert (pkg_args.end (),
- make_move_iterator (eas.begin ()),
- make_move_iterator (eas.end ()));
-
- pkg_args.insert (pkg_args.end (),
- make_move_iterator (cas.begin ()),
- make_move_iterator (cas.end ()));
+ pkg_args.insert (pkg_args.end (), eas.begin (), eas.end ());
+ pkg_args.insert (pkg_args.end (), cas.begin (), cas.end ());
pkg_args.push_back ("}+");
@@ -2092,13 +2077,8 @@ build (size_t argc, const char* argv[])
if (bootstrap_import)
pkg_args.push_back (*bootstrap_import);
- pkg_args.insert (pkg_args.end (),
- make_move_iterator (eas.begin ()),
- make_move_iterator (eas.end ()));
-
- pkg_args.insert (pkg_args.end (),
- make_move_iterator (cas.begin ()),
- make_move_iterator (cas.end ()));
+ pkg_args.insert (pkg_args.end (), eas.begin (), eas.end ());
+ pkg_args.insert (pkg_args.end (), cas.begin (), cas.end ());
pkg_args.push_back ("}+");