From d43e99c6ca2c16cfa0b3ae4b793f263d9db77f91 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 21 Jul 2017 21:51:17 +0300
Subject: Fix ambiguity between std::optional and butl::optional

---
 libbpkg/manifest.cxx                 | 3 +++
 tests/package-version/driver.cxx     | 8 +++++++-
 tests/repository-location/driver.cxx | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index ee71596..b7f744f 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -33,6 +33,9 @@ namespace bpkg
   using serialization = manifest_serialization;
   using name_value = manifest_name_value;
 
+  using butl::optional;
+  using butl::nullopt;
+
   // Utility functions
   //
   static const strings priority_names ({"low", "medium", "high", "security"});
diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx
index 2ca318b..0e9ef98 100644
--- a/tests/package-version/driver.cxx
+++ b/tests/package-version/driver.cxx
@@ -18,6 +18,9 @@ using namespace std;
 using namespace butl;
 using namespace bpkg;
 
+using butl::optional;
+using butl::nullopt;
+
 static bool
 bad_version (const string& v)
 {
@@ -33,7 +36,10 @@ bad_version (const string& v)
 }
 
 static bool
-bad_version (uint16_t e, const string& u, const optional<string>& l, uint16_t r)
+bad_version (uint16_t e,
+             const string& u,
+             const optional<string>& l,
+             uint16_t r)
 {
   try
   {
diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx
index c77a4eb..a62cad3 100644
--- a/tests/repository-location/driver.cxx
+++ b/tests/repository-location/driver.cxx
@@ -19,6 +19,8 @@ using namespace std;
 using namespace butl;
 using namespace bpkg;
 
+using butl::optional;
+
 static bool
 bad_location (const string& l)
 {
-- 
cgit v1.1