Browse Source

Merge branch 'merge-rawtx2' into merge-rawtx3

0.10
Jeff Garzik 11 years ago
parent
commit
de89257fc5
Failed to extract signature
  1. 5
      src/core_io.h
  2. 4
      src/core_read.cpp
  3. 4
      src/core_write.cpp

5
src/core_io.h

@ -1,7 +1,12 @@ @@ -1,7 +1,12 @@
// 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__
#include <string>
#include <vector>
class uint256;
class CScript;

4
src/core_read.cpp

@ -1,5 +1,7 @@ @@ -1,5 +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.
#include <vector>
#include "core_io.h"
#include "core.h"
#include "serialize.h"

4
src/core_write.cpp

@ -1,5 +1,7 @@ @@ -1,5 +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.
#include <vector>
#include "core_io.h"
#include "univalue/univalue.h"
#include "script.h"

Loading…
Cancel
Save