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

BUILDFIX: mac gcc fix

meow-7.2.2
Richard Linden 2013-05-20 18:56:40 -07:00
parent 1225a7a3cc
commit 13f43fdc5b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llcommon/llsingleton.h
View File

@ -67,6 +67,11 @@ private:
INITIALIZED,
DELETED
} EInitState;
static DERIVED_TYPE* constructSingleton()
{
return new DERIVED_TYPE();
}
// stores pointer to singleton instance
struct SingletonLifetimeManager
@ -79,7 +84,7 @@ private:
static void construct()
{
sData.mInitState = CONSTRUCTING;
sData.mInstance = new DERIVED_TYPE();
sData.mInstance = constructSingleton();
sData.mInitState = INITIALIZING;
}

2
indra/newview/llvocache.h
View File

@ -163,7 +163,6 @@ public:
class LLVOCache : public LLSingleton<LLVOCache>
{
private:
friend LLSingleton<LLVOCache>;
struct HeaderEntryInfo
{
HeaderEntryInfo() : mIndex(0), mHandle(0), mTime(0) {}
@ -194,6 +193,7 @@ private:
typedef std::set<HeaderEntryInfo*, header_entry_less> header_entry_queue_t;
typedef std::map<U64, HeaderEntryInfo*> handle_entry_map_t;
private:
friend class LLSingleton<LLVOCache>;
LLVOCache() ;
public: