diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2024-07-05 17:49:01 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2024-07-31 14:40:57 +0300 |
| commit | 4ccec83c0541f559abcdb1733fa356db62df4396 (patch) | |
| tree | ee5990382542c88fe66544c6b91b30dfb84086c5 | |
| parent | 4e56d4623cc538618b72af01c8da9ad33215cdb2 (diff) | |
Cleanup machine_header_manifest type
| -rw-r--r-- | bbot/agent/agent.cxx | 5 | ||||
| -rw-r--r-- | bbot/machine-manifest.hxx | 32 | ||||
| -rw-r--r-- | bbot/worker/worker.cxx | 2 |
3 files changed, 20 insertions, 19 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx index 0b57208..b6f1783 100644 --- a/bbot/agent/agent.cxx +++ b/bbot/agent/agent.cxx @@ -1117,7 +1117,10 @@ enumerate_machines (const dir_path& machines) machine_type::kvm, string ("de:ad:be:ef:de:ad"), nullopt, - strings ()}, + strings (), + nullopt, + nullopt, + nullopt}, toolchain_manifest {tc_id}, bootstrap_manifest {}}}); diff --git a/bbot/machine-manifest.hxx b/bbot/machine-manifest.hxx index d500957..b488425 100644 --- a/bbot/machine-manifest.hxx +++ b/bbot/machine-manifest.hxx @@ -40,26 +40,26 @@ namespace bbot strings unquoted_options () const; // Return empty if absent. - machine_manifest (std::string i, - std::string n, - std::string s, + machine_manifest (string i, + string n, + string s, machine_type t, optional<string> m, optional<strings> o, - strings c) - : machine_header_manifest (std::move (i), - std::move (n), - std::move (s), - // - // @@ TMP AUXILIARY - // - nullopt /* role */, - nullopt /* ram_minimum */, - nullopt /* ram_maximum */), + strings c, + optional<machine_role> r, + optional<uint64_t> rmn, + optional<uint64_t> rmx) + : machine_header_manifest (move (i), + move (n), + move (s), + r, + rmn, + rmx), type (t), - mac (std::move (m)), - options (std::move (o)), - changes (std::move (c)) {} + mac (move (m)), + options (move (o)), + changes (move (c)) {} public: machine_manifest () = default; diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index 700ed79..2630928 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -5858,8 +5858,6 @@ build (size_t argc, const char* argv[]) // artifacts preparation for upload, then use this log to report the // error. Otherwise, add the new log for that. // - // @@ TMP: Apple Clang 14.0.3 ICE - // operation_result* pr (&rm.results.back ()); if (pr->operation != "upload") |