9a198e8ef4
* chore: bump chromium in DEPS to 0476932294da8809a19189b9f54cee11d50cc512 * update chromium patches (#20838) * chore: bump chromium in DEPS to 838863f5ec9e8a12132a10bb47be8382ad9756a7 * IsRendererTransferNeededForNavigation went away https://chromium-review.googlesource.com/c/chromium/src/+/1867031 * [arraybuffer] Move the ArrayBuffer implementation from wtf to core https://chromium-review.googlesource.com/c/chromium/src/+/1875731 * URLLoaderRequest new mojo types * context menu enums moved around https://chromium-review.googlesource.com/c/chromium/src/+/1872004 https://chromium-review.googlesource.com/c/chromium/src/+/1876088 https://chromium-review.googlesource.com/c/chromium/src/+/1866520 * chore: bump chromium in DEPS to dc9525d251bf30828899e4cd7161f6dc6507023f * update chromium patches * [WIP] Convert network hints IPC to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/1881967 * jumbo build is no longer supported https://chromium-review.googlesource.com/c/chromium/src/+/1881967 * fix disable-color-correct-rendering * [FIXME] fix printing patch compiles but prob doesn't work * explicitly include ax_enums https://chromium-review.googlesource.com/c/chromium/src/+/1759821 * fixup! [WIP] Convert network hints IPC to Mojo * fix base::span * fix AsarURLLoader to not double-std::move * fix debug build * fix msstl patch * lint * more fix msstl * mooooore fix msstl * fix compile * update backport_fix_msstl_compat_in_ui_events.patch * update msstl compat patch * don't try to build chrome's prefetch predictor * build: fix compilation on windows * Fixup patches for MAS build * Free up disk space for mac debug builds * fix: apply custom site instance only for main frame * Fixup from rebase * Try not generating symbols for mac debug builds * Remove double entry of patch * FIx compile errors * Trigger CI * Set symbol_level to 1 for mac debug builds
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Wed, 30 Oct 2019 16:26:29 -0700
|
|
Subject: fix ambiguous reference to 'data'
|
|
|
|
Upstreamed: https://chromium-review.googlesource.com/c/chromium/src/+/1891762
|
|
|
|
diff --git a/base/containers/span.h b/base/containers/span.h
|
|
index 2c402495a960f348275b7f925ca5dcdbf691ff7a..0faa4ad502d3982293f4faa50525a2340dbf2abd 100644
|
|
--- a/base/containers/span.h
|
|
+++ b/base/containers/span.h
|
|
@@ -498,7 +498,7 @@ template <size_t N,
|
|
decltype(base::data(std::declval<Container&>()))>,
|
|
typename = internal::EnableIfSpanCompatibleContainer<Container&, T>>
|
|
constexpr span<T, N> make_span(Container& container) noexcept {
|
|
- return span<T, N>(data(container), size(container));
|
|
+ return span<T, N>(base::data(container), base::size(container));
|
|
}
|
|
|
|
template <
|
|
@@ -509,7 +509,7 @@ template <
|
|
decltype(base::data(std::declval<const Container&>()))>,
|
|
typename = internal::EnableIfSpanCompatibleContainer<const Container&, T>>
|
|
constexpr span<T, N> make_span(const Container& container) noexcept {
|
|
- return span<T, N>(data(container), size(container));
|
|
+ return span<T, N>(base::data(container), base::size(container));
|
|
}
|
|
|
|
template <int&... ExplicitArgumentBarrier, typename T, size_t X>
|