From b0ba682e6ed0ee1114411af2c91c1357c95eaea4 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 9 Sep 2020 15:51:47 -0400
Subject: [PATCH] We haz c++11 now, do make comments happen
---
indra/llcommon/llhandle.h | 2 +-
indra/llcommon/llpounceable.h | 3 +--
indra/newview/llmediadataclient.cpp | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/llhandle.h b/indra/llcommon/llhandle.h
index 570cd330b87..78f2a2441f2 100644
--- a/indra/llcommon/llhandle.h
+++ b/indra/llcommon/llhandle.h
@@ -272,7 +272,7 @@ class LLCheckedHandle: public LLCheckedHandleBase
* Converts the LLCheckedHandle to a bool. Allows for if (chkdHandle) {}
* Does not throw.
*/
- /*explicit*/ operator bool() const // explicit conversion operator not available with Linux compiler
+ explicit operator bool() const // explicit conversion operator not available with Linux compiler
{
return (mHandle.get() != NULL);
}
diff --git a/indra/llcommon/llpounceable.h b/indra/llcommon/llpounceable.h
index 594d02b2cba..e009694c577 100644
--- a/indra/llcommon/llpounceable.h
+++ b/indra/llcommon/llpounceable.h
@@ -162,8 +162,7 @@ class LLPounceable: public boost::noncopyable
operator T () const { return mHeld; }
typename boost::remove_pointer<T>::type operator*() const { return *mHeld; }
typename boost::call_traits<T>::value_type operator->() const { return mHeld; }
- // uncomment 'explicit' as soon as we allow C++11 compilation
- /*explicit*/ operator bool() const { return bool(mHeld); }
+ explicit operator bool() const { return bool(mHeld); }
bool operator!() const { return ! mHeld; }
// support both assignment (dumb ptr idiom) and reset() (smart ptr)
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
index 76e5e3125df..4cff22f31f9 100644
--- a/indra/newview/llmediadataclient.cpp
+++ b/indra/newview/llmediadataclient.cpp
@@ -154,7 +154,6 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred)
if (matchPred(*it))
{
(*it)->markDead();
- // *TDOO: When C++11 is in change the following line to: it = c.erase(it);
c.erase(it++);
}
else
--
GitLab