diff --git a/indra/llcommon/llhandle.h b/indra/llcommon/llhandle.h
index 570cd330b87ff228e33f938da79ef184c1a41f32..78f2a2441f24c93dde43367d17389bc2bb3534e8 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 594d02b2cba4f26e75a70e65337b5feb127be522..e009694c5774e513c5ab68d0b67e52faa39edf3f 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 76e5e3125dfb44a8b8af4bffa6617eea3a0cee02..4cff22f31f9d59ab1bd7aa929b07dfb08e2e57e6 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