Skip to content

Commit 5e67744

Browse files
committed
[core] Simplify the define of R__SIZEDDELETE
libc++ now honors the feature flag `__cpp_sized_deallocation` Ref: llvm/llvm-project@ef804d8
1 parent 9093b47 commit 5e67744

File tree

3 files changed

+662
-8
lines changed

3 files changed

+662
-8
lines changed

core/foundation/inc/ROOT/RConfig.hxx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,8 @@
341341
# endif
342342
#endif
343343

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

roottest/root/meta/CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,16 @@ configure_file(typelist_win32.v6.cxx17.txt . COPYONLY)
5252
ROOTTEST_ADD_AUTOMACROS(DEPENDS ANSTmpltInt.C TmpltInt0.C TmpltInt1.C TmpltFloat.C
5353
TmpltNoSpec.C Event.cxx ${COMPILE_MACRO_TEST}
5454
EXCLUDE runMemberComments runautoload)
55-
ROOTTEST_ADD_TEST(runMemberComments
56-
MACRO runMemberComments.C
57-
OUTREF MemberComments${ref_suffix})
55+
if(APPLE)
56+
# Ref file with no new operator delete(void *, size_t)
57+
ROOTTEST_ADD_TEST(runMemberComments
58+
MACRO runMemberComments.C
59+
OUTREF MemberComments_macos.ref)
60+
elif()
61+
ROOTTEST_ADD_TEST(runMemberComments
62+
MACRO runMemberComments.C
63+
OUTREF MemberComments${ref_suffix})
64+
endif()
5865

5966
if(NOT MSVC OR win_broken_tests)
6067
ROOTTEST_ADD_TEST(drawing

0 commit comments

Comments
 (0)