From 7043fa37f87b62e82d965387e69dc7ba4645b882 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Aug 2020 06:56:31 -0400
Subject: [PATCH] Default various other empty destructors
---
indra/llprimitive/lldaeloader.cpp | 4 ----
indra/llprimitive/lldaeloader.h | 2 +-
indra/llprimitive/llmodel.cpp | 4 ----
indra/llprimitive/llmodel.h | 2 +-
indra/llxml/llcontrol.cpp | 4 ----
indra/llxml/llcontrol.h | 8 +++-----
indra/llxml/llxmltree.cpp | 4 ----
indra/llxml/llxmltree.h | 2 +-
8 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 5a3fb98ba34..b15f9b53b08 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -854,10 +854,6 @@ LLDAELoader::LLDAELoader(
{
}
-LLDAELoader::~LLDAELoader()
-{
-}
-
struct ModelSort
{
bool operator()(const LLPointer< LLModel >& lhs, const LLPointer< LLModel >& rhs)
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h
index 9735880df1e..215fa948442 100644
--- a/indra/llprimitive/lldaeloader.h
+++ b/indra/llprimitive/lldaeloader.h
@@ -60,7 +60,7 @@ class LLDAELoader final : public LLModelLoader
U32 maxJointsPerMesh,
U32 modelLimit,
bool preprocess);
- virtual ~LLDAELoader() ;
+ virtual ~LLDAELoader() = default;
virtual bool OpenFile(const std::string& filename);
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 871013e8f0e..4893e4b81a2 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1936,10 +1936,6 @@ LLSD LLModelInstance::asLLSD()
}
-LLImportMaterial::~LLImportMaterial()
-{
-}
-
LLImportMaterial::LLImportMaterial(LLSD& data)
{
mDiffuseMapFilename = data["diffuse"]["filename"].asString();
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 86910f7e21d..12c1cdbeaa6 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -317,7 +317,7 @@ class LLImportMaterial final : public LLModelMaterialBase
}
LLImportMaterial(LLSD& data);
- virtual ~LLImportMaterial();
+ virtual ~LLImportMaterial() = default;
LLSD asLLSD();
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index cca5bfb86db..63c82f04f5e 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -183,10 +183,6 @@ LLControlVariable::LLControlVariable(const std::string& name, eControlType type,
-LLControlVariable::~LLControlVariable()
-{
-}
-
LLSD LLControlVariable::getComparableValue(const LLSD& value)
{
// *FIX:MEP - The following is needed to make the LLSD::ImplString
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 138a8880fc1..ffe3fba72f7 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -123,7 +123,7 @@ class LLControlVariable final : public LLRefCount
LLSD initial, const std::string& comment,
ePersist persist = PERSIST_NONDFT, bool hidefromsettingseditor = false);
- virtual ~LLControlVariable();
+ virtual ~LLControlVariable() = default;
const std::string& getName() const { return mName; }
const std::string& getComment() const { return mComment; }
@@ -210,7 +210,7 @@ class LLControlGroup final : public LLInstanceTracker<LLControlGroup, std::strin
struct ApplyFunctor
{
- virtual ~ApplyFunctor() {};
+ virtual ~ApplyFunctor() = default;
virtual void apply(const std::string& name, LLControlVariable* control) = 0;
};
void applyToAll(ApplyFunctor* func);
@@ -359,9 +359,7 @@ class LLControlCache final : public LLRefCount, public LLInstanceTracker<LLContr
bindToControl(group, name);
}
- ~LLControlCache()
- {
- }
+ ~LLControlCache() = default;
const T& getValue() const { return mCachedValue; }
diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp
index ef9fe766f76..851ad17043b 100644
--- a/indra/llxml/llxmltree.cpp
+++ b/indra/llxml/llxmltree.cpp
@@ -523,10 +523,6 @@ LLXmlTreeParser::LLXmlTreeParser(LLXmlTree* tree)
{
}
-LLXmlTreeParser::~LLXmlTreeParser()
-{
-}
-
BOOL LLXmlTreeParser::parseFile(const std::string &path, LLXmlTreeNode** root, BOOL keep_contents)
{
llassert( !mRoot );
diff --git a/indra/llxml/llxmltree.h b/indra/llxml/llxmltree.h
index a91bb0d7701..5a0c437a346 100644
--- a/indra/llxml/llxmltree.h
+++ b/indra/llxml/llxmltree.h
@@ -200,7 +200,7 @@ class LLXmlTreeParser : public LLXmlParser
{
public:
LLXmlTreeParser(LLXmlTree* tree);
- virtual ~LLXmlTreeParser();
+ virtual ~LLXmlTreeParser() = default;
BOOL parseFile(const std::string &path, LLXmlTreeNode** root, BOOL keep_contents );
--
GitLab