diff options
author | Rider Linden <rider@lindenlab.com> | 2016-01-04 13:38:13 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-01-04 13:38:13 -0800 |
commit | d0e90ea0cf8f6881bf2b1f9a407e5eea57ccca3d (patch) | |
tree | 2f94c82591cda15f719ca801f5359644347c3cc9 /indra | |
parent | 38f4019752a987a2aa0b3fa355c53560509abc84 (diff) |
MAINT-5976: On Linux builds do not specify explict for bool conversion operator.
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/llcommon/llcoros.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h index f2fb7f1e70..39316ed0e6 100755 --- a/indra/llcommon/llcoros.h +++ b/indra/llcommon/llcoros.h @@ -260,7 +260,10 @@ public: return boost::dcoroutines::make_callback(mFuture); } - explicit operator bool() const +#ifndef LL_LINUX + explicit +#endif + operator bool() const { return bool(mFuture); } |