diff options
| author | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2016-02-03 05:41:13 +0000 |
| commit | a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc (patch) | |
| tree | 7e3932c75353499d6659b4f5a94b40e07e64c364 /src/rest.cpp | |
| parent | When/if the copyright line does not mention Bitcoin Core developers, add a se... (diff) | |
| parent | Merge #7091: Consensus build package (diff) | |
| download | discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.tar.xz discoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.zip | |
Merge branch 'master' into single_prodname
Diffstat (limited to 'src/rest.cpp')
| -rw-r--r-- | src/rest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rest.cpp b/src/rest.cpp index 5d69542a9..ebdccc940 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -9,7 +9,7 @@ #include "primitives/transaction.h" #include "main.h" #include "httpserver.h" -#include "rpcserver.h" +#include "rpc/server.h" #include "streams.h" #include "sync.h" #include "txmempool.h" @@ -494,7 +494,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart) if (vOutPoints.size() > MAX_GETUTXOS_OUTPOINTS) return RESTERR(req, HTTP_INTERNAL_SERVER_ERROR, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size())); - // check spentness and form a bitmap (as well as a JSON capable human-readble string representation) + // check spentness and form a bitmap (as well as a JSON capable human-readable string representation) vector<unsigned char> bitmap; vector<CCoin> outs; std::string bitmapStringRepresentation; |