gemrb: Infinity Engine emulator
The branch master has been updated
via 85b7b69927218e7e2091919176553b367c405a5b (commit)
Summary of changes:
gemrb/core/Holder.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
from da17b0685a26790f4b7f029b4a841bc543578ca0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=85b7b69927218e7e2091919176553b367c405a5b
commit 85b7b69927218e7e2091919176553b367c405a5b
Author: Tom Prince <tom.prince@...>
Date: Mon May 24 04:46:04 2010 -0400
Holder: Fix 'operator bool'.
Signed-off-by: Tom Prince <tom.prince@...>
diff --git a/gemrb/core/Holder.h b/gemrb/core/Holder.h
index 3ef7e2f..912560c 100644
--- a/gemrb/core/Holder.h
+++ b/gemrb/core/Holder.h
@@ -76,8 +76,8 @@ public:
T& operator*() const { return *ptr; }
T* operator->() const { return ptr; }
bool operator!() const { return !ptr; }
- // FIXME: coerces to int
- operator bool() const { return ptr; }
+ // Copied from boost/smart_ptr/detail/operator_bool.hpp
+ operator T* Holder<T>::*() const { return ptr == NULL ? NULL : &Holder<T>::ptr; }
T* get() const { return ptr; }
void release() {
if (ptr)
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|