diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:25:49 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:25:49 +0300 |
| commit | 358b29060fc3caf8de212985b17686b4460cc6d9 (patch) | |
| tree | 8921d2d219d4d4443aaafc9cfe98daa9760d780f /indra/llcommon/llstl.h | |
| parent | c84fe50f18d39adf1bb712927a71628d343781d0 (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
Merge downstream code, version 3.8.5
Diffstat (limited to 'indra/llcommon/llstl.h')
| -rwxr-xr-x | indra/llcommon/llstl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h index 02f10fa2ba..0435cb8a08 100755 --- a/indra/llcommon/llstl.h +++ b/indra/llcommon/llstl.h @@ -27,6 +27,7 @@ #ifndef LL_LLSTL_H #define LL_LLSTL_H +#include "stdtypes.h" #include <functional> #include <algorithm> #include <map> @@ -272,6 +273,7 @@ inline T get_if_there(const std::map<K,T>& inmap, const K& key, T default_value) } }; +// Useful for replacing the removeObj() functionality of LLDynamicArray // Example: // for (std::vector<T>::iterator iter = mList.begin(); iter != mList.end(); ) // { @@ -530,7 +532,7 @@ bool before(const std::type_info* lhs, const std::type_info* rhs) return strcmp(lhs->name(), rhs->name()) < 0; #else // not Linux, or gcc 4.4+ // Just use before(), as we normally would - return lhs->before(*rhs); + return lhs->before(*rhs) ? true : false; #endif } |