diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-06-05 22:12:09 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-06-08 16:05:05 +0300 |
| commit | 11047ff67adb53ccd72bb9ef06dc8bae9e52e4b3 (patch) | |
| tree | a0f207b150f2094eb88aaa0cd50d1f575ef652d7 | |
| parent | b601cf3e41b17d66c412dac7be9e361d65898c7b (diff) | |
Various minor fixes
| -rw-r--r-- | libbuild2/rule.cxx | 4 | ||||
| -rw-r--r-- | libbuild2/script/script.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libbuild2/rule.cxx b/libbuild2/rule.cxx index f534ff9..ea7186c 100644 --- a/libbuild2/rule.cxx +++ b/libbuild2/rule.cxx @@ -841,8 +841,8 @@ namespace build2 string s; try { - s = convert<string> (names (move_iterator (ns.begin () + 1), - move_iterator (ns.end ()))); + s = convert<string> (names (make_move_iterator (ns.begin () + 1), + make_move_iterator (ns.end ()))); } catch (const invalid_argument& e) { diff --git a/libbuild2/script/script.cxx b/libbuild2/script/script.cxx index eb63e53..c9b3a5e 100644 --- a/libbuild2/script/script.cxx +++ b/libbuild2/script/script.cxx @@ -163,7 +163,7 @@ namespace build2 // if (t.type == token_type::word && qtok != '\'' && - prev_tt != token_type::dollar) + (!prev_tt || *prev_tt != token_type::dollar)) { for (char c: t.value) { |