Browse Source

update bitcoin core from git (eeac8727bc)

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
0eeb4f5d5b
  1. 3
      src/db.cpp
  2. 30
      src/headers.h
  3. 7
      src/init.cpp
  4. 3
      src/irc.cpp
  5. 4
      src/main.cpp
  6. 10
      src/main.h
  7. 5
      src/net.cpp
  8. 1
      src/net.h
  9. 5
      src/rpc.cpp
  10. 13
      src/util.cpp
  11. 1
      src/util.h

3
src/db.cpp

@ -3,6 +3,9 @@ @@ -3,6 +3,9 @@
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "db.h"
#include "net.h"
#include <boost/filesystem/fstream.hpp>
using namespace std;
using namespace boost;

30
src/headers.h

@ -48,7 +48,6 @@ @@ -48,7 +48,6 @@
#include <limits.h>
#include <float.h>
#include <assert.h>
#include <memory>
#include <iostream>
#include <sstream>
#include <string>
@ -56,29 +55,8 @@ @@ -56,29 +55,8 @@
#include <list>
#include <deque>
#include <map>
#include <set>
#include <algorithm>
#include <numeric>
#include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/tuple/tuple_comparison.hpp>
#include <boost/tuple/tuple_io.hpp>
#include <boost/array.hpp>
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/thread.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#include <boost/interprocess/sync/interprocess_mutex.hpp>
#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
#include <boost/date_time/gregorian/gregorian_types.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/config.hpp>
#include <boost/program_options/detail/config_file.hpp>
#include <boost/program_options/parsers.hpp>
#ifdef __WXMSW__
#include <windows.h>
@ -110,7 +88,6 @@ @@ -110,7 +88,6 @@
#pragma hdrstop
#include "strlcpy.h"
#include "serialize.h"
#include "uint256.h"
#include "util.h"
@ -118,18 +95,13 @@ @@ -118,18 +95,13 @@
#include "bignum.h"
#include "base58.h"
#include "script.h"
#include "db.h"
#include "net.h"
#include "irc.h"
#include "main.h"
#include "rpc.h"
#ifdef GUI
#include "uibase.h"
#include "ui.h"
#else
#include "externui.h"
#endif
#include "init.h"
#ifdef GUI
#include "xpm/addressbook16.xpm"

7
src/init.cpp

@ -2,6 +2,13 @@ @@ -2,6 +2,13 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "db.h"
#include "rpc.h"
#include "net.h"
#include "init.h"
#include "strlcpy.h"
#include <boost/filesystem/fstream.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
using namespace std;
using namespace boost;

3
src/irc.cpp

@ -3,6 +3,9 @@ @@ -3,6 +3,9 @@
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "irc.h"
#include "net.h"
#include "strlcpy.h"
using namespace std;
using namespace boost;

4
src/main.cpp

@ -2,7 +2,11 @@ @@ -2,7 +2,11 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "db.h"
#include "net.h"
#include "init.h"
#include "cryptopp/sha.h"
#include <boost/filesystem/fstream.hpp>
using namespace std;
using namespace boost;

10
src/main.h

@ -24,6 +24,13 @@ class CBlockIndex; @@ -24,6 +24,13 @@ class CBlockIndex;
class CWalletTx;
class CKeyItem;
class CMessageHeader;
class CAddress;
class CInv;
class CRequestTracker;
class CNode;
class CBlockIndex;
static const unsigned int MAX_BLOCK_SIZE = 1000000;
static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2;
static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
@ -78,6 +85,9 @@ extern int fUseUPnP; @@ -78,6 +85,9 @@ extern int fUseUPnP;
class CReserveKey;
class CTxDB;
class CTxIndex;
bool CheckDiskSpace(uint64 nAdditionalBytes=0);
FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb");

5
src/net.cpp

@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "irc.h"
#include "db.h"
#include "net.h"
#include "init.h"
#include "strlcpy.h"
#ifdef USE_UPNP
#include <miniupnpc/miniwget.h>

1
src/net.h

@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
#include <deque>
#include <boost/array.hpp>
#include <boost/foreach.hpp>
#include <openssl/rand.h>
#ifndef __WXMSW__

5
src/rpc.cpp

@ -4,12 +4,17 @@ @@ -4,12 +4,17 @@
#include "headers.h"
#include "cryptopp/sha.h"
#include "db.h"
#include "net.h"
#include "init.h"
#undef printf
#include <boost/asio.hpp>
#include <boost/iostreams/concepts.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/algorithm/string.hpp>
#ifdef USE_SSL
#include <boost/asio/ssl.hpp>
#include <boost/filesystem/fstream.hpp>
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
#endif
#include "json/json_spirit_reader_template.h"

13
src/util.cpp

@ -2,6 +2,13 @@ @@ -2,6 +2,13 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "strlcpy.h"
#include <boost/program_options/detail/config_file.hpp>
#include <boost/program_options/parsers.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/interprocess/sync/interprocess_mutex.hpp>
#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
#include <boost/foreach.hpp>
using namespace std;
using namespace boost;
@ -893,8 +900,10 @@ string FormatVersion(int nVersion) @@ -893,8 +900,10 @@ string FormatVersion(int nVersion)
string FormatFullVersion()
{
string s = FormatVersion(VERSION) + pszSubVer;
if (VERSION_IS_BETA)
s += _("-beta");
if (VERSION_IS_BETA) {
s += "-";
s += _("beta");
}
return s;
}

1
src/util.h

@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
#include <vector>
#include <string>
#include <boost/foreach.hpp>
#include <boost/thread.hpp>
#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
#include <boost/date_time/gregorian/gregorian_types.hpp>

Loading…
Cancel
Save