Initialize use_tls_ variable in the constructor for consistency

wesnoth · Mar 18, 2021 · b2cf60b · b2cf60b
1 parent 5005edd
commit b2cf60b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/network_asio.cpp b/src/network_asio.cpp
@@ -65,6 +65,7 @@ connection::connection(const std::string& host, const std::string& service)
 	, host_(host)
 	, service_(service)
 	, resolver_(io_context_)
+	, use_tls_(true)
 	, socket_(raw_socket(new raw_socket::element_type{io_context_}))
 	, done_(false)
 	, write_buf_()

diff --git a/src/network_asio.hpp b/src/network_asio.hpp
@@ -134,7 +134,7 @@ class connection
 	typedef std::unique_ptr<boost::asio::ip::tcp::socket> raw_socket;
 	typedef std::unique_ptr<boost::asio::ssl::stream<raw_socket::element_type>> tls_socket;
 	typedef utils::variant<raw_socket, tls_socket> any_socket;
-	bool use_tls_ = true;
+	bool use_tls_;
 	any_socket socket_;
 
 	bool done_;

diff --git a/src/wesnothd_connection.cpp b/src/wesnothd_connection.cpp
@@ -63,6 +63,7 @@ wesnothd_connection::wesnothd_connection(const std::string& host, const std::str
 	, tls_context_(boost::asio::ssl::context::sslv23)
 	, host_(host)
 	, service_(service)
+	, use_tls_(true)
 	, socket_(raw_socket{ new raw_socket::element_type{io_context_} })
 	, last_error_()
 	, last_error_mutex_()

diff --git a/src/wesnothd_connection.hpp b/src/wesnothd_connection.hpp
@@ -147,7 +147,7 @@ class wesnothd_connection
 	typedef std::unique_ptr<boost::asio::ip::tcp::socket> raw_socket;
 	typedef std::unique_ptr<boost::asio::ssl::stream<raw_socket::element_type>> tls_socket;
 	typedef utils::variant<raw_socket, tls_socket> any_socket;
-	bool use_tls_ = true;
+	bool use_tls_;
 	any_socket socket_;
 
 	boost::system::error_code last_error_;