livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove C++11 erase() 

replace = NULL with .reset() on smart pointers.
meow-7.2.2
Rider Linden 2015-04-29 09:11:27 -07:00
parent 39d6252926
commit 56d6e32b45
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llmediadataclient.cpp
View File

@ -153,7 +153,8 @@ void mark_dead_and_remove_if(T &c, const PredicateMatchRequest &matchPred)
if (matchPred(*it))
{
(*it)->markDead();
it = c.erase(it);
// *TDOO: When C++11 is in change the following line to: it = c.erase(it);
c.erase(it++);
}
else
{
@ -271,7 +272,7 @@ LLMediaDataClient::Request::ptr_t LLMediaDataClient::dequeue()
else
{
// Don't return this request -- it's not ready to be serviced.
request = NULL;
request.reset();
}
}
@ -467,7 +468,7 @@ BOOL LLMediaDataClient::RetryTimer::tick()
}
// Release the ref to the request.
mRequest = NULL;
mRequest.reset()
// Don't fire again
return TRUE;

6
indra/newview/llmediadataclient.h
View File

@ -297,9 +297,9 @@ private:
bool mQueueTimerIsRunning;
template <typename T> friend typename T::iterator find_matching_request(T &c, const LLMediaDataClient::Request *request, LLMediaDataClient::Request::Type match_type);
template <typename T> friend typename T::iterator find_matching_request(T &c, const LLUUID &id, LLMediaDataClient::Request::Type match_type);
template <typename T> friend void remove_matching_requests(T &c, const LLUUID &id, LLMediaDataClient::Request::Type match_type);
// template <typename T> friend typename T::iterator find_matching_request(T &c, const LLMediaDataClient::Request *request, LLMediaDataClient::Request::Type match_type);
// template <typename T> friend typename T::iterator find_matching_request(T &c, const LLUUID &id, LLMediaDataClient::Request::Type match_type);
// template <typename T> friend void remove_matching_requests(T &c, const LLUUID &id, LLMediaDataClient::Request::Type match_type);
};
// MediaDataClient specific for the ObjectMedia cap