aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-11-25 19:13:05 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-11-25 19:27:54 +0000
commite896cca86e20ed49abcb4d9cd4a966fd66f28fba (patch)
tree097104c33958a8174ecc0f095f650754257780fa /contrib
parentMerge pull request #6097 (diff)
downloadmonero-e896cca86e20ed49abcb4d9cd4a966fd66f28fba.tar.xz
epee: reorder a couple init list fields to match declaration
This is a bug waiting to happen
Diffstat (limited to '')
-rw-r--r--contrib/epee/include/net/net_helper.h2
-rw-r--r--contrib/epee/src/http_auth.cpp2
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))
{