summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-12-10 12:20:33 -0500
committerNat Goodspeed <nat@lindenlab.com>2014-12-10 12:20:33 -0500
commit0f1cf6e40542e0992f6988e67b75b2f74ba4142b (patch)
tree50162e7e35521ba07c186679a9f9e2172657305f
parent3d94afafb530b9841c151a24799a08f064b70ede (diff)
Clarify for VS 2013 that an operator bool() method returns bool.
For some reason VS 2013 (unlike its predecessors and other current compilers) needs us to explicitly convert an operator bool() method's return expression to bool. :-P
-rwxr-xr-xindra/llcommon/lleventcoro.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h
index f55b74ac7e..abbeeaa373 100755
--- a/indra/llcommon/lleventcoro.h
+++ b/indra/llcommon/lleventcoro.h
@@ -67,7 +67,7 @@ public:
LLEventPumpOrPumpName() {}
operator LLEventPump& () const { return *mPump; }
LLEventPump& getPump() const { return *mPump; }
- operator bool() const { return mPump; }
+ operator bool() const { return bool(mPump); }
bool operator!() const { return ! mPump; }
private: