From faf55f7020dbfdef6d29e0d29eadee9d60a522f5 Mon Sep 17 00:00:00 2001 From: Saran Tunyasuvunakool Date: Fri, 13 Feb 2026 11:42:57 -0800 Subject: [PATCH] Fix header_test.cc. C++ standard says the argument to alignof must be a type. Clang and GCC are permissive but MSVC isn't. PiperOrigin-RevId: 869823902 Change-Id: I7e113ce62a60cc9be499e8580846a5258deea001 --- test/header_test.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/header_test.cc b/test/header_test.cc index 0c6ba253..98cae8ca 100644 --- a/test/header_test.cc +++ b/test/header_test.cc @@ -344,25 +344,29 @@ TEST_F(HeaderTest, MjVisualFields) { static_assert(alignof(mjVisual) == alignof(ExpectedMjVisual)); static_assert(sizeof(mjVisual::global) == sizeof(ExpectedMjVisual::global)); - static_assert(alignof(mjVisual::global) == alignof(ExpectedMjVisual::global)); + static_assert(alignof(decltype(mjVisual::global)) == + alignof(decltype(ExpectedMjVisual::global))); static_assert(sizeof(mjVisual::quality) == sizeof(ExpectedMjVisual::quality)); - static_assert(alignof(mjVisual::quality) == - alignof(ExpectedMjVisual::quality)); + static_assert(alignof(decltype(mjVisual::quality)) == + alignof(decltype(ExpectedMjVisual::quality))); static_assert(sizeof(mjVisual::headlight) == sizeof(ExpectedMjVisual::headlight)); - static_assert(alignof(mjVisual::headlight) == - alignof(ExpectedMjVisual::headlight)); + static_assert(alignof(decltype(mjVisual::headlight)) == + alignof(decltype(ExpectedMjVisual::headlight))); static_assert(sizeof(mjVisual::map) == sizeof(ExpectedMjVisual::map)); - static_assert(alignof(mjVisual::map) == alignof(ExpectedMjVisual::map)); + static_assert(alignof(decltype(mjVisual::map)) == + alignof(decltype(ExpectedMjVisual::map))); static_assert(sizeof(mjVisual::scale) == sizeof(ExpectedMjVisual::scale)); - static_assert(alignof(mjVisual::scale) == alignof(ExpectedMjVisual::scale)); + static_assert(alignof(decltype(mjVisual::scale)) == + alignof(decltype(ExpectedMjVisual::scale))); static_assert(sizeof(mjVisual::rgba) == sizeof(ExpectedMjVisual::rgba)); - static_assert(alignof(mjVisual::rgba) == alignof(ExpectedMjVisual::rgba)); + static_assert(alignof(decltype(mjVisual::rgba)) == + alignof(decltype(ExpectedMjVisual::rgba))); } TEST_F(HeaderTest, MjModelIntsOrdered) {