From 1b73d36b2c71c92044012dc736215bf95f2e908b Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 1 Aug 2014 08:32:41 +0200 Subject: [PATCH 1/2] fix compilation error in core_io.h - error: 'vector' in namespace 'std' does not name a type - add include in core_io.h - remove includes from core_read.cpp and core_write.cpp --- src/core_io.h | 1 + src/core_read.cpp | 1 - src/core_write.cpp | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core_io.h b/src/core_io.h index 8a7d58057..26a1293df 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -2,6 +2,7 @@ #define __BITCOIN_CORE_IO_H__ #include +#include class uint256; class CScript; diff --git a/src/core_read.cpp b/src/core_read.cpp index 0f06bb695..9022ffaf2 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,5 +1,4 @@ -#include #include "core_io.h" #include "core.h" #include "serialize.h" diff --git a/src/core_write.cpp b/src/core_write.cpp index 2eb220779..d9e31ed8c 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -1,5 +1,4 @@ -#include #include "core_io.h" #include "univalue/univalue.h" #include "script.h" From 2b600992e8de0cc9a484e3bf25fe71ac50adadb7 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 1 Aug 2014 08:39:06 +0200 Subject: [PATCH 2/2] add license header to core_io.h, core_read/_write.cpp --- src/core_io.h | 4 ++++ src/core_read.cpp | 3 +++ src/core_write.cpp | 3 +++ 3 files changed, 10 insertions(+) diff --git a/src/core_io.h b/src/core_io.h index 26a1293df..adf74cce3 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -1,3 +1,7 @@ +// Copyright (c) 2009-2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + #ifndef __BITCOIN_CORE_IO_H__ #define __BITCOIN_CORE_IO_H__ diff --git a/src/core_read.cpp b/src/core_read.cpp index 9022ffaf2..593eb2d03 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2009-2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "core_io.h" #include "core.h" diff --git a/src/core_write.cpp b/src/core_write.cpp index d9e31ed8c..37dd69f7b 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -1,3 +1,6 @@ +// Copyright (c) 2009-2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "core_io.h" #include "univalue/univalue.h"