refactor: Move NonCopyable to util

diff --git a/src/Args.hpp b/src/Args.hpp
index 16bc7fe451294d41935965282facc322cc4f6b44..825e95be4bdc69ccb5c051f3460d9db44d24a2f5 100644 (file)
--- 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 fc43895b3403d1bc87bca2a13d686a080b00e089..75bd9c2a81519c0ec3bbcd07453d3cab1310cb48 100644 (file)
--- 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 bfc92a4235a841107aac23f059e812cb48354087..aeb3e0af8838dd09cdea0e65581ff350b2f6f278 100644 (file)
--- 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 ad0332c5110b0e83cd4f549c80a3fd484c24edc4..cb4d177bd5213747839f3031456ea1bc6d0faf87 100644 (file)
--- 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 87d04a65c16915a18c96b70a786ff5e56d8c00f4..03067b2f41417bbed02cb5728989056a5350eb15 100644 (file)
--- 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 63daa468166bcee0900f2e4e46f8fdfc2b00a96d..a04511d90e525a6c19aa25300b8f87419d6a2d32 100644 (file)
--- 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 3a1485ebc5e105c448cfa07e27f53961eb62a8e3..b65cf62c51c1c14bbb5e37cf56601e39a17c9ca2 100644 (file)
--- 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 37fe7e7147d544faba59935d5b71bc8d7a54b565..ffcb40319566929b0902abd0bd1f2ed0e414f44d 100644 (file)
--- 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