diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-02-25 16:41:35 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-02-25 16:41:35 +0000 |
| commit | 12adb4a3f3ce7b3a9263ba187589a086f1b2fa54 (patch) | |
| tree | 6036997b784f86b5496a0275871b77b13474f18d /src/cryptonote_core | |
| parent | Merge pull request #1798 (diff) | |
| download | monero-12adb4a3f3ce7b3a9263ba187589a086f1b2fa54.tar.xz | |
core: move hardfork back to cryptonote_core
should fix a cross dependency betewen cryptonote_basic and
blockchain_db
Diffstat (limited to '')
| -rw-r--r-- | src/cryptonote_core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/hardfork.cpp (renamed from src/cryptonote_basic/hardfork.cpp) | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/hardfork.h (renamed from src/cryptonote_basic/hardfork.h) | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt index 5944ddcd1..8a72dd259 100644 --- a/src/cryptonote_core/CMakeLists.txt +++ b/src/cryptonote_core/CMakeLists.txt @@ -30,6 +30,7 @@ set(cryptonote_core_sources blockchain.cpp cryptonote_core.cpp tx_pool.cpp + hardfork.cpp cryptonote_tx_utils.cpp) set(cryptonote_core_headers) @@ -37,6 +38,7 @@ set(cryptonote_core_headers) set(cryptonote_core_private_headers blockchain_storage_boost_serialization.h blockchain.h + hardfork.h cryptonote_core.h tx_pool.h cryptonote_tx_utils.h) diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 2c7420e18..6e4ba5e2a 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -51,7 +51,7 @@ #include "cryptonote_basic/verification_context.h" #include "crypto/hash.h" #include "cryptonote_basic/checkpoints.h" -#include "cryptonote_basic/hardfork.h" +#include "cryptonote_core/hardfork.h" #include "blockchain_db/blockchain_db.h" namespace cryptonote diff --git a/src/cryptonote_basic/hardfork.cpp b/src/cryptonote_core/hardfork.cpp index 24d6655f0..50da70050 100644 --- a/src/cryptonote_basic/hardfork.cpp +++ b/src/cryptonote_core/hardfork.cpp @@ -29,7 +29,7 @@ #include <algorithm> #include <cstdio> -#include "cryptonote_basic.h" +#include "cryptonote_basic/cryptonote_basic.h" #include "blockchain_db/blockchain_db.h" #include "hardfork.h" diff --git a/src/cryptonote_basic/hardfork.h b/src/cryptonote_core/hardfork.h index 11241e657..6c6fbcb84 100644 --- a/src/cryptonote_basic/hardfork.h +++ b/src/cryptonote_core/hardfork.h @@ -29,7 +29,7 @@ #pragma once #include "syncobj.h" -#include "cryptonote_basic.h" +#include "cryptonote_basic/cryptonote_basic.h" namespace cryptonote { |