Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

util: move threadinterrupt.{cpp,h} to util #2613

Merged
merged 1 commit into from
Mar 14, 2023
Merged

util: move threadinterrupt.{cpp,h} to util #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ GRIDCOIN_CORE_H = \
support/cleanse.h \
support/lockedpool.h \
sync.h \
threadinterrupt.h \
threadsafety.h \
tinyformat.h \
txdb.h \
Expand All @@ -200,6 +199,7 @@ GRIDCOIN_CORE_H = \
util/syserror.h \
util/system.h \
util/threadnames.h \
util/threadinterrupt.h \
util/time.h \
util/tokenpipe.h \
util.h \
Expand Down Expand Up @@ -300,14 +300,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 \
Expand Down
2 changes: 1 addition & 1 deletion src/threadinterrupt.cpp → src/util/threadinterrupt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/threadinterrupt.h → src/util/threadinterrupt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -33,4 +33,4 @@ class CThreadInterrupt
std::atomic<bool> flag;
};

#endif //BITCOIN_THREADINTERRUPT_H
#endif // BITCOIN_UTIL_THREADINTERRUPT_H
2 changes: 1 addition & 1 deletion src/util/time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include <unordered_map>
#include <sync.h>
#include <threadinterrupt.h>
#include <util/threadinterrupt.h>

using namespace std::chrono_literals;

Expand Down