livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge.

master
Nicky 2018-04-21 23:41:25 +02:00
parent bfd9e72dc8 23354f2617
commit 328dd553d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llapr.h
View File

@ -196,7 +196,7 @@ private:
};
// ND: Typedefs for specialized versions. Using std::atomic_(u)int32_t to get the optimzed implementation.
#ifndef LL_LINUX
#ifdef LL_WINDOWS
typedef LLAtomicBase<U32, std::atomic_uint32_t> LLAtomicU32;
typedef LLAtomicBase<S32, std::atomic_int32_t> LLAtomicS32;
#else

2
indra/llcommon/llinstancetracker.h
View File

@ -120,7 +120,7 @@ protected:
void decrementDepth();
U32 getDepth();
private:
#ifndef LL_LINUX
#ifdef LL_WINDOWS
std::atomic_uint32_t sIterationNestDepth;
#else
std::atomic_uint sIterationNestDepth;