From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 30 Sep 2023 17:48:24 +0000 (+0200)
Subject: refactor: Move NonCopyable to util
X-Git-Tag: v4.9~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e3b6b1c9d5f490a6a06076b55a9a617183f3f51;p=thirdparty%2Fccache.git

refactor: Move NonCopyable to util
---

diff --git a/src/Args.hpp b/src/Args.hpp
index 16bc7fe45..825e95be4 100644
--- a/src/Args.hpp
+++ b/src/Args.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "NonCopyable.hpp"
+#include <util/NonCopyable.hpp>
 
 #include <deque>
 #include <optional>
diff --git a/src/Config.hpp b/src/Config.hpp
index fc43895b3..75bd9c2a8 100644
--- a/src/Config.hpp
+++ b/src/Config.hpp
@@ -18,9 +18,8 @@
 
 #pragma once
 
-#include "NonCopyable.hpp"
-
 #include <core/Sloppiness.hpp>
+#include <util/NonCopyable.hpp>
 #include <util/string.hpp>
 
 #include <sys/types.h>
@@ -46,7 +45,7 @@ enum class CompilerType {
 
 std::string compiler_type_to_string(CompilerType compiler_type);
 
-class Config : NonCopyable
+class Config : util::NonCopyable
 {
 public:
   Config() = default;
diff --git a/src/Context.hpp b/src/Context.hpp
index bfc92a423..aeb3e0af8 100644
--- a/src/Context.hpp
+++ b/src/Context.hpp
@@ -23,7 +23,8 @@
 #include "Config.hpp"
 #include "File.hpp"
 #include "MiniTrace.hpp"
-#include "NonCopyable.hpp"
+
+#include <util/NonCopyable.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
 #  include "InodeCache.hpp"
@@ -43,7 +44,7 @@
 
 class SignalHandler;
 
-class Context : NonCopyable
+class Context : util::NonCopyable
 {
 public:
   Context();
diff --git a/src/File.hpp b/src/File.hpp
index ad0332c51..cb4d177bd 100644
--- a/src/File.hpp
+++ b/src/File.hpp
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include "NonCopyable.hpp"
+#include <util/NonCopyable.hpp>
 
 #include <cstdio>
 #include <string>
 
-class File : public NonCopyable
+class File : util::NonCopyable
 {
 public:
   File() = default;
diff --git a/src/util/Fd.hpp b/src/util/Fd.hpp
index 87d04a65c..03067b2f4 100644
--- a/src/util/Fd.hpp
+++ b/src/util/Fd.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <NonCopyable.hpp>
+#include <util/NonCopyable.hpp>
 #include <util/assertions.hpp>
 #include <util/wincompat.hpp>
 
@@ -28,7 +28,7 @@
 
 namespace util {
 
-class Fd : NonCopyable
+class Fd : util::NonCopyable
 {
 public:
   Fd() = default;
diff --git a/src/util/LockFile.hpp b/src/util/LockFile.hpp
index 63daa4681..a04511d90 100644
--- a/src/util/LockFile.hpp
+++ b/src/util/LockFile.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <NonCopyable.hpp>
 #include <util/LongLivedLockFileManager.hpp>
+#include <util/NonCopyable.hpp>
 #include <util/TimePoint.hpp>
 
 #include <filesystem>
@@ -30,7 +30,7 @@ namespace util {
 // Unless make_long_lived is called, the lock is expected to be released shortly
 // after being acquired - if it is held for more than two seconds it risks being
 // considered stale by another client.
-class LockFile : NonCopyable
+class LockFile : util::NonCopyable
 {
 public:
   explicit LockFile(const std::filesystem::path& path);
diff --git a/src/util/LongLivedLockFileManager.hpp b/src/util/LongLivedLockFileManager.hpp
index 3a1485ebc..b65cf62c5 100644
--- a/src/util/LongLivedLockFileManager.hpp
+++ b/src/util/LongLivedLockFileManager.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <NonCopyable.hpp>
+#include <util/NonCopyable.hpp>
 
 #include <condition_variable>
 #include <filesystem>
@@ -28,7 +28,7 @@
 
 namespace util {
 
-class LongLivedLockFileManager : NonCopyable
+class LongLivedLockFileManager : util::NonCopyable
 {
 public:
   LongLivedLockFileManager() = default;
diff --git a/src/NonCopyable.hpp b/src/util/NonCopyable.hpp
similarity index 90%
rename from src/NonCopyable.hpp
rename to src/util/NonCopyable.hpp
index 37fe7e714..ffcb40319 100644
--- a/src/NonCopyable.hpp
+++ b/src/util/NonCopyable.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2023 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,6 +18,8 @@
 
 #pragma once
 
+namespace util {
+
 class NonCopyable
 {
 public:
@@ -27,3 +29,5 @@ public:
 protected:
   NonCopyable() = default;
 };
+
+} // namespace util