diff options
| author | Richard Linden <none@none> | 2013-05-30 19:00:08 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-30 19:00:08 -0700 |
| commit | ae6763f7fcfbe52ea1b04c25603ac2305beafb9d (patch) | |
| tree | fffe67ae8ce06af0e2c4ef0f874d140623efaa66 /indra/llcommon/llthreadlocalstorage.h | |
| parent | ee0087709afe05a9fe38e3da743421faead9e02f (diff) | |
| parent | ae355188327515d53b9c15c27ed576829fce3668 (diff) | |
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.sszl0v\ssh__richard@hg.lindenlab.com_richard_viewer-interesting_kkjl59.hg
Diffstat (limited to 'indra/llcommon/llthreadlocalstorage.h')
| -rw-r--r-- | indra/llcommon/llthreadlocalstorage.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llcommon/llthreadlocalstorage.h b/indra/llcommon/llthreadlocalstorage.h index 471784749b..cc67248124 100644 --- a/indra/llcommon/llthreadlocalstorage.h +++ b/indra/llcommon/llthreadlocalstorage.h @@ -313,11 +313,6 @@ template<typename DERIVED_TYPE> class LLThreadLocalSingletonPointer { public: - void operator =(DERIVED_TYPE* value) - { - setInstance(value); - } - LL_FORCE_INLINE static DERIVED_TYPE* getInstance() { #if LL_DARWIN @@ -328,7 +323,7 @@ public: #endif } - LL_FORCE_INLINE static void setInstance(DERIVED_TYPE* instance) + static void setInstance(DERIVED_TYPE* instance) { #if LL_DARWIN createTLSKey(); @@ -339,6 +334,7 @@ public: } private: + #if LL_WINDOWS static __declspec(thread) DERIVED_TYPE* sInstance; #elif LL_LINUX |