Skip to content

[core] Disable R__SIZEDDELETE definition for macOS 26 beta #19010

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 1 commit into from
Jun 16, 2025
Merged

[core] Disable R__SIZEDDELETE definition for macOS 26 beta #19010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 5 deletions core/foundation/inc/ROOT/RConfig.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,11 +341,8 @@
# endif
#endif

#if defined(__GLIBCXX__) && !defined(__cpp_sized_deallocation)
// Sized global deallocation functions in libstc++ are only enabled if
// __cpp_sized_deallocation is defined, which Clang only does if explicitly
// passed -fsized-deallocation.
#else
#ifdef __cpp_sized_deallocation
// Sized global deallocation functions are only enabled if __cpp_sized_deallocation is defined.
# define R__SIZEDDELETE
#endif

Expand Down
13 changes: 10 additions & 3 deletions roottest/root/meta/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,16 @@ configure_file(typelist_win32.v6.cxx17.txt . COPYONLY)
ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST}
EXCLUDE runMemberComments runautoload)
ROOTTEST_ADD_TEST(runMemberComments
MACRO runMemberComments.C
OUTREF MemberComments${ref_suffix})
if(APPLE)
# Ref file with no new operator delete(void *, size_t)
ROOTTEST_ADD_TEST(runMemberComments
MACRO runMemberComments.C
OUTREF MemberComments_macos.ref)
else()
ROOTTEST_ADD_TEST(runMemberComments
MACRO runMemberComments.C
OUTREF MemberComments${ref_suffix})
endif()

if(NOT MSVC OR win_broken_tests)
ROOTTEST_ADD_TEST(drawing
Expand Down
Loading
Loading