Update include/mumble/Connection.hpp

Co-authored-by: Robert Adam <[email protected]>
mumble-voip · Mar 12, 2023 · a357013 · a357013
1 parent 82b660b
commit a357013
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/mumble/Connection.hpp b/include/mumble/Connection.hpp
@@ -62,7 +62,7 @@ class MUMBLE_EXPORT Connection : NonCopyable {
 		const BufViewConst data, const bool wait = true, const std::function< bool() > halt = []() { return false; });
 
 private:
-	[[nodiscard]] std::lock_guard<std::recursive_mutex> make_lock() {
+	[[nodiscard]] std::lock_guard<std::recursive_mutex> lock() {
 		return std::lock_guard<std::recursive_mutex>(m_mutex);
 	}
 

diff --git a/src/Connection.cpp b/src/Connection.cpp
@@ -35,7 +35,7 @@ Connection::operator bool() const {
 }
 
 Code Connection::operator()(const Feedback &feedback, const std::function< bool() > halt) {
-	auto guard = make_lock();
+	auto guard = lock();
 
 	if (!m_p->m_monitorIn.add(m_p->m_handle, true, false) || !m_p->m_monitorOut.add(m_p->m_handle, false, true)) {
 		return Code::Failure;
@@ -89,7 +89,7 @@ Cert::Chain Connection::peerCert() const {
 }
 
 bool Connection::setCert(const Cert::Chain &cert, const Key &key) {
-	auto guard = make_lock();
+	auto guard = lock();
 
 	return m_p->setCert(cert, key);
 }
@@ -100,7 +100,7 @@ Code Connection::process(const bool wait, const std::function< bool() > halt) {
 	using Pack      = tcp::Pack;
 	using Type      = Message::Type;
 
-	auto guard = make_lock();
+	auto guard = lock();
 	do {
 		NetHeader header;
 		auto code = m_p->read({ reinterpret_cast< std::byte * >(&header), sizeof(header) }, wait, halt);
@@ -137,7 +137,7 @@ Code Connection::process(const bool wait, const std::function< bool() > halt) {
 }
 
 Code Connection::write(const BufViewConst data, const bool wait, const std::function< bool() > halt) {
-	auto guard = make_lock();
+	auto guard = lock();
 
 	return m_p->write(data, wait, halt);
 }