From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 27 Jul 2020 18:56:45 +0000 (+0200)
Subject: Fix build with Clang 10
X-Git-Tag: v4.0~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c886a4bdb7ca39861ec9b0f398c22d8b9bf366ad;p=thirdparty%2Fccache.git

Fix build with Clang 10

Clang 10 says “error: explicitly defaulted move constructor is
implicitly deleted [...] note: move constructor of 'TemporaryFile' is
implicitly deleted because base class 'NonCopyable' has a deleted move
constructor”, so we’ll just have to do without NonCopyable. The effect
will be the same in pracice due to the “Fd fd” member not being
copyable.
---

diff --git a/src/TemporaryFile.hpp b/src/TemporaryFile.hpp
index dc64f8b4f..d02eafab5 100644
--- a/src/TemporaryFile.hpp
+++ b/src/TemporaryFile.hpp
@@ -19,13 +19,12 @@
 #pragma once
 
 #include "Fd.hpp"
-#include "NonCopyable.hpp"
 
 #include "third_party/nonstd/string_view.hpp"
 
 // This class represents a unique temporary file created by mkstemp. The file is
 // not deleted by the destructor.
-class TemporaryFile : NonCopyable
+class TemporaryFile
 {
 public:
   // `path_prefix` is the base path. The resulting filename will be this path