diff options
author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llthread.h | |
parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz |
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llcommon/llthread.h')
-rw-r--r-- | linden/indra/llcommon/llthread.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h index ed76a3b..98d64ef 100644 --- a/linden/indra/llcommon/llthread.h +++ b/linden/indra/llcommon/llthread.h | |||
@@ -43,7 +43,7 @@ class LLThread; | |||
43 | class LLMutex; | 43 | class LLMutex; |
44 | class LLCondition; | 44 | class LLCondition; |
45 | 45 | ||
46 | class LLThread | 46 | class LL_COMMON_API LLThread |
47 | { | 47 | { |
48 | public: | 48 | public: |
49 | typedef enum e_thread_status | 49 | typedef enum e_thread_status |
@@ -125,7 +125,7 @@ protected: | |||
125 | 125 | ||
126 | //============================================================================ | 126 | //============================================================================ |
127 | 127 | ||
128 | class LLMutex | 128 | class LL_COMMON_API LLMutex |
129 | { | 129 | { |
130 | public: | 130 | public: |
131 | LLMutex(apr_pool_t *apr_poolp); // NULL pool constructs a new pool for the mutex | 131 | LLMutex(apr_pool_t *apr_poolp); // NULL pool constructs a new pool for the mutex |
@@ -145,7 +145,7 @@ protected: | |||
145 | }; | 145 | }; |
146 | 146 | ||
147 | // Actually a condition/mutex pair (since each condition needs to be associated with a mutex). | 147 | // Actually a condition/mutex pair (since each condition needs to be associated with a mutex). |
148 | class LLCondition : public LLMutex | 148 | class LL_COMMON_API LLCondition : public LLMutex |
149 | { | 149 | { |
150 | public: | 150 | public: |
151 | LLCondition(apr_pool_t *apr_poolp); // Defaults to global pool, could use the thread pool as well. | 151 | LLCondition(apr_pool_t *apr_poolp); // Defaults to global pool, could use the thread pool as well. |
@@ -159,7 +159,7 @@ protected: | |||
159 | apr_thread_cond_t *mAPRCondp; | 159 | apr_thread_cond_t *mAPRCondp; |
160 | }; | 160 | }; |
161 | 161 | ||
162 | class LLMutexLock | 162 | class LL_COMMON_API LLMutexLock |
163 | { | 163 | { |
164 | public: | 164 | public: |
165 | LLMutexLock(LLMutex* mutex) | 165 | LLMutexLock(LLMutex* mutex) |
@@ -192,7 +192,7 @@ void LLThread::unlockData() | |||
192 | 192 | ||
193 | // see llmemory.h for LLPointer<> definition | 193 | // see llmemory.h for LLPointer<> definition |
194 | 194 | ||
195 | class LLThreadSafeRefCount | 195 | class LL_COMMON_API LLThreadSafeRefCount |
196 | { | 196 | { |
197 | public: | 197 | public: |
198 | static void initThreadSafeRefCount(); // creates sMutex | 198 | static void initThreadSafeRefCount(); // creates sMutex |
@@ -244,7 +244,7 @@ private: | |||
244 | 244 | ||
245 | // Simple responder for self destructing callbacks | 245 | // Simple responder for self destructing callbacks |
246 | // Pure virtual class | 246 | // Pure virtual class |
247 | class LLResponder : public LLThreadSafeRefCount | 247 | class LL_COMMON_API LLResponder : public LLThreadSafeRefCount |
248 | { | 248 | { |
249 | protected: | 249 | protected: |
250 | virtual ~LLResponder(); | 250 | virtual ~LLResponder(); |