From e1c66b9704ca9557031f865cc194a96bcb85a030 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 30 May 2023 11:42:18 +0200 Subject: Fix previous commits to work in C++14 --- libbuild2/adhoc-rule-buildscript.cxx | 4 ++-- libbuild2/build/script/parser.cxx | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libbuild2/adhoc-rule-buildscript.cxx b/libbuild2/adhoc-rule-buildscript.cxx index 29b11ee..5f8a6b9 100644 --- a/libbuild2/adhoc-rule-buildscript.cxx +++ b/libbuild2/adhoc-rule-buildscript.cxx @@ -628,8 +628,8 @@ namespace build2 p + 1 == l->size ()) // Empty path. break; - r.first.emplace_back (string (*l, 0, p), - path (*l, p + 1, string::npos)); + r.first.push_back ( + dynamic_target {string (*l, 0, p), path (*l, p + 1, string::npos)}); } break; diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx index 7e2feb9..d449f4b 100644 --- a/libbuild2/build/script/parser.cxx +++ b/libbuild2/build/script/parser.cxx @@ -2736,7 +2736,8 @@ namespace build2 string t (*l, 0, p); l->erase (0, p + 1); - dyn_targets.emplace_back (move (t), path (move (*l))); + dyn_targets.push_back ( + dynamic_target {move (t), path (move (*l))}); } } @@ -2949,7 +2950,8 @@ namespace build2 // Note: type is resolved later. // - dyn_targets.emplace_back (string (), move (f)); + dyn_targets.push_back ( + dynamic_target {string (), move (f)}); } continue; @@ -3059,7 +3061,8 @@ namespace build2 // Note: type is resolved later. // - dyn_targets.emplace_back (string (), move (f)); + dyn_targets.push_back ( + dynamic_target {string (), move (f)}); } else { -- cgit v1.1