diff options
| author | Rider Linden <none@none> | 2015-04-29 09:11:27 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-29 09:11:27 -0700 |
| commit | 56d6e32b450c81829555a4cecfac6b96ce09ebdc (patch) | |
| tree | 994b44d305deaa92626e38a9186786a22af142e7 /indra/newview/llmediadataclient.h | |
| parent | 39d62529269d0e19ec3f43999b69e9c33ac748c2 (diff) | |
Remove C++11 erase()
replace = NULL with .reset() on smart pointers.
Diffstat (limited to 'indra/newview/llmediadataclient.h')
| -rwxr-xr-x | indra/newview/llmediadataclient.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h index 2c0aedb1d9..0b81a6ab22 100755 --- a/indra/newview/llmediadataclient.h +++ b/indra/newview/llmediadataclient.h @@ -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 |