Merge pull request #2613 from Pythonix/move-thread-interrupt

util: move threadinterrupt.{cpp,h} to util
gridcoin-community · Mar 14, 2023 · 8eb803a · 8eb803a
2 parents 1ee63fe + 4610d13
commit 8eb803a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -190,7 +190,6 @@ GRIDCOIN_CORE_H = \
     support/cleanse.h \
     support/lockedpool.h \
     sync.h \
-    threadinterrupt.h \
     threadsafety.h \
     tinyformat.h \
     txdb.h \
@@ -208,6 +207,7 @@ GRIDCOIN_CORE_H = \
     util/syserror.h \
     util/system.h \
     util/threadnames.h \
+    util/threadinterrupt.h \
     util/time.h \
     util/tokenpipe.h \
     util.h \
@@ -308,14 +308,14 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     support/cleanse.cpp \
     support/lockedpool.cpp \
     sync.cpp \
-    threadinterrupt.cpp \
     uint256.cpp \
     util/bip32.cpp \
     util/settings.cpp \
     util/strencodings.cpp \
     util/string.cpp \
     util/syserror.cpp \
     util/system.cpp \
+    util/threadinterrupt.cpp \
     util/threadnames.cpp \
     util/time.cpp \
     util/tokenpipe.cpp \

diff --git a/src/threadinterrupt.cpp → src/util/threadinterrupt.cpp b/src/threadinterrupt.cpp → src/util/threadinterrupt.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.
 
-#include <threadinterrupt.h>
+#include <util/threadinterrupt.h>
 
 #include <sync.h>
 

diff --git a/src/threadinterrupt.h → src/util/threadinterrupt.h b/src/threadinterrupt.h → src/util/threadinterrupt.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_THREADINTERRUPT_H
-#define BITCOIN_THREADINTERRUPT_H
+#ifndef BITCOIN_UTIL_THREADINTERRUPT_H
+#define BITCOIN_UTIL_THREADINTERRUPT_H
 
 #include <sync.h>
 
@@ -33,4 +33,4 @@ class CThreadInterrupt
     std::atomic<bool> flag;
 };
 
-#endif //BITCOIN_THREADINTERRUPT_H
+#endif // BITCOIN_UTIL_THREADINTERRUPT_H
diff --git a/src/util/time.h b/src/util/time.h
@@ -14,7 +14,7 @@
 
 #include <unordered_map>
 #include <sync.h>
-#include <threadinterrupt.h>
+#include <util/threadinterrupt.h>
 
 using namespace std::chrono_literals;