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_basic | |
| 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_basic/CMakeLists.txt | 6 | ||||
| -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 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt index 9df157a9e..db478c690 100644 --- a/src/cryptonote_basic/CMakeLists.txt +++ b/src/cryptonote_basic/CMakeLists.txt @@ -32,8 +32,7 @@ set(cryptonote_basic_sources cryptonote_basic_impl.cpp cryptonote_format_utils.cpp difficulty.cpp - miner.cpp - hardfork.cpp) + miner.cpp) set(cryptonote_basic_headers) @@ -50,8 +49,7 @@ set(cryptonote_basic_private_headers difficulty.h miner.h tx_extra.h - verification_context.h - hardfork.h) + verification_context.h) monero_private_headers(cryptonote_basic ${crypto_private_headers}) 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 { |