| 1 |
mr_bones_ 12/11/04 04:31:47 |
| 2 |
|
| 3 |
Added: scummvm-tools-1.4.0-boost.patch |
| 4 |
Log: |
| 5 |
add upstream patch to support building against latest boost (bug #422769) |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: scummvm-tools-1.4.0-boost.patch |
| 16 |
=================================================================== |
| 17 |
From 36cb68919303bc2b874a5faa879e269a35874eff Mon Sep 17 00:00:00 2001 |
| 18 |
From: Johannes Schickel <lordhoto@×××××××.org> |
| 19 |
Date: Sat, 3 Nov 2012 21:57:08 +0100 |
| 20 |
Subject: [PATCH] TOOLS: Fix decompiler compilation with gcc 4.7. |
| 21 |
|
| 22 |
--- |
| 23 |
decompiler/refcounted.h | 10 ++-------- |
| 24 |
1 file changed, 2 insertions(+), 8 deletions(-) |
| 25 |
|
| 26 |
diff --git a/decompiler/refcounted.h b/decompiler/refcounted.h |
| 27 |
index a496ff7..f4d9020 100644 |
| 28 |
--- a/decompiler/refcounted.h |
| 29 |
+++ b/decompiler/refcounted.h |
| 30 |
@@ -25,10 +25,8 @@ |
| 31 |
|
| 32 |
class RefCounted; |
| 33 |
|
| 34 |
-namespace boost { |
| 35 |
inline void intrusive_ptr_add_ref(RefCounted *p); |
| 36 |
inline void intrusive_ptr_release(RefCounted *p); |
| 37 |
-} // End of namespace boost |
| 38 |
|
| 39 |
/** |
| 40 |
* Provides a base implementation of reference counting for use with boost::intrusive_ptr. |
| 41 |
@@ -36,16 +34,14 @@ |
| 42 |
class RefCounted { |
| 43 |
private: |
| 44 |
long _refCount; ///< Reference count used for boost::intrusive_ptr. |
| 45 |
- friend void ::boost::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace. |
| 46 |
- friend void ::boost::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace. |
| 47 |
+ friend void ::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods. |
| 48 |
+ friend void ::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods. |
| 49 |
|
| 50 |
protected: |
| 51 |
RefCounted() : _refCount(0) { } |
| 52 |
virtual ~RefCounted() { } |
| 53 |
}; |
| 54 |
|
| 55 |
-namespace boost { |
| 56 |
- |
| 57 |
/** |
| 58 |
* Add a reference to a pointer. |
| 59 |
*/ |
| 60 |
@@ -61,6 +57,4 @@ inline void intrusive_ptr_release(RefCounted *p) { |
| 61 |
delete p; |
| 62 |
} |
| 63 |
|
| 64 |
-} // End of namespace boost |
| 65 |
- |
| 66 |
#endif |
| 67 |
-- |
| 68 |
1.7.10 |
Archives