aboutsummaryrefslogtreecommitdiff
path: root/libbrep
diff options
context:
space:
mode:
Diffstat (limited to 'libbrep')
-rw-r--r--libbrep/build.cxx2
-rw-r--r--libbrep/build.hxx17
-rw-r--r--libbrep/build.xml2
3 files changed, 7 insertions, 14 deletions
diff --git a/libbrep/build.cxx b/libbrep/build.cxx
index 78a3a2d..10ff792 100644
--- a/libbrep/build.cxx
+++ b/libbrep/build.cxx
@@ -60,7 +60,7 @@ namespace brep
string tnm, version tvr,
optional<string> afp, optional<string> ach,
string mnm, string msm,
- optional<butl::target_triplet> trg)
+ butl::target_triplet trg)
: id (package_id (move (pnm), pvr), move (cfg), tvr),
package_name (id.package.name),
package_version (move (pvr)),
diff --git a/libbrep/build.hxx b/libbrep/build.hxx
index 7f0aba6..7edf70c 100644
--- a/libbrep/build.hxx
+++ b/libbrep/build.hxx
@@ -146,13 +146,9 @@ namespace brep
// target_triplet
//
- using optional_target_triplet = optional<butl::target_triplet>;
-
- #pragma db map type(optional_target_triplet) as(optional_string) \
- to((?) ? (?)->string () : brep::optional_string ()) \
- from((?) \
- ? butl::target_triplet (*(?)) \
- : brep::optional_target_triplet ())
+ #pragma db map type(butl::target_triplet) as(string) \
+ to((?).string ()) \
+ from(butl::target_triplet (?))
// operation_results
//
@@ -176,7 +172,7 @@ namespace brep
optional<string> agent_fingerprint,
optional<string> agent_challenge,
string machine, string machine_summary,
- optional<butl::target_triplet> target);
+ butl::target_triplet);
build_id id;
@@ -206,10 +202,7 @@ namespace brep
string machine;
string machine_summary;
-
- // Default for the machine if absent.
- //
- optional<butl::target_triplet> target;
+ butl::target_triplet target;
// Note that the logs are stored as std::string/TEXT which is Ok since
// they are UTF-8 and our database is UTF-8.
diff --git a/libbrep/build.xml b/libbrep/build.xml
index 5b45d6d..e765c00 100644
--- a/libbrep/build.xml
+++ b/libbrep/build.xml
@@ -24,7 +24,7 @@
<column name="agent_challenge" type="TEXT" null="true"/>
<column name="machine" type="TEXT" null="false"/>
<column name="machine_summary" type="TEXT" null="false"/>
- <column name="target" type="TEXT" null="true"/>
+ <column name="target" type="TEXT" null="false"/>
<primary-key>
<column name="package_name"/>
<column name="package_version_epoch"/>