From d259750511b3c2aaeace49f8ccb1d7f3ad561452 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 9 Dec 2021 15:47:34 +0300
Subject: Prepare for supporting multiple ids in requirement alternative

---
 libbrep/common.hxx | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'libbrep/common.hxx')

diff --git a/libbrep/common.hxx b/libbrep/common.hxx
index 98fc4e7..b9b6928 100644
--- a/libbrep/common.hxx
+++ b/libbrep/common.hxx
@@ -373,13 +373,28 @@ namespace brep
 
   // requirements
   //
+  // Note that this is a 2-level nested container (see package.hxx for
+  // details).
+  //
+  using bpkg::requirement_alternative;
   using bpkg::requirement_alternatives;
   using requirements = vector<requirement_alternatives>;
 
+  #pragma db value(requirement_alternative) definition
   #pragma db value(requirement_alternatives) definition
 
-  using requirement_key = odb::nested_key<requirement_alternatives>;
-  using requirement_alternatives_map = std::map<requirement_key, string>;
+  using requirement_alternative_key =
+    odb::nested_key<requirement_alternatives>;
+
+  using requirement_alternatives_map =
+    std::map<requirement_alternative_key, requirement_alternative>;
+
+  #pragma db value(requirement_alternative_key)
+
+  using requirement_key = odb::nested2_key<requirement_alternatives>;
+
+  using requirement_alternative_requirements_map =
+    std::map<requirement_key, string>;
 
   #pragma db value(requirement_key)
 
-- 
cgit v1.1