Skip to content

Fix/remove template #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5cript merged 2 commits into from
Nov 23, 2024
Merged

Fix/remove template #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6fd64
Removed duplicate keys
5cript Nov 23, 2024
f233448
Removed incorrect template keywords.
5cript Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -36,7 +34,6 @@ BraceWrapping:
SplitEmptyFunction: false
SplitEmptyNamespace: true
SplitEmptyRecord: false
AlignEscapedNewlines: DontAlign
BreakConstructorInitializers: BeforeComma
BreakInheritanceList: BeforeComma
BreakStringLiterals: true
Expand Down
4 changes: 2 additions & 2 deletions include/roar/session/session.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ namespace Roar
auto request = Request<BodyT>(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)
{
Expand Down Expand Up @@ -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)
Expand Down
Loading