diff options
| author | joerg <joerg@pkgsrc.org> | 2012-11-16 00:51:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-11-16 00:51:35 +0000 |
| commit | c95a5a500021e835156fda0f03c10f90a4f373bf (patch) | |
| tree | 0ffc403d004a53da77a6022c26fb98a01d22e4db /games | |
| parent | 8b5d4357e6de7fa1374167b0819e0f95a8a6ee04 (diff) | |
| download | pkgsrc-c95a5a500021e835156fda0f03c10f90a4f373bf.tar.gz | |
Accessor functions must not be in boost namespace as they are used too
early.
Diffstat (limited to 'games')
| -rw-r--r-- | games/scummvm-tools/distinfo | 3 | ||||
| -rw-r--r-- | games/scummvm-tools/patches/patch-decompiler_refcounted.h | 41 |
2 files changed, 43 insertions, 1 deletions
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo index 183319c2e37..1a53aed4a26 100644 --- a/games/scummvm-tools/distinfo +++ b/games/scummvm-tools/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2012/08/18 07:42:28 marino Exp $ +$NetBSD: distinfo,v 1.5 2012/11/16 00:51:35 joerg Exp $ SHA1 (scummvm-tools-1.4.0.tar.bz2) = 44a422872180f8aea3eb57e0462d930e22c533ba RMD160 (scummvm-tools-1.4.0.tar.bz2) = baabb1d8fb99be72c5eafb186aa132b797edc58d Size (scummvm-tools-1.4.0.tar.bz2) = 943697 bytes SHA1 (patch-configure) = cf5da2584ec2fa05fb81faa115f8de0616dd04f7 +SHA1 (patch-decompiler_refcounted.h) = 509b95e42fa52a1f2c1892dbcfae829a9b7c92f6 diff --git a/games/scummvm-tools/patches/patch-decompiler_refcounted.h b/games/scummvm-tools/patches/patch-decompiler_refcounted.h new file mode 100644 index 00000000000..e023fbc1415 --- /dev/null +++ b/games/scummvm-tools/patches/patch-decompiler_refcounted.h @@ -0,0 +1,41 @@ +$NetBSD: patch-decompiler_refcounted.h,v 1.1 2012/11/16 00:51:36 joerg Exp $ + +--- decompiler/refcounted.h.orig 2012-11-15 15:46:47.000000000 +0000 ++++ decompiler/refcounted.h +@@ -25,10 +25,8 @@ + + class RefCounted; + +-namespace boost { + inline void intrusive_ptr_add_ref(RefCounted *p); + inline void intrusive_ptr_release(RefCounted *p); +-} // End of namespace boost + + /** + * Provides a base implementation of reference counting for use with boost::intrusive_ptr. +@@ -36,16 +34,14 @@ inline void intrusive_ptr_release(RefCou + class RefCounted { + private: + long _refCount; ///< Reference count used for boost::intrusive_ptr. +- friend void ::boost::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace. +- friend void ::boost::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace. ++ friend void ::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace. ++ friend void ::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace. + + protected: + RefCounted() : _refCount(0) { } + virtual ~RefCounted() { } + }; + +-namespace boost { +- + /** + * Add a reference to a pointer. + */ +@@ -61,6 +57,4 @@ inline void intrusive_ptr_release(RefCou + delete p; + } + +-} // End of namespace boost +- + #endif |