SL-16202: Instantiate LLSimpleton::sInstance generically
instead of requiring a separate declaration for each subclass. The previous way produces errors in clang.master
parent
7a5b921995
commit
8458ad8890
|
|
@ -865,4 +865,7 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
T* LLSimpleton<T>::sInstance{ nullptr };
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
#include "llui.h"
|
||||
#include "llleap.h"
|
||||
|
||||
LLViewerEventRecorder* LLSimpleton<LLViewerEventRecorder>::sInstance = nullptr;
|
||||
|
||||
LLViewerEventRecorder::LLViewerEventRecorder() {
|
||||
|
||||
clear(UNDEFINED);
|
||||
|
|
|
|||
|
|
@ -824,7 +824,6 @@ std::string env_selection_to_string(LLEnvironment::EnvSelection_t sel)
|
|||
#undef RTNENUM
|
||||
}
|
||||
|
||||
LLEnvironment* LLSimpleton<LLEnvironment>::sInstance = nullptr;
|
||||
//-------------------------------------------------------------------------
|
||||
LLEnvironment::LLEnvironment():
|
||||
mCloudScrollDelta(),
|
||||
|
|
|
|||
|
|
@ -97,8 +97,6 @@
|
|||
#include "llglheaders.h"
|
||||
#include "llinventoryobserver.h"
|
||||
|
||||
LLSelectMgr* LLSimpleton<LLSelectMgr>::sInstance = nullptr;
|
||||
|
||||
LLViewerObject* getSelectedParentObject(LLViewerObject *object) ;
|
||||
//
|
||||
// Consts
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@
|
|||
// System includes
|
||||
#include <iomanip> // for setprecision
|
||||
|
||||
LLViewerCamera* LLSimpleton<LLViewerCamera>::sInstance = nullptr;
|
||||
|
||||
LLTrace::CountStatHandle<> LLViewerCamera::sVelocityStat("camera_velocity");
|
||||
LLTrace::CountStatHandle<> LLViewerCamera::sAngularVelocityStat("camera_angular_velocity");
|
||||
|
||||
|
|
|
|||
|
|
@ -62,8 +62,6 @@
|
|||
#include <cstring>
|
||||
|
||||
|
||||
LLWorld* LLSimpleton<LLWorld>::sInstance = nullptr;
|
||||
|
||||
//
|
||||
// Globals
|
||||
//
|
||||
|
|
|
|||
Loading…
Reference in New Issue