From eeb4dd62fe81070217511a754ca539325bdd9d78 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 9 Jul 2018 16:28:11 +0200
Subject: Workaround for GCC bug #86441

---
 bpkg/package.hxx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bpkg/package.hxx b/bpkg/package.hxx
index ab0d144..6b19203 100644
--- a/bpkg/package.hxx
+++ b/bpkg/package.hxx
@@ -44,9 +44,10 @@ namespace bpkg
     }
   };
 
+  using optional_string = optional<string>;
+
   // path
   //
-  using optional_string = optional<string>;
   using optional_path = optional<path>;
   using optional_dir_path = optional<dir_path>;
 
@@ -1364,6 +1365,16 @@ namespace bpkg
 */
 }
 
+// Workaround for GCC __is_invocable/non-constant condition bug (#86441).
+//
+#ifdef ODB_COMPILER
+namespace std
+{
+  template class map<bpkg::available_package::_dependency_key,
+                     bpkg::dependency>;
+}
+#endif
+
 #include <bpkg/package.ixx>
 
 #endif // BPKG_PACKAGE_HXX
-- 
cgit v1.1