diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 5a3fb98ba344e6481fddd2cdc3a7f7ab10407b2f..b15f9b53b08beb80c65bbcd21356c60986d0ecd8 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 9735880df1eef1a2a555e71402c8949c6b11aedb..215fa948442c8d5891f7ba61e6368aa789ee29a7 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 871013e8f0e8bf130fe5a8379bc3197fccd9c87f..4893e4b81a2164024288361bbff83a903d149bab 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 86910f7e21d58f1053e1d7da77e70de74cfef382..12c1cdbeaa6dd2e191fd761d10187e50b097f170 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 cca5bfb86dbcb4f799323c5531923f06a770942f..63c82f04f5ed677e21e2f614cf44cc8af9e3a2a8 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 138a8880fc119e6fc0d95a7e2c36f6cac852d430..ffe3fba72f7ff8d0d7929c0e04ada4050ee56eaa 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 ef9fe766f76f99d1475642b520f23523e5c569a4..851ad17043bed6324a88b13620a4ca983ac29e58 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 a91bb0d77011b6b721b043fce4a9332f223649d4..5a0c437a346652d72626dc70b0c79eaef5c92966 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 );