diff options
author | Chris Xiong <chirs241097@gmail.com> | 2021-10-14 19:01:18 -0400 |
---|---|---|
committer | Chris Xiong <chirs241097@gmail.com> | 2021-10-14 19:01:18 -0400 |
commit | 846cdbdbf965fc50478bcc4c6436e3dc6a489f3f (patch) | |
tree | 4a39385c982291a110f513871aba340f0a7a061e /www-client/chromium/files/chromium-96-template-friend.patch | |
download | ppo-846cdbdbf965fc50478bcc4c6436e3dc6a489f3f.tar.xz |
Initial commit.
Diffstat (limited to 'www-client/chromium/files/chromium-96-template-friend.patch')
-rw-r--r-- | www-client/chromium/files/chromium-96-template-friend.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-96-template-friend.patch b/www-client/chromium/files/chromium-96-template-friend.patch new file mode 100644 index 0000000..4b8a5e4 --- /dev/null +++ b/www-client/chromium/files/chromium-96-template-friend.patch @@ -0,0 +1,34 @@ +diff --git a/base/memory/safe_ref.h b/base/memory/safe_ref.h +index 7189f8786..162c6744f 100644 +--- a/base/memory/safe_ref.h ++++ b/base/memory/safe_ref.h +@@ -88,9 +88,10 @@ class SafeRef { + private: + template <typename U> + friend class SafeRef; +- friend SafeRef internal::MakeSafeRefFromWeakPtrInternals( ++ template <typename U> ++ friend SafeRef<U> internal::MakeSafeRefFromWeakPtrInternals( + const internal::WeakReference& ref, +- T* ptr); ++ U* ptr); + + // Construction from a from WeakPtr. Will CHECK() if the WeakPtr is already + // invalid. +diff --git a/base/memory/weak_ptr.h b/base/memory/weak_ptr.h +index 17f7b8f87..d042ecff2 100644 +--- a/base/memory/weak_ptr.h ++++ b/base/memory/weak_ptr.h +@@ -289,9 +289,10 @@ class WeakPtr : public internal::WeakPtrBase { + template <typename U> friend class WeakPtr; + friend class SupportsWeakPtr<T>; + friend class WeakPtrFactory<T>; +- friend SafeRef<T> internal::MakeSafeRefFromWeakPtrInternals( ++ template <typename U> ++ friend SafeRef<U> internal::MakeSafeRefFromWeakPtrInternals( + const internal::WeakReference& ref, +- T* ptr); ++ U* ptr); + + WeakPtr(const internal::WeakReference& ref, T* ptr) + : WeakPtrBase(ref, reinterpret_cast<uintptr_t>(ptr)) {} |