Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Struct: fix is_constexpr check in constexpr functions (#8798)

Browse Source 
Capturing the info parameter pack explicitly is required for the
is_constexpr check to work.

Add some basic tests.

Fixes #8789.
This commit is contained in:
Peter Johnson
2026-04-24 09:02:27 -06:00
committed by GitHub
parent d893d44e37
commit 5703f608d7
2 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpiutil/src/main/native/include/wpi/util/struct/Struct.hpp
View File

@@ -314,7 +314,7 @@ template <typename T, typename... I>
constexpr auto GetStructTypeString(const I&... info) {
using S = Struct<T, typename std::remove_cvref_t<I>...>;
if constexpr (sizeof...(I) == 0 &&
is_constexpr([&] { S::GetTypeName(info...); })) {
is_constexpr([&info...] { S::GetTypeName(info...); })) {
constexpr auto typeName = S::GetTypeName(info...);
using namespace literals;
return Concat(
@@ -344,7 +344,7 @@ template <typename T, size_t N, typename... I>
constexpr auto MakeStructArrayTypeName(const I&... info) {
using S = Struct<T, typename std::remove_cvref_t<I>...>;
if constexpr (sizeof...(I) == 0 &&
is_constexpr([&] { S::GetTypeName(info...); })) {
is_constexpr([&info...] { S::GetTypeName(info...); })) {
constexpr auto typeName = S::GetTypeName(info...);
using namespace literals;
if constexpr (N == std::dynamic_extent) {
@@ -370,7 +370,7 @@ template <typename T, size_t N, typename... I>
constexpr auto MakeStructArrayTypeString(const I&... info) {
using S = Struct<T, typename std::remove_cvref_t<I>...>;
if constexpr (sizeof...(I) == 0 &&
is_constexpr([&] { S::GetTypeName(info...); })) {
is_constexpr([&info...] { S::GetTypeName(info...); })) {
using namespace literals;
return Concat("struct:"_ct_string, MakeStructArrayTypeName<T, N>(info...));
} else {
@@ -383,7 +383,7 @@ template <typename T, size_t N, typename... I>
constexpr auto MakeStructArraySchema(const I&... info) {
using S = Struct<T, typename std::remove_cvref_t<I>...>;
if constexpr (sizeof...(I) == 0 &&
is_constexpr([&] { S::GetSchema(info...); })) {
is_constexpr([&info...] { S::GetSchema(info...); })) {
constexpr auto schema = S::GetSchema(info...);
using namespace literals;
if constexpr (N == std::dynamic_extent) {