diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-02-06 00:34:15 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-02-06 00:34:15 -0800 |
| commit | a62f7dc5734b71b1468ffe26acfae9d800961064 (patch) | |
| tree | 9eda2679463057bf92ba95f9417965b46453f521 | |
| parent | Merge pull request #6178 (diff) | |
| parent | epee: reorder a couple init list fields to match declaration (diff) | |
| download | monero-a62f7dc5734b71b1468ffe26acfae9d800961064.tar.xz | |
Merge pull request #6182
e896cca8 epee: reorder a couple init list fields to match declaration (moneromooo-monero)
| -rw-r--r-- | contrib/epee/include/net/net_helper.h | 2 | ||||
| -rw-r--r-- | contrib/epee/src/http_auth.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/include/net/net_helper.h b/contrib/epee/include/net/net_helper.h index 81545e502..9446e3588 100644 --- a/contrib/epee/include/net/net_helper.h +++ b/contrib/epee/include/net/net_helper.h @@ -103,8 +103,8 @@ namespace net_utils blocked_mode_client() : m_io_service(), 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_connector(direct_connect{}), m_ssl_options(epee::net_utils::ssl_support_t::e_ssl_support_autodetect), m_initialized(true), m_connected(false), diff --git a/contrib/epee/src/http_auth.cpp b/contrib/epee/src/http_auth.cpp index 289069daa..5f4907cc2 100644 --- a/contrib/epee/src/http_auth.cpp +++ b/contrib/epee/src/http_auth.cpp @@ -584,8 +584,8 @@ namespace explicit server_parameters(const auth_message& request, const DigestIter& digest) : nonce(request.nonce) , opaque(request.opaque) - , stale(request.stale) , realm(request.realm) + , stale(request.stale) , value_generator() , index(boost::fusion::distance(boost::fusion::begin(digest_algorithms), digest)) { |