rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 01:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6182

Browse source 
e896cca8 epee: reorder a couple init list fields to match declaration (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-06 00:34:15 -08:00
commit a62f7dc573
No known key found for this signature in database
GPG key ID: C64552D877C32479
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/include/net/net_helper.h
View file

@ -103,8 +103,8 @@ namespace net_utils
blocked_mode_client() : blocked_mode_client() :
m_io_service(), m_io_service(),
m_ctx(boost::asio::ssl::context::tlsv12), m_ctx(boost::asio::ssl::context::tlsv12),
m_connector(direct_connect{}),
m_ssl_socket(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_service, m_ctx)), m_ssl_socket(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_service, m_ctx)),
m_connector(direct_connect{}),
m_ssl_options(epee::net_utils::ssl_support_t::e_ssl_support_autodetect), m_ssl_options(epee::net_utils::ssl_support_t::e_ssl_support_autodetect),
m_initialized(true), m_initialized(true),
m_connected(false), m_connected(false),

2
contrib/epee/src/http_auth.cpp
View file

@ -584,8 +584,8 @@ namespace
explicit server_parameters(const auth_message& request, const DigestIter& digest) explicit server_parameters(const auth_message& request, const DigestIter& digest)
: nonce(request.nonce) : nonce(request.nonce)
, opaque(request.opaque) , opaque(request.opaque)
, stale(request.stale)
, realm(request.realm) , realm(request.realm)
, stale(request.stale)
, value_generator() , value_generator()
, index(boost::fusion::distance(boost::fusion::begin(digest_algorithms), digest)) , index(boost::fusion::distance(boost::fusion::begin(digest_algorithms), digest))
{ {