Skip to content

Commit 85f1d31

Browse files
kazutakahirataSquallATF
authored andcommitted
[lldb] Fix warnings
This patch fixes: lldb/tools/lldb-dap/lldb-dap.cpp:5184:9: error: 'scoped_lock' may not intend to support class template argument deduction [-Werror,-Wctad-maybe-unsupported] lldb/tools/lldb-dap/lldb-dap.cpp:5200:7: error: 'unique_lock' may not intend to support class template argument deduction [-Werror,-Wctad-maybe-unsupported] lldb/tools/lldb-dap/lldb-dap.cpp:5222:5: error: 'scoped_lock' may not intend to support class template argument deduction [-Werror,-Wctad-maybe-unsupported] lldb/tools/lldb-dap/lldb-dap.cpp:5236:3: error: 'unique_lock' may not intend to support class template argument deduction [-Werror,-Wctad-maybe-unsupported]
1 parent 1995dbd commit 85f1d31

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lldb/tools/lldb-dap/lldb-dap.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5181,7 +5181,7 @@ serveConnection(const Socket::SocketProtocol &protocol, const std::string &name,
51815181
RegisterRequestCallbacks(dap);
51825182

51835183
{
5184-
std::scoped_lock lock(dap_sessions_mutex);
5184+
std::scoped_lock<std::mutex> lock(dap_sessions_mutex);
51855185
dap_sessions[sock.get()] = &dap;
51865186
}
51875187

@@ -5197,7 +5197,7 @@ serveConnection(const Socket::SocketProtocol &protocol, const std::string &name,
51975197
<< " client closed: " << name << "\n";
51985198
}
51995199

5200-
std::unique_lock lock(dap_sessions_mutex);
5200+
std::unique_lock<std::mutex> lock(dap_sessions_mutex);
52015201
dap_sessions.erase(sock.get());
52025202
std::notify_all_at_thread_exit(dap_sessions_condition, std::move(lock));
52035203
});
@@ -5219,7 +5219,7 @@ serveConnection(const Socket::SocketProtocol &protocol, const std::string &name,
52195219

52205220
bool client_failed = false;
52215221
{
5222-
std::scoped_lock lock(dap_sessions_mutex);
5222+
std::scoped_lock<std::mutex> lock(dap_sessions_mutex);
52235223
for (auto [sock, dap] : dap_sessions) {
52245224
auto error = dap->Disconnect();
52255225
if (error.Fail()) {
@@ -5233,7 +5233,7 @@ serveConnection(const Socket::SocketProtocol &protocol, const std::string &name,
52335233
}
52345234

52355235
// Wait for all clients to finish disconnecting.
5236-
std::unique_lock lock(dap_sessions_mutex);
5236+
std::unique_lock<std::mutex> lock(dap_sessions_mutex);
52375237
dap_sessions_condition.wait(lock, [&] { return dap_sessions.empty(); });
52385238

52395239
if (client_failed)

0 commit comments

Comments
 (0)