diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:42:32 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-05-08 21:42:32 +0300 |
| commit | 28ddde936d1a43f6d702504f868ec3cc7ec4f60e (patch) | |
| tree | ccc06eb3ae7922442c7b9a970ff6689eb6bef9dc /indra/llcommon/llapp.h | |
| parent | 07f1c4c9c59c3b825a605dd9c695aae492bbf09c (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merged in lindenlab/viewer-release
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 |