Skip to content

Ci fixes #256

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
merged 2 commits into from
May 25, 2025
Merged

Ci fixes #256

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
0b8e46f
test: fix printable_test.cc and cista_members_test.cc
khng300 May 25, 2025
aba278e
to_tuple_works_v: fix missing std::is_union check
khng300 May 24, 2025
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
7 changes: 4 additions & 3 deletions include/cista/reflection/to_tuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ auto to_ptrs(T&& t) {

template <typename T>
inline constexpr auto to_tuple_works_v =
detail::has_cista_members_v<T> || (std::is_aggregate_v<T> &&
detail::has_cista_members_v<T> ||
(std::is_aggregate_v<T> &&
#if !defined(_MSC_VER) || defined(NDEBUG)
std::is_standard_layout_v<T> &&
std::is_standard_layout_v<T> &&
#endif
!std::is_polymorphic_v<T>);
!std::is_polymorphic_v<T> && !std::is_union_v<T>);

template <typename T,
std::enable_if_t<detail::has_cista_members_v<T> && std::is_const_v<T>,
Expand Down
2 changes: 1 addition & 1 deletion test/cista_members_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace cista_members_printable {

struct x {};
struct a : public x {
CISTA_PRINTABLE(a)
CISTA_PRINTABLE(a, )
auto cista_members() noexcept { return std::tie(a_, b_, c_); }
int a_{1}, b_{2}, c_{3};
};
Expand Down
2 changes: 1 addition & 1 deletion test/printable_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace {
enum class Color : int { RED, BLUE, GREEN };

struct a {
CISTA_PRINTABLE(a)
CISTA_PRINTABLE(a, )
int i_ = 1;
int j_ = 2;
double d_ = 100.0;
Expand Down