Skip to content

Commit

Permalink
Merge pull request #1271 from FireDaemon/issues/#1270
Browse files Browse the repository at this point in the history
Fixed compiler warning/error about braces around scalar initializer
  • Loading branch information
trueqbit authored Apr 17, 2024
2 parents 4ba4cea + 92b1a98 commit 50cb629
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dev/alias.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ namespace sqlite_orm {

using C1 =
std::conditional_t<std::is_same<O, aliased_type>::value, F O::*, column_pointer<aliased_type, F O::*>>;
return alias_column_t<A, C1>{{field}};
return alias_column_t<A, C1>{C1{field}};
}

#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
Expand Down
2 changes: 1 addition & 1 deletion include/sqlite_orm/sqlite_orm.h
Original file line number Diff line number Diff line change
Expand Up @@ -5237,7 +5237,7 @@ namespace sqlite_orm {

using C1 =
std::conditional_t<std::is_same<O, aliased_type>::value, F O::*, column_pointer<aliased_type, F O::*>>;
return alias_column_t<A, C1>{{field}};
return alias_column_t<A, C1>{C1{field}};
}

#ifdef SQLITE_ORM_WITH_CPP20_ALIASES
Expand Down

0 comments on commit 50cb629

Please sign in to comment.