[libcxx-commits] [PATCH] D101613: [libcxx] Reenable ranges for clang-cl

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo created this revision.
mstorsjo added a reviewer: cjdb.
mstorsjo requested review of this revision.
Herald added a project: libc++.
Herald added a reviewer: libc++.

This reverts a224bf8ec423b42eea251407e7a6cc8398a5edf4 <https://reviews.llvm.org/rGa224bf8ec423b42eea251407e7a6cc8398a5edf4> and fixes the
underlying issue.

The underlying issue is simply that MSVC headers contains a define
like "#define __in", where __in is one macro in the MSVC Source
Code Annotation Language, defined in sal.h

Just use a different variable name than "__in"
__indirectly_readable_impl, and add "__in" to nasty_macros.h just
like the existing __out.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D101613

Files:
  libcxx/include/__config
  libcxx/include/__iterator/concepts.h
  libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_bidirectional_iterator.compile.pass.cpp
  libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_forward_iterator.compile.pass.cpp
  libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_input_iterator.compile.pass.cpp
  libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_iterator.compile.pass.cpp
  libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/legacy_random_access_iterator.compile.pass.cpp
  libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/locale_dependent.compile.pass.cpp
  libcxx/test/std/containers/associative/map/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/associative/multimap/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/associative/multiset/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/associative/set/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/sequences/array/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/sequences/deque/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/sequences/forwardlist/forwardlist.iter/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/sequences/list/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/sequences/vector.bool/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/sequences/vector/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/unord/unord.map/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/unord/unord.multimap/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/unord/unord.multiset/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/unord/unord.set/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/containers/views/enable_borrowed_range.compile.pass.cpp
  libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/input.output/filesystems/class.directory_iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
  libcxx/test/std/iterators/iterator.primitives/iterator.traits/iter_reference_t.compile.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.assoc.types/incrementable.traits/incrementable_traits.compile.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.assoc.types/incrementable.traits/iter_difference_t.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.assoc.types/readable.traits/indirectly_readable_traits.compile.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.assoc.types/readable.traits/iter_value_t.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.readable/indirectly_readable.compile.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.writable/indirectly_writable.compile.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.nodiscard.verify.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_move.pass.cpp
  libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.move/iter_rvalue_reference_t.pass.cpp
  libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/predef.iterators/reverse.iterators/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/stream.iterators/istream.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/stream.iterators/istreambuf.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/stream.iterators/ostream.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/iterators/stream.iterators/ostreambuf.iterator/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/ranges/range.range/enable_borrowed_range.compile.pass.cpp
  libcxx/test/std/re/re.iter/re.regiter/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/re/re.iter/re.tokiter/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/strings/basic.string/string.iterators/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/strings/string.view/enable_borrowed_range.compile.pass.cpp
  libcxx/test/std/strings/string.view/string.view.iterators/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/utilities/function.objects/range.cmp/equal_to.pass.cpp
  libcxx/test/std/utilities/function.objects/range.cmp/greater.pass.cpp
  libcxx/test/std/utilities/function.objects/range.cmp/greater_equal.pass.cpp
  libcxx/test/std/utilities/function.objects/range.cmp/less.pass.cpp
  libcxx/test/std/utilities/function.objects/range.cmp/less_equal.pass.cpp
  libcxx/test/std/utilities/function.objects/range.cmp/not_equal_to.pass.cpp
  libcxx/test/std/utilities/memory/unique.ptr/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/std/utilities/optional/iterator_concept_conformance.compile.pass.cpp
  libcxx/test/support/nasty_macros.h

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D101613.341836.patch
Type: text/x-patch
Size: 35157 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210430/640746f2/attachment-0001.bin>