aboutsummaryrefslogtreecommitdiff
path: root/bdep/config.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-08-03 20:31:37 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-08-05 11:29:51 +0300
commiteb02d377f4f10e23cc6673e9e8f048b4ecbc8492 (patch)
tree3e93aa4cb405ff9207dc714c29b6321f9f9d31fa /bdep/config.cxx
parent562fee6a0ce42f6dd2d6acbc7d88dc9b00f50d0e (diff)
Make find_configurations() to preserve configurations order on command line
Diffstat (limited to 'bdep/config.cxx')
-rw-r--r--bdep/config.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/bdep/config.cxx b/bdep/config.cxx
index f16d8b0..c8954b3 100644
--- a/bdep/config.cxx
+++ b/bdep/config.cxx
@@ -79,7 +79,7 @@ namespace bdep
if (n > 1)
fail << "multiple configuration names specified for " << what;
- name = o.config_name ()[0];
+ name = o.config_name ()[0].first;
}
if (size_t n = o.config_id ().size ())
@@ -87,7 +87,7 @@ namespace bdep
if (n > 1)
fail << "multiple configuration ids specified for " << what;
- id = o.config_id ()[0];
+ id = o.config_id ()[0].first;
}
}
@@ -673,13 +673,13 @@ namespace bdep
}
else
{
- strings& ns (o.config_name ());
+ vector<pair<string, size_t>>& ns (o.config_name ());
size_t n (ns.size ());
if (n > 1 || (n == 1 && (o.config_specified () ||
o.config_id_specified ())))
{
- name = move (ns.back ());
+ name = move (ns.back ().first);
ns.pop_back ();
}
else