diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-01-28 10:39:47 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-01-28 10:39:51 -0500 |
| commit | d6e700e40f861ddd6743f4d13f0d6f6bc19093c2 (patch) | |
| tree | 0a717ee3bde73a11e77f1e28e7bd33888f712a51 /src | |
| parent | 5e0c0fd62ff04178f36fb5219e47fa647df66a38 (diff) | |
| parent | fa5f890aeb90a4d2a88b3b126530a1358651369a (diff) | |
| download | bitcoin-d6e700e40f861ddd6743f4d13f0d6f6bc19093c2.tar.xz | |
Merge #15248: rpc: Compile on GCC4.8
fa5f890aeb rpc: Compile on GCC4.8 (MarcoFalke)
Pull request description:
GCC 4.8 is lacking some C++11 signatures (see "Adjust C++11 signatures to take a const_iterator." in GCC 4.9: https://github.com/gcc-mirror/gcc/commit/3d2b2f494d78e0f4168d2c7ba5a76c05b4f4af71)
Fix that by changing the code to use the pre-GCC 4.9 signature.
Can be reverted after #13356.
Fixes #15172 (reports on `Linux Mint 17.3 Rosa` and `CentOS Linux release 7.5.1804 (Core)`)
Tree-SHA512: 0c0b18968270ad4fcd0c2000c57485be881a461135dac3ad0bdab22c1a2292cf6b28ebeb930ccaa0290ff20ce87547fd07ab8189c4c4fb54d652a3d0bc9615f8
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index edaf64f3e1..00187931e7 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2018 The Bitcoin Core developers +// Copyright (c) 2009-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -51,7 +51,7 @@ struct RPCCommandExecution explicit RPCCommandExecution(const std::string& method) { LOCK(g_rpc_server_info.mutex); - it = g_rpc_server_info.active_commands.insert(g_rpc_server_info.active_commands.cend(), {method, GetTimeMicros()}); + it = g_rpc_server_info.active_commands.insert(g_rpc_server_info.active_commands.end(), {method, GetTimeMicros()}); } ~RPCCommandExecution() { |