diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-11 00:20:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-11 00:20:41 +0200 |
| commit | d1b31c0f45168b1481f64a97653fd7fd8b95c661 (patch) | |
| tree | 40066ffa7c7afb28907291c93863d8cfdb14920c /src/daemon | |
| parent | Merge pull request #1679 (diff) | |
| parent | extract some basic code from libcryptonote_core into libcryptonote_basic (diff) | |
| download | monero-d1b31c0f45168b1481f64a97653fd7fd8b95c661.tar.xz | |
Merge pull request #1626
8027ce0c extract some basic code from libcryptonote_core into libcryptonote_basic (kenshi84)
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/main.cpp | 2 | ||||
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index e08065ccd..680d0a5d2 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -32,7 +32,7 @@ #include "common/scoped_message_writer.h" #include "common/util.h" #include "cryptonote_core/cryptonote_core.h" -#include "cryptonote_core/miner.h" +#include "cryptonote_basic/miner.h" #include "daemon/command_server.h" #include "daemon/daemon.h" #include "daemon/executor.h" diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index f7d85b5ef..1dc2da835 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -33,7 +33,7 @@ #include "daemon/rpc_command_executor.h" #include "rpc/core_rpc_server_commands_defs.h" #include "cryptonote_core/cryptonote_core.h" -#include "cryptonote_core/hardfork.h" +#include "cryptonote_basic/hardfork.h" #include <boost/format.hpp> #include <ctime> #include <string> |