From 2df57d72b65012674e6bc64dec66d9b3fd7f993b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 14 May 2018 14:10:56 +0300
Subject: Fallback to output directory removal for --keep-out on disfigure
 failure

---
 bpkg/diagnostics.hxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'bpkg/diagnostics.hxx')

diff --git a/bpkg/diagnostics.hxx b/bpkg/diagnostics.hxx
index cbce2f2..ca277d4 100644
--- a/bpkg/diagnostics.hxx
+++ b/bpkg/diagnostics.hxx
@@ -5,12 +5,13 @@
 #ifndef BPKG_DIAGNOSTICS_HXX
 #define BPKG_DIAGNOSTICS_HXX
 
+#include <utility> // forward()
+
 #include <odb/tracer.hxx>
 
 #include <libbutl/diagnostics.mxx>
 
-#include <bpkg/types.hxx>
-#include <bpkg/utility.hxx>
+#include <bpkg/types.hxx> // Note: not <bpkg/utility.hxx>
 
 namespace bpkg
 {
@@ -159,7 +160,9 @@ namespace bpkg
         epilogue_,
         type_,
         name_,
-        location (forward<F> (f), forward<L> (l), forward<C> (c)));
+        location (std::forward<F> (f),
+                  std::forward<L> (l),
+                  std::forward<C> (c)));
     }
 
   protected:
-- 
cgit v1.1