From ce8a7b9e50945758efdafc63869e1b44864f9d7d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 1 Oct 2015 14:32:44 +0200
Subject: Adopt to some bpkg namespace types reshape

---
 brep/package | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'brep/package')

diff --git a/brep/package b/brep/package
index ddfc179..6ca0c12 100644
--- a/brep/package
+++ b/brep/package
@@ -45,13 +45,17 @@ namespace brep
 // bpkg namespace from which we "borrow" types (and some of them use
 // version).
 //
-#pragma db map type(bpkg::version) as(brep::_version)                    \
-  to(brep::_version{(?).epoch (),                                        \
-                    (?).upstream (),                                     \
-                    (?).revision (),                                     \
-                    (?).canonical_upstream ()})                          \
+#pragma db map type(bpkg::version) as(brep::_version)                     \
+  to(brep::_version{(?).epoch,                                            \
+                    (?).upstream,                                         \
+                    (?).revision,                                         \
+                    (?).canonical_upstream})                              \
   from(bpkg::version ((?).epoch, std::move ((?).upstream), (?).revision))
 
+#pragma db map type(bpkg::comparison) as(std::string) \
+    to(bpkg::to_string (?))                           \
+    from(bpkg::to_comparison (?))
+
 namespace brep
 {
   // @@ If namespace, then should probably call it 'repo'.
@@ -157,9 +161,8 @@ namespace brep
   // dependencies
   //
   using comparison = bpkg::comparison;
-  using version_comparison = bpkg::version_comparison;
-  #pragma db value(version_comparison) definition
-  #pragma db member(version_comparison::value) column("")
+  using dependency_condition = bpkg::dependency_condition;
+  #pragma db value(dependency_condition) definition
 
   // Notes:
   //
@@ -192,6 +195,7 @@ namespace brep
   //
   using dependency = bpkg::dependency;
   #pragma db value(dependency) definition
+  #pragma db member(dependency::condition) column("")
 
   using dependency_alternatives = bpkg::dependency_alternatives;
   #pragma db value(dependency_alternatives) definition
-- 
cgit v1.1