aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-07-21 21:51:17 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-07-21 21:51:17 +0300
commitd43e99c6ca2c16cfa0b3ae4b793f263d9db77f91 (patch)
treebee96c744279658385d8317fba67409e1c7f8e16
parenta81fe3634652e5d28b7dc644c88a94ecc05985de (diff)
Fix ambiguity between std::optional and butl::optional
-rw-r--r--libbpkg/manifest.cxx3
-rw-r--r--tests/package-version/driver.cxx8
-rw-r--r--tests/repository-location/driver.cxx2
3 files changed, 12 insertions, 1 deletions
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)
{