From 70ae6c935e8ffc7f382304fa2d75035f6f97ee40 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Aug 2020 06:54:50 -0400
Subject: [PATCH] Default empty destructors in llcorehttp
---
indra/llcorehttp/_httpopcancel.cpp | 4 ----
indra/llcorehttp/_httpopcancel.h | 2 +-
indra/llcorehttp/_httpoperation.cpp | 12 ------------
indra/llcorehttp/_httpoperation.h | 6 +++---
indra/llcorehttp/_httpopsetget.cpp | 4 ----
indra/llcorehttp/_httpopsetget.h | 2 +-
indra/llcorehttp/_httpopsetpriority.cpp | 4 ----
indra/llcorehttp/_httpopsetpriority.h | 2 +-
indra/llcorehttp/_httppolicyclass.cpp | 4 ----
indra/llcorehttp/_httppolicyclass.h | 2 +-
indra/llcorehttp/_httppolicyglobal.cpp | 4 ----
indra/llcorehttp/_httppolicyglobal.h | 2 +-
indra/llcorehttp/_httpreadyqueue.h | 3 +--
indra/llcorehttp/_httpretryqueue.h | 3 +--
indra/llcorehttp/_refcounted.cpp | 3 ---
indra/llcorehttp/_refcounted.h | 2 +-
indra/llcorehttp/bufferstream.cpp | 4 ----
indra/llcorehttp/bufferstream.h | 2 +-
indra/llcorehttp/httpcommon.h | 4 +---
indra/llcorehttp/httphandler.h | 3 +--
indra/llcorehttp/httpheaders.cpp | 8 --------
indra/llcorehttp/httpheaders.h | 9 ++++-----
indra/llcorehttp/httpoptions.cpp | 4 ----
indra/llcorehttp/httpoptions.h | 2 +-
indra/llcorehttp/httpstats.cpp | 4 ----
indra/llcorehttp/httpstats.h | 2 +-
26 files changed, 20 insertions(+), 81 deletions(-)
diff --git a/indra/llcorehttp/_httpopcancel.cpp b/indra/llcorehttp/_httpopcancel.cpp
index c1912eb3db8..4be315df03d 100644
--- a/indra/llcorehttp/_httpopcancel.cpp
+++ b/indra/llcorehttp/_httpopcancel.cpp
@@ -48,10 +48,6 @@ HttpOpCancel::HttpOpCancel(HttpHandle handle)
{}
-HttpOpCancel::~HttpOpCancel()
-{}
-
-
// Immediately search for the request on various queues
// and cancel operations if found. Return the status of
// the search and cancel as the status of this request.
diff --git a/indra/llcorehttp/_httpopcancel.h b/indra/llcorehttp/_httpopcancel.h
index f1385fd3cfb..830485f3c2a 100644
--- a/indra/llcorehttp/_httpopcancel.h
+++ b/indra/llcorehttp/_httpopcancel.h
@@ -56,7 +56,7 @@ class HttpOpCancel final : public HttpOperation
/// be canceled.
HttpOpCancel(HttpHandle handle);
- virtual ~HttpOpCancel(); // Use release()
+ virtual ~HttpOpCancel() = default; // Use release()
public:
virtual void stageFromRequest(HttpService *);
diff --git a/indra/llcorehttp/_httpoperation.cpp b/indra/llcorehttp/_httpoperation.cpp
index 3fc4e289105..b95441f8285 100644
--- a/indra/llcorehttp/_httpoperation.cpp
+++ b/indra/llcorehttp/_httpoperation.cpp
@@ -229,10 +229,6 @@ HttpOpStop::HttpOpStop()
{}
-HttpOpStop::~HttpOpStop()
-{}
-
-
void HttpOpStop::stageFromRequest(HttpService * service)
{
// Do operations
@@ -253,10 +249,6 @@ HttpOpNull::HttpOpNull()
{}
-HttpOpNull::~HttpOpNull()
-{}
-
-
void HttpOpNull::stageFromRequest(HttpService * service)
{
// Perform op
@@ -280,10 +272,6 @@ HttpOpSpin::HttpOpSpin(int mode)
{}
-HttpOpSpin::~HttpOpSpin()
-{}
-
-
void HttpOpSpin::stageFromRequest(HttpService * service)
{
if (0 == mMode)
diff --git a/indra/llcorehttp/_httpoperation.h b/indra/llcorehttp/_httpoperation.h
index bcf5ad2aef1..fce4269519f 100644
--- a/indra/llcorehttp/_httpoperation.h
+++ b/indra/llcorehttp/_httpoperation.h
@@ -222,7 +222,7 @@ class HttpOpStop final : public HttpOperation
public:
HttpOpStop();
- virtual ~HttpOpStop();
+ virtual ~HttpOpStop() = default;
private:
HttpOpStop(const HttpOpStop &); // Not defined
@@ -244,7 +244,7 @@ class HttpOpNull final : public HttpOperation
public:
HttpOpNull();
- virtual ~HttpOpNull();
+ virtual ~HttpOpNull() = default;
private:
HttpOpNull(const HttpOpNull &); // Not defined
@@ -266,7 +266,7 @@ class HttpOpSpin final : public HttpOperation
// 1 does a soft spin continuously requeuing itself
HttpOpSpin(int mode);
- virtual ~HttpOpSpin();
+ virtual ~HttpOpSpin() = default;
private:
HttpOpSpin(const HttpOpSpin &); // Not defined
diff --git a/indra/llcorehttp/_httpopsetget.cpp b/indra/llcorehttp/_httpopsetget.cpp
index a5363f9170b..f492f76237c 100644
--- a/indra/llcorehttp/_httpopsetget.cpp
+++ b/indra/llcorehttp/_httpopsetget.cpp
@@ -52,10 +52,6 @@ HttpOpSetGet::HttpOpSetGet()
{}
-HttpOpSetGet::~HttpOpSetGet()
-{}
-
-
HttpStatus HttpOpSetGet::setupGet(HttpRequest::EPolicyOption opt, HttpRequest::policy_t pclass)
{
HttpStatus status;
diff --git a/indra/llcorehttp/_httpopsetget.h b/indra/llcorehttp/_httpopsetget.h
index 16848885560..dff4bea2c57 100644
--- a/indra/llcorehttp/_httpopsetget.h
+++ b/indra/llcorehttp/_httpopsetget.h
@@ -57,7 +57,7 @@ class HttpOpSetGet final : public HttpOperation
HttpOpSetGet();
- virtual ~HttpOpSetGet(); // Use release()
+ virtual ~HttpOpSetGet() = default; // Use release()
private:
HttpOpSetGet(const HttpOpSetGet &); // Not defined
diff --git a/indra/llcorehttp/_httpopsetpriority.cpp b/indra/llcorehttp/_httpopsetpriority.cpp
index d48c7a0b7d6..8e429baacab 100644
--- a/indra/llcorehttp/_httpopsetpriority.cpp
+++ b/indra/llcorehttp/_httpopsetpriority.cpp
@@ -42,10 +42,6 @@ HttpOpSetPriority::HttpOpSetPriority(HttpHandle handle, HttpRequest::priority_t
{}
-HttpOpSetPriority::~HttpOpSetPriority()
-{}
-
-
void HttpOpSetPriority::stageFromRequest(HttpService * service)
{
// Do operations
diff --git a/indra/llcorehttp/_httpopsetpriority.h b/indra/llcorehttp/_httpopsetpriority.h
index 2e735db7c8d..e2932e0123f 100644
--- a/indra/llcorehttp/_httpopsetpriority.h
+++ b/indra/llcorehttp/_httpopsetpriority.h
@@ -51,7 +51,7 @@ class HttpOpSetPriority final : public HttpOperation
public:
HttpOpSetPriority(HttpHandle handle, HttpRequest::priority_t priority);
- virtual ~HttpOpSetPriority();
+ virtual ~HttpOpSetPriority() = default;
private:
HttpOpSetPriority(const HttpOpSetPriority &); // Not defined
diff --git a/indra/llcorehttp/_httppolicyclass.cpp b/indra/llcorehttp/_httppolicyclass.cpp
index 2c0f6501554..9d32f45869b 100644
--- a/indra/llcorehttp/_httppolicyclass.cpp
+++ b/indra/llcorehttp/_httppolicyclass.cpp
@@ -41,10 +41,6 @@ HttpPolicyClass::HttpPolicyClass()
{}
-HttpPolicyClass::~HttpPolicyClass()
-{}
-
-
HttpPolicyClass & HttpPolicyClass::operator=(const HttpPolicyClass & other)
{
if (this != &other)
diff --git a/indra/llcorehttp/_httppolicyclass.h b/indra/llcorehttp/_httppolicyclass.h
index 38f1194ded4..7fcffb3b69b 100644
--- a/indra/llcorehttp/_httppolicyclass.h
+++ b/indra/llcorehttp/_httppolicyclass.h
@@ -50,7 +50,7 @@ class HttpPolicyClass
{
public:
HttpPolicyClass();
- ~HttpPolicyClass();
+ ~HttpPolicyClass() = default;
HttpPolicyClass & operator=(const HttpPolicyClass &);
HttpPolicyClass(const HttpPolicyClass &); // Not defined
diff --git a/indra/llcorehttp/_httppolicyglobal.cpp b/indra/llcorehttp/_httppolicyglobal.cpp
index 8da6cba6d0b..07f5ef0d5ad 100644
--- a/indra/llcorehttp/_httppolicyglobal.cpp
+++ b/indra/llcorehttp/_httppolicyglobal.cpp
@@ -40,10 +40,6 @@ HttpPolicyGlobal::HttpPolicyGlobal()
{}
-HttpPolicyGlobal::~HttpPolicyGlobal()
-{}
-
-
HttpPolicyGlobal & HttpPolicyGlobal::operator=(const HttpPolicyGlobal & other)
{
if (this != &other)
diff --git a/indra/llcorehttp/_httppolicyglobal.h b/indra/llcorehttp/_httppolicyglobal.h
index e02da4386a1..2356937aaa3 100644
--- a/indra/llcorehttp/_httppolicyglobal.h
+++ b/indra/llcorehttp/_httppolicyglobal.h
@@ -50,7 +50,7 @@ class HttpPolicyGlobal
{
public:
HttpPolicyGlobal();
- ~HttpPolicyGlobal();
+ ~HttpPolicyGlobal() = default;
HttpPolicyGlobal & operator=(const HttpPolicyGlobal &);
diff --git a/indra/llcorehttp/_httpreadyqueue.h b/indra/llcorehttp/_httpreadyqueue.h
index dbdebbd1b56..e7967a4a2e2 100644
--- a/indra/llcorehttp/_httpreadyqueue.h
+++ b/indra/llcorehttp/_httpreadyqueue.h
@@ -73,8 +73,7 @@ class HttpReadyQueue final : public HttpReadyQueueBase
: HttpReadyQueueBase()
{}
- ~HttpReadyQueue()
- {}
+ ~HttpReadyQueue() = default;
protected:
HttpReadyQueue(const HttpReadyQueue &); // Not defined
diff --git a/indra/llcorehttp/_httpretryqueue.h b/indra/llcorehttp/_httpretryqueue.h
index 5d8c529cfff..e86c2af130f 100644
--- a/indra/llcorehttp/_httpretryqueue.h
+++ b/indra/llcorehttp/_httpretryqueue.h
@@ -67,8 +67,7 @@ class HttpRetryQueue : public HttpRetryQueueBase
: HttpRetryQueueBase()
{}
- ~HttpRetryQueue()
- {}
+ ~HttpRetryQueue() = default;
protected:
HttpRetryQueue(const HttpRetryQueue &); // Not defined
diff --git a/indra/llcorehttp/_refcounted.cpp b/indra/llcorehttp/_refcounted.cpp
index e7d0b72741d..4c1e3da8506 100644
--- a/indra/llcorehttp/_refcounted.cpp
+++ b/indra/llcorehttp/_refcounted.cpp
@@ -36,9 +36,6 @@ const S32 RefCounted::NOT_REF_COUNTED;
#endif // ! LL_WINDOWS
-RefCounted::~RefCounted()
-{}
-
} // end namespace LLCoreInt
diff --git a/indra/llcorehttp/_refcounted.h b/indra/llcorehttp/_refcounted.h
index 5cc8914395d..6931f1004ae 100644
--- a/indra/llcorehttp/_refcounted.h
+++ b/indra/llcorehttp/_refcounted.h
@@ -62,7 +62,7 @@ class RefCounted
static const S32 NOT_REF_COUNTED = -1;
protected:
- virtual ~RefCounted();
+ virtual ~RefCounted() = default;
virtual void destroySelf();
private:
diff --git a/indra/llcorehttp/bufferstream.cpp b/indra/llcorehttp/bufferstream.cpp
index 678bf5ea9f5..8716e1ede09 100644
--- a/indra/llcorehttp/bufferstream.cpp
+++ b/indra/llcorehttp/bufferstream.cpp
@@ -274,10 +274,6 @@ BufferArrayStream::BufferArrayStream(BufferArray * ba)
{}
-BufferArrayStream::~BufferArrayStream()
-{}
-
-
} // end namespace LLCore
diff --git a/indra/llcorehttp/bufferstream.h b/indra/llcorehttp/bufferstream.h
index eda796a94f7..10682f4d45e 100644
--- a/indra/llcorehttp/bufferstream.h
+++ b/indra/llcorehttp/bufferstream.h
@@ -137,7 +137,7 @@ class BufferArrayStream final : public std::iostream
/// Constructor increments the reference count on the
/// BufferArray argument and calls release() on destruction.
BufferArrayStream(BufferArray * ba);
- ~BufferArrayStream();
+ ~BufferArrayStream() = default;
protected:
BufferArrayStream(const BufferArrayStream &);
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 18505e0aad2..d338a0ec26c 100644
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -329,9 +329,7 @@ struct HttpStatus
mDetails = rhs.mDetails;
}
- ~HttpStatus()
- {
- }
+ ~HttpStatus() = default;
HttpStatus & operator=(const HttpStatus & rhs)
{
diff --git a/indra/llcorehttp/httphandler.h b/indra/llcorehttp/httphandler.h
index 65e043f5d35..649a923ae1b 100644
--- a/indra/llcorehttp/httphandler.h
+++ b/indra/llcorehttp/httphandler.h
@@ -61,8 +61,7 @@ class HttpHandler
typedef boost::shared_ptr<HttpHandler> ptr_t;
typedef boost::weak_ptr<HttpHandler> wptr_t;
- virtual ~HttpHandler()
- { }
+ virtual ~HttpHandler() = default;
/// Method invoked during calls to @see update(). Each invocation
/// represents the completion of some requested operation. Caller
diff --git a/indra/llcorehttp/httpheaders.cpp b/indra/llcorehttp/httpheaders.cpp
index f586191a7c5..de35eeca089 100644
--- a/indra/llcorehttp/httpheaders.cpp
+++ b/indra/llcorehttp/httpheaders.cpp
@@ -33,14 +33,6 @@ namespace LLCore
{
-HttpHeaders::HttpHeaders()
-{}
-
-
-HttpHeaders::~HttpHeaders()
-{}
-
-
void
HttpHeaders::clear()
{
diff --git a/indra/llcorehttp/httpheaders.h b/indra/llcorehttp/httpheaders.h
index b9168cb6ec8..313845b6196 100644
--- a/indra/llcorehttp/httpheaders.h
+++ b/indra/llcorehttp/httpheaders.h
@@ -91,14 +91,13 @@ class HttpHeaders: private boost::noncopyable
/// @post In addition to the instance, caller has a refcount
/// to the instance. A call to @see release() will destroy
/// the instance.
- HttpHeaders();
- virtual ~HttpHeaders(); // Use release()
+ HttpHeaders() = default;
+ virtual ~HttpHeaders() = default; // Use release()
//typedef LLCoreInt::IntrusivePtr<HttpHeaders> ptr_t;
-protected:
- HttpHeaders(const HttpHeaders &); // Not defined
- void operator=(const HttpHeaders &); // Not defined
+ HttpHeaders(const HttpHeaders &) = delete; // Not defined
+ void operator=(const HttpHeaders &) = delete; // Not defined
public:
// Empty the list of headers.
diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp
index df5aa52fa9d..6ae3cd5d975 100644
--- a/indra/llcorehttp/httpoptions.cpp
+++ b/indra/llcorehttp/httpoptions.cpp
@@ -50,10 +50,6 @@ HttpOptions::HttpOptions() :
{}
-HttpOptions::~HttpOptions()
-{}
-
-
void HttpOptions::setWantHeaders(bool wanted)
{
mWantHeaders = wanted;
diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h
index 8a6de61b04b..c49c7d9a04e 100644
--- a/indra/llcorehttp/httpoptions.h
+++ b/indra/llcorehttp/httpoptions.h
@@ -62,7 +62,7 @@ class HttpOptions : private boost::noncopyable
typedef boost::shared_ptr<HttpOptions> ptr_t;
- virtual ~HttpOptions(); // Use release()
+ virtual ~HttpOptions() = default; // Use release()
protected:
diff --git a/indra/llcorehttp/httpstats.cpp b/indra/llcorehttp/httpstats.cpp
index 19eceae5ef2..fc81db92b44 100644
--- a/indra/llcorehttp/httpstats.cpp
+++ b/indra/llcorehttp/httpstats.cpp
@@ -35,10 +35,6 @@ HTTPStats::HTTPStats()
}
-HTTPStats::~HTTPStats()
-{
-}
-
void HTTPStats::resetStats()
{
mResutCodes.clear();
diff --git a/indra/llcorehttp/httpstats.h b/indra/llcorehttp/httpstats.h
index d6f0a422cdf..7b449853384 100644
--- a/indra/llcorehttp/httpstats.h
+++ b/indra/llcorehttp/httpstats.h
@@ -38,7 +38,7 @@ namespace LLCore
class HTTPStats final : public LLSingleton<HTTPStats>
{
LLSINGLETON(HTTPStats);
- virtual ~HTTPStats();
+ virtual ~HTTPStats() = default;
public:
void resetStats();
--
GitLab