aboutsummaryrefslogtreecommitdiff
path: root/bdep/new-parsers.hxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-08-12 14:56:03 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-08-13 16:52:16 +0300
commitedab35e216bc3839915129e54f98160428634283 (patch)
tree51c1ae471e39aca817038f16d33cc25be4998369 /bdep/new-parsers.hxx
parent54c937f78562fc6a5d2ea01c8747c62ccea980cb (diff)
Add support for default options files
Diffstat (limited to 'bdep/new-parsers.hxx')
-rw-r--r--bdep/new-parsers.hxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/bdep/new-parsers.hxx b/bdep/new-parsers.hxx
index 0bc6d56..b2a2b99 100644
--- a/bdep/new-parsers.hxx
+++ b/bdep/new-parsers.hxx
@@ -27,6 +27,9 @@ namespace bdep
{
static void
parse (cmd_new_type&, bool&, scanner&);
+
+ static void
+ merge (cmd_new_type&, const cmd_new_type&);
};
template <>
@@ -34,6 +37,9 @@ namespace bdep
{
static void
parse (cmd_new_lang&, bool&, scanner&);
+
+ static void
+ merge (cmd_new_lang&, const cmd_new_lang&);
};
template <>
@@ -41,6 +47,9 @@ namespace bdep
{
static void
parse (cmd_new_vcs&, bool&, scanner&);
+
+ static void
+ merge (cmd_new_vcs&, const cmd_new_vcs&);
};
}
}