diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-04 12:56:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-04 13:06:16 +0100 |
| commit | 31dedb463b0ce77364e516239bf1b9c7eed5b3b0 (patch) | |
| tree | 737f42a6f13f8b1521d42795ba339527f50f8535 /src/keystore.cpp | |
| parent | 87ecfb0f9675ef46d360014a65886e9556d28e66 (diff) | |
| parent | 7f991e364eb50bd14970de9d96981a7ca268d4aa (diff) | |
Merge pull request #5509
7f991e3 c++11: These look like user-defined literals. (Cory Fields)
5a6155c c++11: don't forward-declare types used in maps (Cory Fields)
3447cf8 c++11: MOVEONLY: break circular dependency in wallet (Cory Fields)
bbacd88 c++11: MOVEONLY: move function definitions out of the header (Cory Fields)
a2b04dd build: fix newer boost build with c++11 (Cory Fields)
Diffstat (limited to 'src/keystore.cpp')
| -rw-r--r-- | src/keystore.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp index 22cd08f30c..7531737e04 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -7,8 +7,6 @@ #include "crypter.h" #include "key.h" -#include "script/script.h" -#include "script/standard.h" #include "util.h" #include <boost/foreach.hpp> |