[Scummvm-cvs-logs] scummvm-tools master -> 36cb68919303bc2b874a5faa879e269a35874eff
lordhoto
lordhoto at gmail.com
Sat Nov 3 21:58:01 CET 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
36cb689193 TOOLS: Fix decompiler compilation with gcc 4.7.
Commit: 36cb68919303bc2b874a5faa879e269a35874eff
https://github.com/scummvm/scummvm-tools/commit/36cb68919303bc2b874a5faa879e269a35874eff
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-11-03T13:57:08-07:00
Commit Message:
TOOLS: Fix decompiler compilation with gcc 4.7.
Changed paths:
decompiler/refcounted.h
diff --git a/decompiler/refcounted.h b/decompiler/refcounted.h
index a496ff7..f4d9020 100644
--- a/decompiler/refcounted.h
+++ b/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(RefCounted *p);
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.
+ friend void ::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods.
protected:
RefCounted() : _refCount(0) { }
virtual ~RefCounted() { }
};
-namespace boost {
-
/**
* Add a reference to a pointer.
*/
@@ -61,6 +57,4 @@ inline void intrusive_ptr_release(RefCounted *p) {
delete p;
}
-} // End of namespace boost
-
#endif
More information about the Scummvm-git-logs
mailing list