[libcxx-commits] [PATCH] D105905: [libcxx] [test] Fix experimental/memory.resource.adaptor.mem/db_deallocate on Windows

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo updated this revision to Diff 358360.
mstorsjo added a comment.

Rebase past CI config changes


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D105905/new/

https://reviews.llvm.org/D105905

Files:
  libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp


Index: libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp
===================================================================
--- libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp
+++ libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp
@@ -14,8 +14,6 @@
 
 // T* polymorphic_allocator<T>::deallocate(T*, size_t size)
 
-// XFAIL: LIBCXX-WINDOWS-FIXME
-
 int AssertCount = 0;
 
 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (void)::AssertCount++)
@@ -38,13 +36,8 @@
     ex::resource_adaptor<Alloc> r(Alloc{P});
     ex::memory_resource & m1 = r;
 
-#ifdef __STDCPP_DEFAULT_NEW_ALIGNMENT__
-    std::size_t maxSize = std::numeric_limits<std::size_t>::max()
-                            - __STDCPP_DEFAULT_NEW_ALIGNMENT__;
-#else
     std::size_t maxSize = std::numeric_limits<std::size_t>::max()
                             - alignof(std::max_align_t);
-#endif
 
     m1.deallocate(nullptr, maxSize);
     assert(AssertCount == 0);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D105905.358360.patch
Type: text/x-patch
Size: 1122 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210713/401d2ab1/attachment-0001.bin>