From 5c6fd64594261d0cbd1fd5975cc5eee104b7b98c Mon Sep 17 00:00:00 2001 From: 5cript Date: Sat, 23 Nov 2024 21:52:20 +0100 Subject: [PATCH 1/2] Removed duplicate keys --- .clang-format | 3 --- 1 file changed, 3 deletions(-) diff --git a/.clang-format b/.clang-format index 1cba5ea8..a1b3a2e2 100644 --- a/.clang-format +++ b/.clang-format @@ -1,11 +1,9 @@ #AlignAfterOpenBracket: BlockIndent AlignAfterOpenBracket: AlwaysBreak AlignEscapedNewlines: DontAlign -AlignOperands: true AlignTrailingComments: false AllowAllArgumentsOnNextLine: true AllowAllConstructorInitializersOnNextLine: false -AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: Empty AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: None @@ -36,7 +34,6 @@ BraceWrapping: SplitEmptyFunction: false SplitEmptyNamespace: true SplitEmptyRecord: false -AlignEscapedNewlines: DontAlign BreakConstructorInitializers: BeforeComma BreakInheritanceList: BeforeComma BreakStringLiterals: true From f233448d36334c6c7536d3d085c9e36d25c29906 Mon Sep 17 00:00:00 2001 From: 5cript Date: Sat, 23 Nov 2024 21:52:44 +0100 Subject: [PATCH 2/2] Removed incorrect template keywords. --- include/roar/session/session.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/roar/session/session.hpp b/include/roar/session/session.hpp index a24ef4ef..eea89ced 100644 --- a/include/roar/session/session.hpp +++ b/include/roar/session/session.hpp @@ -599,7 +599,7 @@ namespace Roar auto request = Request(self->req_.release(), std::move(self->originalExtensions_)); try { - self->promise_->template resolve(Detail::ref(*self->session_), Detail::cref(request)); + self->promise_->resolve(Detail::ref(*self->session_), Detail::cref(request)); } catch (std::exception const& exc) { @@ -635,7 +635,7 @@ namespace Roar { try { - self->promise_->template resolve( + self->promise_->resolve( Detail::ref(*self->session_), Detail::cref(self->req_), self); } catch (std::exception const& exc)