diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-12 14:56:03 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-08-13 16:52:16 +0300 |
| commit | edab35e216bc3839915129e54f98160428634283 (patch) | |
| tree | 51c1ae471e39aca817038f16d33cc25be4998369 /bdep/ci-parsers.hxx | |
| parent | 54c937f78562fc6a5d2ea01c8747c62ccea980cb (diff) | |
Add support for default options files
Diffstat (limited to 'bdep/ci-parsers.hxx')
| -rw-r--r-- | bdep/ci-parsers.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bdep/ci-parsers.hxx b/bdep/ci-parsers.hxx index 943821c..d196f41 100644 --- a/bdep/ci-parsers.hxx +++ b/bdep/ci-parsers.hxx @@ -29,6 +29,9 @@ namespace bdep { static void parse (cmd_ci_override&, bool&, scanner&); + + static void + merge (cmd_ci_override&, const cmd_ci_override&); }; } } |