From 5de58425e88f274adeb2c552c00a2eafb170c84c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 1 Dec 2017 17:17:35 +0200
Subject: Resolve optional ambiguity in GCC 7

---
 libbrep/types.hxx     | 2 ++
 load/load.cxx         | 5 ++++-
 tests/load/driver.cxx | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libbrep/types.hxx b/libbrep/types.hxx
index b4a3b19..ef37da4 100644
--- a/libbrep/types.hxx
+++ b/libbrep/types.hxx
@@ -65,6 +65,8 @@ namespace brep
   using std::system_error;
   using io_error = std::ios_base::failure;
 
+  using std::generic_category;
+
   // <libbutl/optional.mxx>
   //
   using butl::optional;
diff --git a/load/load.cxx b/load/load.cxx
index 3dbf2fb..8cc9730 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -33,7 +33,10 @@
 
 #include <load/load-options.hxx>
 
-using namespace std;
+using std::cout;
+using std::cerr;
+using std::endl;
+
 using namespace odb::core;
 using namespace butl;
 using namespace bpkg;
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index dab5be9..868b393 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -20,7 +20,9 @@
 #include <libbrep/package.hxx>
 #include <libbrep/package-odb.hxx>
 
-using namespace std;
+using std::cerr;
+using std::endl;
+
 using namespace odb::core;
 using namespace butl;
 using namespace brep;
@@ -90,7 +92,7 @@ main (int argc, char* argv[])
     else if (n == "--db-host" || n == "-h")
       host = argv[++i];
     else if (n == "--db-port" || n == "-p")
-      port = stoul (argv[++i]);
+      port = std::stoul (argv[++i]);
   }
 
   if (i != argc - 1)
-- 
cgit v1.1