From d0e90ea0cf8f6881bf2b1f9a407e5eea57ccca3d Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 4 Jan 2016 13:38:13 -0800 Subject: MAINT-5976: On Linux builds do not specify explict for bool conversion operator. --- indra/llcommon/llcoros.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3