Merge remote-tracking branch 'singu/master'

2013-04-30 20:43:40 +02:00
parent 0c7e62ab59 e1df1b98f7
commit 60a47b8915
39 changed files with 502 additions and 296 deletions
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -203,7 +203,6 @@ inline T* get_ptr_in_map(const std::map<K,T*>& inmap, const K& key)
 template <typename K, typename T>
 inline bool is_in_map(const std::map<K,T>& inmap, const K& key)
 {
-	typedef typename std::map<K,T>::const_iterator map_iter;
 	if(inmap.find(key) == inmap.end())
 	{
 		return false;