diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-12-15 17:13:38 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-12-15 17:16:34 +0300 |
| commit | c397dd43d3d6b7d81817006734e5e1ab81ffcd19 (patch) | |
| tree | 5d19065652987379e40d5a513d09de7395639518 | |
| parent | b740417add06a6df0dff65b60fbd92a8c8d95aab (diff) | |
Adapt to renaming butl::unknown_name_mode union to manifest_unknown_mode
| -rw-r--r-- | libbbot/manifest.cxx | 14 | ||||
| -rw-r--r-- | libbbot/manifest.hxx | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libbbot/manifest.cxx b/libbbot/manifest.cxx index f412538..be889af 100644 --- a/libbbot/manifest.cxx +++ b/libbbot/manifest.cxx @@ -108,7 +108,7 @@ namespace bbot // machine_header_manifest // machine_header_manifest:: - machine_header_manifest (parser& p, unknown_name_mode m) + machine_header_manifest (parser& p, manifest_unknown_mode m) : machine_header_manifest (p, p.next (), m) { // Make sure this is the end. @@ -122,7 +122,7 @@ namespace bbot machine_header_manifest:: machine_header_manifest (parser& p, name_value nv, - unknown_name_mode m, + manifest_unknown_mode m, name_value* e) { auto bad_name = [&p, &nv] (const string& d) @@ -182,10 +182,10 @@ namespace bbot { switch (m) { - case unknown_name_mode::skip: continue; - case unknown_name_mode::fail: + case manifest_unknown_mode::skip: continue; + case manifest_unknown_mode::fail: bad_name ("unknown name '" + n + "' in machine header manifest"); - case unknown_name_mode::stop: break; // Bail out from the loop. + case manifest_unknown_mode::stop: break; // Bail out from the loop. } break; @@ -321,8 +321,8 @@ namespace bbot machine_header_manifest (p, nv, iu - ? unknown_name_mode::skip - : unknown_name_mode::fail)); + ? manifest_unknown_mode::skip + : manifest_unknown_mode::fail)); if (machines.empty ()) bad_value ("no task request machines specified"); diff --git a/libbbot/manifest.hxx b/libbbot/manifest.hxx index de93def..7da0e45 100644 --- a/libbbot/manifest.hxx +++ b/libbbot/manifest.hxx @@ -40,12 +40,12 @@ namespace bbot machine_header_manifest ( butl::manifest_parser&, - butl::unknown_name_mode = butl::unknown_name_mode::fail); + butl::manifest_unknown_mode = butl::manifest_unknown_mode::fail); machine_header_manifest ( butl::manifest_parser&, butl::manifest_name_value start, - butl::unknown_name_mode = butl::unknown_name_mode::fail, + butl::manifest_unknown_mode = butl::manifest_unknown_mode::fail, butl::manifest_name_value* end = nullptr); // Wrapper-ctor. Primarily for use in template functions parameterized @@ -54,8 +54,8 @@ namespace bbot machine_header_manifest (butl::manifest_parser& p, bool ignore_unknown) : machine_header_manifest (p, ignore_unknown - ? butl::unknown_name_mode::skip - : butl::unknown_name_mode::fail) {} + ? butl::manifest_unknown_mode::skip + : butl::manifest_unknown_mode::fail) {} void serialize (butl::manifest_serializer&, bool end_of_manifest = true) const; |