diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
commit | 0d596aa4de2f583862274350ce6287c0ed8c2bec (patch) | |
tree | 90a6ca5b29d5c99b585233d059e16dccc23a2e19 /indra/llcommon/llapp.h | |
parent | 70aa89f708254c47766f4629e9131ea492829129 (diff) | |
parent | 85b431d5137886927efef35ca558bc8a998a5212 (diff) |
Automated merge with file:///Users/nat/linden/viewer-gridselect
Diffstat (limited to 'indra/llcommon/llapp.h')
-rw-r--r-- | indra/llcommon/llapp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index acd829d864..245c73e3a2 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -30,9 +30,8 @@ #include <map> #include "llrun.h" #include "llsd.h" +#include <atomic> // Forward declarations -template <typename Type> class LLAtomic32; -typedef LLAtomic32<U32> LLAtomicU32; class LLErrorThread; class LLLiveFile; #if LL_LINUX |