blob: 011f6a2d45854927dbde868e7a90944910a17454 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc
@@ -398,8 +398,11 @@ class RetryingFetcherImpl final : public DeferredFetch
// Not copyable.
RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
-
+#if defined(__clang__) && (__clang_major__ >= 15)
void Start(ProtoFetcher<Response>::Callback callback) override {
+#else
+ void Start(typename ProtoFetcher<Response>::Callback callback) override {
+#endif
callback_ = std::move(callback);
Retry();
}
@@ -435,7 +438,11 @@ class RetryingFetcherImpl final : public DeferredFetch
}
// Client callback.
+#if defined(__clang__) && (__clang_major__ >= 15)
ProtoFetcher<Response>::Callback callback_;
+#else
+ typename ProtoFetcher<Response>::Callback callback_;
+#endif
// Retry controls.
base::OneShotTimer timer_;
@@ -578,7 +585,11 @@ ParallelFetchManager<Request, Response>::ParallelFetch
template <typename Request, typename Response>
void ParallelFetchManager<Request, Response>::Fetch(
const Request& request,
+#if defined(__clang__) && (__clang_major__ >= 15)
Fetcher::Callback callback) {
+#else
+ typename Fetcher::Callback callback) {
+#endif
CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
KeyType key = requests_in_flight_.Add(MakeFetcher(request));
requests_in_flight_.Lookup(key)->Start(
|
