[libcxx-commits] [PATCH] D154595: Revert "[libc++] Fix std::copy and std::move for ranges with potentially overlapping tail padding"

[Alexander Kornienko via Phabricator via libcxx-commits]

alexfh updated this revision to Diff 537667.
alexfh added a comment.

Fix conflict resolution in module map (hopefully) correctly.


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D154595

Files:
  libcxx/include/module.modulemap.in


Index: libcxx/include/module.modulemap.in
===================================================================
--- libcxx/include/module.modulemap.in
+++ libcxx/include/module.modulemap.in
@@ -1671,7 +1671,6 @@
     module conjunction                               { private header "__type_traits/conjunction.h" }
     module copy_cv                                   { private header "__type_traits/copy_cv.h" }
     module copy_cvref                                { private header "__type_traits/copy_cvref.h" }
-    module datasizeof                                { private header "__type_traits/datasizeof.h" }
     module decay                                     {
       private header "__type_traits/decay.h"
       export add_pointer


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D154595.537667.patch
Type: text/x-patch
Size: 744 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230706/9a0d501f/attachment.bin>