summaryrefslogtreecommitdiff
path: root/indra/llcommon/llstl.h
diff options
context:
space:
mode:
authorAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-10-16 02:29:45 +0300
committerAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-10-16 02:29:45 +0300
commita30a2045f56909586aff5cb74a1e85dd010ad1ae (patch)
tree9595f6d812a79319e32eca2e83aee9e2defc1ae5 /indra/llcommon/llstl.h
parent9a24b487e2e0407d4bde6091eae020acb543b741 (diff)
parentc1e3f778cb377999edf49764088f3f23a2302afc (diff)
Merge
--HG-- branch : develop
Diffstat (limited to 'indra/llcommon/llstl.h')
-rwxr-xr-xindra/llcommon/llstl.h4
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
}