mirror of
https://github.com/monero-project/monero.git
synced 2026-08-03 01:15:55 -07:00
Fix boost <1.60 compilation and fix boost 1.73+ warnings
This commit is contained in:
@@ -43,7 +43,6 @@
|
||||
#include <algorithm>
|
||||
#include <cstdio>
|
||||
#include <fstream>
|
||||
#include <boost/iostreams/copy.hpp>
|
||||
#include <atomic>
|
||||
|
||||
#include "common/command_line.h"
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <algorithm>
|
||||
#include <cstdio>
|
||||
#include <fstream>
|
||||
#include <boost/iostreams/copy.hpp>
|
||||
#include <atomic>
|
||||
|
||||
#include "common/command_line.h"
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "string_tools.h"
|
||||
#include "storages/portable_storage_template_helper.h" // epee json include
|
||||
#include "serialization/keyvalue_serialization.h"
|
||||
#include <functional>
|
||||
#include <vector>
|
||||
|
||||
using namespace epee;
|
||||
@@ -133,11 +134,9 @@ namespace cryptonote
|
||||
//---------------------------------------------------------------------------
|
||||
uint64_t checkpoints::get_max_height() const
|
||||
{
|
||||
std::map< uint64_t, crypto::hash >::const_iterator highest =
|
||||
std::max_element( m_points.begin(), m_points.end(),
|
||||
( boost::bind(&std::map< uint64_t, crypto::hash >::value_type::first, boost::placeholders::_1) <
|
||||
boost::bind(&std::map< uint64_t, crypto::hash >::value_type::first, boost::placeholders::_2 ) ) );
|
||||
return highest->first;
|
||||
if (m_points.empty())
|
||||
return 0;
|
||||
return m_points.rbegin()->first;
|
||||
}
|
||||
//---------------------------------------------------------------------------
|
||||
const std::map<uint64_t, crypto::hash>& checkpoints::get_points() const
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <boost/endian/conversion.hpp>
|
||||
#include <boost/asio/io_service.hpp>
|
||||
#include <boost/asio/ip/udp.hpp>
|
||||
@@ -711,7 +712,7 @@ namespace trezor{
|
||||
// Start the asynchronous operation itself. The handle_receive function
|
||||
// used as a callback will update the ec and length variables.
|
||||
m_socket->async_receive_from(boost::asio::buffer(buffer), m_endpoint,
|
||||
boost::bind(&UdpTransport::handle_receive, boost::placeholders::_1, boost::placeholders::_2, &ec, &length));
|
||||
std::bind(&UdpTransport::handle_receive, std::placeholders::_1, std::placeholders::_2, &ec, &length));
|
||||
|
||||
// Block until the asynchronous operation has completed.
|
||||
do {
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
// IP blocking adapted from Boolberry
|
||||
|
||||
#include <algorithm>
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/bind/bind.hpp>
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
#include <boost/optional/optional.hpp>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/asio/ip/address.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
#include <functional>
|
||||
#include "common/command_line.h"
|
||||
#include "common/i18n.h"
|
||||
#include "hex.h"
|
||||
@@ -221,7 +221,7 @@ namespace cryptonote
|
||||
|
||||
std::vector<std::string> access_control_origins;
|
||||
boost::split(access_control_origins, access_control_origins_input, boost::is_any_of(","));
|
||||
std::for_each(access_control_origins.begin(), access_control_origins.end(), boost::bind(&boost::trim<std::string>, _1, std::locale::classic()));
|
||||
std::for_each(access_control_origins.begin(), access_control_origins.end(), std::bind(&boost::trim<std::string>, std::placeholders::_1, std::locale::classic()));
|
||||
config.access_control_origins = std::move(access_control_origins);
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,11 @@
|
||||
*
|
||||
* \brief Source file that defines simple_wallet class.
|
||||
*/
|
||||
|
||||
// use boost bind placeholders for now
|
||||
#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
#include <locale.h>
|
||||
#include <thread>
|
||||
#include <iostream>
|
||||
|
||||
@@ -947,7 +947,7 @@ uint32_t get_subaddress_clamped_sum(uint32_t idx, uint32_t extra)
|
||||
|
||||
static void setup_shim(hw::wallet_shim * shim, tools::wallet2 * wallet)
|
||||
{
|
||||
shim->get_tx_pub_key_from_received_outs = boost::bind(&tools::wallet2::get_tx_pub_key_from_received_outs, wallet, _1);
|
||||
shim->get_tx_pub_key_from_received_outs = std::bind(&tools::wallet2::get_tx_pub_key_from_received_outs, wallet, std::placeholders::_1);
|
||||
}
|
||||
|
||||
bool get_pruned_tx(const cryptonote::COMMAND_RPC_GET_TRANSACTIONS::entry &entry, cryptonote::transaction &tx, crypto::hash &tx_hash)
|
||||
|
||||
Reference in New Issue
Block a user