Skip to content
Snippets Groups Projects
Commit b0ba682e authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

We haz c++11 now, do make comments happen

parent 1ca3d4eb
Branches
Tags
No related merge requests found
...@@ -272,7 +272,7 @@ class LLCheckedHandle: public LLCheckedHandleBase ...@@ -272,7 +272,7 @@ class LLCheckedHandle: public LLCheckedHandleBase
* Converts the LLCheckedHandle to a bool. Allows for if (chkdHandle) {} * Converts the LLCheckedHandle to a bool. Allows for if (chkdHandle) {}
* Does not throw. * 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); return (mHandle.get() != NULL);
} }
......
...@@ -162,8 +162,7 @@ class LLPounceable: public boost::noncopyable ...@@ -162,8 +162,7 @@ class LLPounceable: public boost::noncopyable
operator T () const { return mHeld; } operator T () const { return mHeld; }
typename boost::remove_pointer<T>::type operator*() const { return *mHeld; } typename boost::remove_pointer<T>::type operator*() const { return *mHeld; }
typename boost::call_traits<T>::value_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; } bool operator!() const { return ! mHeld; }
// support both assignment (dumb ptr idiom) and reset() (smart ptr) // support both assignment (dumb ptr idiom) and reset() (smart ptr)
......
...@@ -154,7 +154,6 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred) ...@@ -154,7 +154,6 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred)
if (matchPred(*it)) if (matchPred(*it))
{ {
(*it)->markDead(); (*it)->markDead();
// *TDOO: When C++11 is in change the following line to: it = c.erase(it);
c.erase(it++); c.erase(it++);
} }
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment