From 106d52c6ee9b10dd7a7baca3b09a01073c61949d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 4 Nov 2021 16:40:05 -0400
Subject: SL-16202: Instantiate LLSimpleton::sInstance generically

instead of requiring a separate declaration for each subclass.

The previous way produces errors in clang.

(cherry picked from commit 8458ad8890cf0a11804996210d7bcfbdaa3eec2e)
---
 indra/newview/llenvironment.cpp  | 1 -
 indra/newview/llselectmgr.cpp    | 2 --
 indra/newview/llviewercamera.cpp | 2 --
 indra/newview/llworld.cpp        | 2 --
 4 files changed, 7 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 0b914f07ab..4bec7fa111 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -824,7 +824,6 @@ std::string env_selection_to_string(LLEnvironment::EnvSelection_t sel)
 #undef RTNENUM
 }
 
-LLEnvironment* LLSimpleton<LLEnvironment>::sInstance = nullptr;
 //-------------------------------------------------------------------------
 LLEnvironment::LLEnvironment():
     mCloudScrollDelta(),
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index e7670b5a73..6f136e50e0 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -97,8 +97,6 @@
 #include "llglheaders.h"
 #include "llinventoryobserver.h"
 
-LLSelectMgr* LLSimpleton<LLSelectMgr>::sInstance = nullptr;
-
 LLViewerObject* getSelectedParentObject(LLViewerObject *object) ;
 //
 // Consts
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index 5ebce115f6..5d8e80cc41 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -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");
 
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 4cb63d0ab8..d5cce6a52a 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -62,8 +62,6 @@
 #include <cstring>
 
 
-LLWorld* LLSimpleton<LLWorld>::sInstance = nullptr;
-
 //
 // Globals
 //
-- 
cgit v1.2.3