diff options
| author | Richard Linden <none@none> | 2012-03-29 23:56:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-03-29 23:56:15 -0700 |
| commit | 56f9c54c8348786db395ccd464eec17d5b17eeb1 (patch) | |
| tree | 08d9ebd23121654a9cf4e0561b1256de9bc9b608 /indra/llcommon/llinstancetracker.h | |
| parent | 27ce5c301633fa75c32087e347347ab9111aa787 (diff) | |
| parent | 2fa1c42aadbe2a29e1bcced9a487c0e5abf0602b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llcommon/llinstancetracker.h')
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 34d841a4e0..11f582372e 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -43,7 +43,7 @@ * semantics: one instance per process, rather than one instance per module as * sometimes happens with data simply declared static. */ -class LL_COMMON_API LLInstanceTrackerBase : public boost::noncopyable +class LL_COMMON_API LLInstanceTrackerBase { protected: /// Get a process-unique void* pointer slot for the specified type_info @@ -209,6 +209,9 @@ protected: virtual const KEY& getKey() const { return mInstanceKey; } private: + LLInstanceTracker( const LLInstanceTracker& ); + const LLInstanceTracker& operator=( const LLInstanceTracker& ); + void add_(KEY key) { mInstanceKey = key; |