Commit | Line | Data |
---|---|---|
6ba4eca2 RW |
1 | This patch was downloaded from https://sft.its.cern.ch/jira/browse/ROOT-7047. |
2 | It fixes the build of clang 3.5 with GCC 5. File paths have been adjusted. | |
3 | ||
4 | From 00f3ed6eee41da871799ad0fd19153c7682d61fe Mon Sep 17 00:00:00 2001 | |
5 | From: Alexander Klimov <alserkli@inbox.ru> | |
6 | Date: Mon, 26 Jan 2015 18:45:23 +0200 | |
7 | Subject: [PATCH] [ADT/IntrusiveRefCntPtr] Give friend access to | |
8 | IntrusiveRefCntPtr<X> so the relevant move constructor can | |
9 | access 'Obj'. | |
10 | ||
11 | From LLVM upstream: | |
12 | Author: Argyrios Kyrtzidis <akyrtzi@gmail.com> | |
13 | Date: Tue Sep 23 06:06:43 2014 +0000 | |
14 | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218295 91177308-0d34-0410-b5e6-96231b3b80d8 | |
15 | --- | |
16 | interpreter/llvm/src/include/llvm/ADT/IntrusiveRefCntPtr.h | 3 +++ | |
17 | 1 file changed, 3 insertions(+) | |
18 | ||
19 | diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h | |
20 | index f9df378..c859c98 100644 | |
21 | --- a/include/llvm/ADT/IntrusiveRefCntPtr.h | |
22 | +++ b/include/llvm/ADT/IntrusiveRefCntPtr.h | |
23 | @@ -197,6 +197,9 @@ public: | |
24 | private: | |
25 | void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); } | |
26 | void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); } | |
27 | + | |
28 | + template <typename X> | |
29 | + friend class IntrusiveRefCntPtr; | |
30 | }; | |
31 | ||
32 | template<class T, class U> | |
33 | -- | |
34 | 1.7.10.4 | |
35 |