[PATCH] D48896: [libcxx][c++17] P0083R5: Splicing Maps and Sets Part 2: merge

[Erik Pilkington via Phabricator via cfe-commits]

erik.pilkington updated this revision to Diff 156912.
erik.pilkington added a comment.

In this new patch:

- Rebase on top of changes in https://reviews.llvm.org/D46845
- Move in some forward decls that I accidentally left in https://reviews.llvm.org/D46845
- Add some missing visibility attributes
- Add `merge` to header summaries


https://reviews.llvm.org/D48896

Files:
  libcxx/include/__hash_table
  libcxx/include/__tree
  libcxx/include/map
  libcxx/include/set
  libcxx/include/unordered_map
  libcxx/include/unordered_set
  libcxx/test/std/containers/associative/map/map.modifiers/merge.pass.cpp
  libcxx/test/std/containers/associative/multimap/multimap.modifiers/merge.pass.cpp
  libcxx/test/std/containers/associative/multiset/merge.pass.cpp
  libcxx/test/std/containers/associative/set/merge.pass.cpp
  libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
  libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
  libcxx/test/std/containers/unord/unord.multiset/merge.pass.cpp
  libcxx/test/std/containers/unord/unord.set/merge.pass.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48896.156912.patch
Type: text/x-patch
Size: 70284 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180723/3f04ddd0/attachment-0001.bin>