From f28f00c654c44a2762cb4a702a9ad9377cdadf3b Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sun, 20 Jun 2021 21:10:54 +0200 Subject: [PATCH] Userland: Disambiguate dependent types Clang produced an error on these pieces of code without the `typename` keyword. --- Userland/Libraries/LibIPC/ClientConnection.h | 2 +- Userland/Libraries/LibIPC/ServerConnection.h | 2 +- Userland/Services/RequestServer/HttpCommon.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibIPC/ClientConnection.h b/Userland/Libraries/LibIPC/ClientConnection.h index bb72a6f633..de0bf0798b 100644 --- a/Userland/Libraries/LibIPC/ClientConnection.h +++ b/Userland/Libraries/LibIPC/ClientConnection.h @@ -22,7 +22,7 @@ class ClientConnection : public Connection , public ClientEndpoint::template Proxy { public: using ServerStub = typename ServerEndpoint::Stub; - using IPCProxy = ClientEndpoint::template Proxy; + using IPCProxy = typename ClientEndpoint::template Proxy; ClientConnection(ServerStub& stub, NonnullRefPtr socket, int client_id) : IPC::Connection(stub, move(socket)) diff --git a/Userland/Libraries/LibIPC/ServerConnection.h b/Userland/Libraries/LibIPC/ServerConnection.h index 9cfa75523b..fcdf247173 100644 --- a/Userland/Libraries/LibIPC/ServerConnection.h +++ b/Userland/Libraries/LibIPC/ServerConnection.h @@ -16,7 +16,7 @@ class ServerConnection : public IPC::Connection , public ServerEndpoint::template Proxy { public: using ClientStub = typename ClientEndpoint::Stub; - using IPCProxy = ServerEndpoint::template Proxy; + using IPCProxy = typename ServerEndpoint::template Proxy; ServerConnection(ClientStub& local_endpoint, const StringView& address) : Connection(local_endpoint, Core::LocalSocket::construct()) diff --git a/Userland/Services/RequestServer/HttpCommon.h b/Userland/Services/RequestServer/HttpCommon.h index a79a6fbce8..9a3eb81ce5 100644 --- a/Userland/Services/RequestServer/HttpCommon.h +++ b/Userland/Services/RequestServer/HttpCommon.h @@ -55,8 +55,8 @@ void init(TSelf* self, TJob job) template OwnPtr start_request(TBadgedProtocol&& protocol, ClientConnection& client, const String& method, const URL& url, const HashMap& headers, ReadonlyBytes body, TPipeResult&& pipe_result) { - using TJob = TBadgedProtocol::Type::JobType; - using TRequest = TBadgedProtocol::Type::RequestType; + using TJob = typename TBadgedProtocol::Type::JobType; + using TRequest = typename TBadgedProtocol::Type::RequestType; if (pipe_result.is_error()) { return {};