BUILDFIX: mac gcc fix

indra/llcommon/llsingleton.h

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

indra/newview/llvocache.h

@@ -163,7 +163,6 @@ class LLVOCachePartition : public LLViewerOctreePartition, public LLTrace::MemTr
 class LLVOCache : public LLSingleton<LLVOCache>
 {
 private:
-	friend LLSingleton<LLVOCache>;
 	struct HeaderEntryInfo
 	{
 		HeaderEntryInfo() : mIndex(0), mHandle(0), mTime(0) {}
@@ -194,6 +193,7 @@ class LLVOCache : public LLSingleton<LLVOCache>
 	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: