diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:58:46 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:58:46 +0200 |
| commit | b806d9844e4cfdb94e7a2d175efdf41d5ad480ff (patch) | |
| tree | f90f634f25079749febf00618ac3160d204f2d7a /src/cryptonote_protocol | |
| parent | Merge pull request #2881 (diff) | |
| parent | move includes around to lessen overall load (diff) | |
| download | monero-b806d9844e4cfdb94e7a2d175efdf41d5ad480ff.tar.xz | |
Merge pull request #2864
09ce03d6 move includes around to lessen overall load (moneromooo-monero)
Diffstat (limited to '')
| -rw-r--r-- | src/cryptonote_basic/blobdatatype.h (renamed from src/cryptonote_protocol/blobdatatype.h) | 0 | ||||
| -rw-r--r-- | src/cryptonote_protocol/block_queue.cpp | 1 | ||||
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_defs.h | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_protocol/blobdatatype.h b/src/cryptonote_basic/blobdatatype.h index 2d12a84af..2d12a84af 100644 --- a/src/cryptonote_protocol/blobdatatype.h +++ b/src/cryptonote_basic/blobdatatype.h diff --git a/src/cryptonote_protocol/block_queue.cpp b/src/cryptonote_protocol/block_queue.cpp index 813167400..bfff35456 100644 --- a/src/cryptonote_protocol/block_queue.cpp +++ b/src/cryptonote_protocol/block_queue.cpp @@ -31,6 +31,7 @@ #include <vector> #include <unordered_map> #include <boost/uuid/nil_generator.hpp> +#include "string_tools.h" #include "cryptonote_protocol_defs.h" #include "block_queue.h" diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h index 7cf7e4a4d..fc2f4c343 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_defs.h +++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h @@ -33,7 +33,7 @@ #include <list> #include "serialization/keyvalue_serialization.h" #include "cryptonote_basic/cryptonote_basic.h" -#include "cryptonote_protocol/blobdatatype.h" +#include "cryptonote_basic/blobdatatype.h" namespace cryptonote { |