aboutsummaryrefslogtreecommitdiff
path: root/bbot/machine-manifest.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'bbot/machine-manifest.hxx')
-rw-r--r--bbot/machine-manifest.hxx32
1 files changed, 16 insertions, 16 deletions
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;