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/llmemory.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/llmemory.h')
-rw-r--r-- | linden/indra/llcommon/llmemory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h index b5c0711..9aa4b85 100644 --- a/linden/indra/llcommon/llmemory.h +++ b/linden/indra/llcommon/llmemory.h | |||
@@ -45,7 +45,7 @@ const U32 LLREFCOUNT_SENTINEL_VALUE = 0xAAAAAAAA; | |||
45 | 45 | ||
46 | //---------------------------------------------------------------------------- | 46 | //---------------------------------------------------------------------------- |
47 | 47 | ||
48 | class LLMemory | 48 | class LL_COMMON_API LLMemory |
49 | { | 49 | { |
50 | public: | 50 | public: |
51 | static void initClass(); | 51 | static void initClass(); |
@@ -68,12 +68,12 @@ private: | |||
68 | 68 | ||
69 | //---------------------------------------------------------------------------- | 69 | //---------------------------------------------------------------------------- |
70 | 70 | ||
71 | class LLRefCount | 71 | class LL_COMMON_API LLRefCount |
72 | { | 72 | { |
73 | protected: | 73 | protected: |
74 | LLRefCount(const LLRefCount&); // not implemented | 74 | LLRefCount(const LLRefCount&); |
75 | private: | 75 | private: |
76 | LLRefCount&operator=(const LLRefCount&); // not implemented | 76 | LLRefCount&operator=(const LLRefCount&); |
77 | 77 | ||
78 | protected: | 78 | protected: |
79 | virtual ~LLRefCount(); // use unref() | 79 | virtual ~LLRefCount(); // use unref() |
@@ -467,6 +467,6 @@ private: | |||
467 | 467 | ||
468 | // Return the resident set size of the current process, in bytes. | 468 | // Return the resident set size of the current process, in bytes. |
469 | // Return value is zero if not known. | 469 | // Return value is zero if not known. |
470 | U64 getCurrentRSS(); | 470 | LL_COMMON_API U64 getCurrentRSS(); |
471 | 471 | ||
472 | #endif | 472 | #endif |