Oops, fix instancetracker. Sync LLAtomic, since it's so close already.

Author: LiruMouse

indra/llcommon/llatomic.h

@@ -27,68 +27,17 @@
 
 #pragma once
 
+#include "stdtypes.h"
 #define LL_BOOST_ATOMICS 1
 
-//Internal definitions
-#define NEEDS_APR_ATOMICS do_not_define_manually_thanks
-#undef NEEDS_APR_ATOMICS
-
-//Prefer boost over stl over apr.
-
 #if LL_BOOST_ATOMICS
-#include <boost/version.hpp>
 #include <boost/atomic.hpp>
 template<typename Type>
-struct impl_atomic_type { typedef boost::atomic<Type> type; };
+using LLAtomic32 = boost::atomic<Type>;
 #elif LL_STD_ATOMICS
 #include <atomic>
 template<typename Type>
-struct impl_atomic_type { typedef std::atomic<Type> type; };
-#else
-#include "apr_atomic.h"
-#define NEEDS_APR_ATOMICS
-template <typename Type> class LLAtomic32
-{
-public:
-	LLAtomic32(void) { }
-	LLAtomic32(LLAtomic32 const& atom) { apr_uint32_t data = apr_atomic_read32(const_cast<apr_uint32_t*>(&atom.mData)); apr_atomic_set32(&mData, data); }
-	LLAtomic32(Type x) { apr_atomic_set32(&mData, static_cast<apr_uint32_t>(x)); }
-	LLAtomic32& operator=(LLAtomic32 const& atom) { apr_uint32_t data = apr_atomic_read32(const_cast<apr_uint32_t*>(&atom.mData)); apr_atomic_set32(&mData, data); return *this; }
-
-	operator Type() const { apr_uint32_t data = apr_atomic_read32(const_cast<apr_uint32_t*>(&mData)); return static_cast<Type>(data); }
-	void operator=(Type x) { apr_atomic_set32(&mData, static_cast<apr_uint32_t>(x)); }
-	void operator-=(Type x) { apr_atomic_sub32(&mData, static_cast<apr_uint32_t>(x)); }
-	void operator+=(Type x) { apr_atomic_add32(&mData, static_cast<apr_uint32_t>(x)); }
-	Type operator++(int) { return apr_atomic_inc32(&mData); } // Type++
-	Type operator++() { return apr_atomic_inc32(&mData); } // ++Type
-	Type operator--(int) { return apr_atomic_dec32(&mData); } // Type--
-	Type operator--() { return apr_atomic_dec32(&mData); } // --Type
-	
-private:
-	apr_uint32_t mData;
-};
-#endif
-#if !defined(NEEDS_APR_ATOMICS)
-template <typename Type> class LLAtomic32
-{
-public:
-	LLAtomic32(void) { }
-	LLAtomic32(LLAtomic32 const& atom) { mData = Type(atom.mData); }
-	LLAtomic32(Type x) { mData = x; }
-	LLAtomic32& operator=(LLAtomic32 const& atom) { mData = Type(atom.mData); return *this; }
-
-	operator Type() const { return mData; }
-	void operator=(Type x) { mData = x; }
-	void operator-=(Type x) { mData -= x; }
-	void operator+=(Type x) { mData += x; }
-	Type operator++(int) { return mData++; } // Type++
-	Type operator++() { return ++mData; } // ++Type
-	Type operator--(int) { return mData--; } // Type--
-	Type operator--() { return --mData; } // --Type
-
-private:
-	typename impl_atomic_type<Type>::type mData;
-};
+using LLAtomic32 = std::atomic<Type>;
 #endif
 
 typedef LLAtomic32<U32> LLAtomicU32;

indra/llcommon/llinstancetracker.cpp

@@ -27,6 +27,8 @@
 #include "linden_common.h"
 // associated header
 #include "llinstancetracker.h"
+#include "llapr.h"
+
 // STL headers
 // std headers
 // external library headers

indra/llcommon/llinstancetracker.h

@@ -79,6 +79,7 @@ class LLInstanceTracker : public LLInstanceTrackerBase
 {
 	typedef LLInstanceTracker<T, KEY> self_t;
 	typedef typename std::multimap<KEY, T*> InstanceMap;
+	typedef typename InstanceMap::iterator::difference_type difference_type;
 	struct StaticData: public StaticBase
 	{
 		InstanceMap sMap;