aboutsummaryrefslogtreecommitdiff
path: root/tests/package-version
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 /tests/package-version
parenta81fe3634652e5d28b7dc644c88a94ecc05985de (diff)
Fix ambiguity between std::optional and butl::optional
Diffstat (limited to 'tests/package-version')
-rw-r--r--tests/package-version/driver.cxx8
1 files changed, 7 insertions, 1 deletions
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
{