aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-09-12 14:29:45 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-09-12 14:29:45 +0300
commit3fb35dc4bd8949880e5e6c6cb4825442c7d78b7b (patch)
tree8127dd4c240fd099675eff82ae4f24fc12bb6806
parent8604b4b98a5fc587129ab8155c546fc45efe62ff (diff)
Regenerate options parsing code
-rw-r--r--build2/b-options.cxx18
-rw-r--r--libbuild2/script/builtin-options.cxx12
2 files changed, 15 insertions, 15 deletions
diff --git a/build2/b-options.cxx b/build2/b-options.cxx
index 2bc65b3..373190a 100644
--- a/build2/b-options.cxx
+++ b/build2/b-options.cxx
@@ -570,11 +570,11 @@ namespace build2
}
};
- template <typename X>
- struct parser<std::set<X> >
+ template <typename X, typename C>
+ struct parser<std::set<X, C> >
{
static void
- parse (std::set<X>& c, bool& xs, scanner& s)
+ parse (std::set<X, C>& c, bool& xs, scanner& s)
{
X x;
bool dummy;
@@ -584,17 +584,17 @@ namespace build2
}
static void
- merge (std::set<X>& b, const std::set<X>& a)
+ merge (std::set<X, C>& b, const std::set<X, C>& a)
{
b.insert (a.begin (), a.end ());
}
};
- template <typename K, typename V>
- struct parser<std::map<K, V> >
+ template <typename K, typename V, typename C>
+ struct parser<std::map<K, V, C> >
{
static void
- parse (std::map<K, V>& m, bool& xs, scanner& s)
+ parse (std::map<K, V, C>& m, bool& xs, scanner& s)
{
const char* o (s.next ());
@@ -639,9 +639,9 @@ namespace build2
}
static void
- merge (std::map<K, V>& b, const std::map<K, V>& a)
+ merge (std::map<K, V, C>& b, const std::map<K, V, C>& a)
{
- for (typename std::map<K, V>::const_iterator i (a.begin ());
+ for (typename std::map<K, V, C>::const_iterator i (a.begin ());
i != a.end ();
++i)
b[i->first] = i->second;
diff --git a/libbuild2/script/builtin-options.cxx b/libbuild2/script/builtin-options.cxx
index bedbe64..abf325f 100644
--- a/libbuild2/script/builtin-options.cxx
+++ b/libbuild2/script/builtin-options.cxx
@@ -275,11 +275,11 @@ namespace build2
}
};
- template <typename X>
- struct parser<std::set<X> >
+ template <typename X, typename C>
+ struct parser<std::set<X, C> >
{
static void
- parse (std::set<X>& c, bool& xs, scanner& s)
+ parse (std::set<X, C>& c, bool& xs, scanner& s)
{
X x;
bool dummy;
@@ -289,11 +289,11 @@ namespace build2
}
};
- template <typename K, typename V>
- struct parser<std::map<K, V> >
+ template <typename K, typename V, typename C>
+ struct parser<std::map<K, V, C> >
{
static void
- parse (std::map<K, V>& m, bool& xs, scanner& s)
+ parse (std::map<K, V, C>& m, bool& xs, scanner& s)
{
const char* o (s.next ());