From 6d6405f6e7899ba69941f2efd2eb145471ddff45 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Aug 2020 06:55:53 -0400
Subject: [PATCH] Default some empty destructors in llmessage
---
indra/llmessage/llassetstorage.cpp | 20 --------------------
indra/llmessage/llassetstorage.h | 8 ++++----
indra/llmessage/llbuffer.cpp | 4 ----
indra/llmessage/llbuffer.h | 2 +-
4 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index d7801b6ddc1..27df8418f3e 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -209,11 +209,6 @@ LLBaseDownloadRequest::LLBaseDownloadRequest(const LLUUID &uuid, const LLAssetTy
mTime = LLMessageSystem::getMessageTimeSeconds(TRUE);
}
-// virtual
-LLBaseDownloadRequest::~LLBaseDownloadRequest()
-{
-}
-
// virtual
LLBaseDownloadRequest* LLBaseDownloadRequest::getCopy()
{
@@ -236,11 +231,6 @@ LLAssetRequest::LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType type
{
}
-// virtual
-LLAssetRequest::~LLAssetRequest()
-{
-}
-
// virtual
LLSD LLAssetRequest::getTerseDetails() const
{
@@ -285,11 +275,6 @@ LLInvItemRequest::LLInvItemRequest(const LLUUID &uuid, const LLAssetType::EType
{
}
-// virtual
-LLInvItemRequest::~LLInvItemRequest()
-{
-}
-
LLBaseDownloadRequest* LLInvItemRequest::getCopy()
{
return new LLInvItemRequest(*this);
@@ -306,11 +291,6 @@ LLEstateAssetRequest::LLEstateAssetRequest(const LLUUID &uuid, const LLAssetType
{
}
-// Virtual
-LLEstateAssetRequest::~LLEstateAssetRequest()
-{
-}
-
LLBaseDownloadRequest* LLEstateAssetRequest::getCopy()
{
return new LLEstateAssetRequest(*this);
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h
index c799d8eefc5..921ab05d7de 100644
--- a/indra/llmessage/llassetstorage.h
+++ b/indra/llmessage/llassetstorage.h
@@ -104,7 +104,7 @@ class LLBaseDownloadRequest
{
public:
LLBaseDownloadRequest(const LLUUID &uuid, const LLAssetType::EType at);
- virtual ~LLBaseDownloadRequest();
+ virtual ~LLBaseDownloadRequest() = default;
LLUUID getUUID() const { return mUUID; }
LLAssetType::EType getType() const { return mType; }
@@ -135,7 +135,7 @@ class LLAssetRequest : public LLBaseDownloadRequest
{
public:
LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType at);
- virtual ~LLAssetRequest();
+ virtual ~LLAssetRequest() = default;
void setTimeout(F64Seconds timeout) { mTimeout = timeout; }
@@ -170,7 +170,7 @@ class LLInvItemRequest : public LLBaseDownloadRequest
{
public:
LLInvItemRequest(const LLUUID &uuid, const LLAssetType::EType at);
- virtual ~LLInvItemRequest();
+ virtual ~LLInvItemRequest() = default;
virtual LLBaseDownloadRequest* getCopy();
};
@@ -179,7 +179,7 @@ class LLEstateAssetRequest : public LLBaseDownloadRequest
{
public:
LLEstateAssetRequest(const LLUUID &uuid, const LLAssetType::EType at, EstateAssetType et);
- virtual ~LLEstateAssetRequest();
+ virtual ~LLEstateAssetRequest() = default;
LLAssetType::EType getAType() const { return mType; }
diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp
index cfe38605ad5..8706e11adf9 100644
--- a/indra/llmessage/llbuffer.cpp
+++ b/indra/llmessage/llbuffer.cpp
@@ -54,10 +54,6 @@ LLSegment::LLSegment(S32 channel, U8* data, S32 data_len) :
{
}
-LLSegment::~LLSegment()
-{
-}
-
bool LLSegment::isOnChannel(S32 channel) const
{
return (mChannel == channel);
diff --git a/indra/llmessage/llbuffer.h b/indra/llmessage/llbuffer.h
index 7617adb6631..96a000f169c 100644
--- a/indra/llmessage/llbuffer.h
+++ b/indra/llmessage/llbuffer.h
@@ -77,7 +77,7 @@ class LLSegment
public:
LLSegment();
LLSegment(S32 channel, U8* data, S32 data_len);
- ~LLSegment();
+ ~LLSegment() = default;
/**
* @brief Check if this segment is on the given channel.
--
GitLab