diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
| commit | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch) | |
| tree | d2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/llcommon/llapp.h | |
| parent | f14888b6166f91533e778e94701b74a9639ebefd (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge 6.2.2
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 |