diff --git a/indra/llcorehttp/_httpopcancel.cpp b/indra/llcorehttp/_httpopcancel.cpp index c1912eb3db8584e70cb2a683cb83c3530b46468f..4be315df03d43ab3d1648b6d30b449fcfc214020 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 f1385fd3cfb28eae348ef68e6975d369e319746a..830485f3c2acc1a3386d297113418b037d43c335 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 3fc4e289105d481ee426bf574dbe9aa9efd83eb6..b95441f8285b1716e86437e4b01d525a48444c41 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 bcf5ad2aef16dc6cbf8dc6601479dc1df31d4a93..fce4269519f63e3b4a24c2a2f613cb7f8903a466 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 a5363f9170bb29c380cb263b5e4f9ea6eae90c2b..f492f76237ccfbda1a97b46f41ccf1acceb44cde 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 168488855603810112cb26bf16efb69832ca6bde..dff4bea2c57caa9a7a434329c1ff016f7172ac06 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 d48c7a0b7d63bc58f43a3ab34fd669ec2f05eae2..8e429baacabde3f1339ec3f6afeb880ef9088d33 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 2e735db7c8d0a6b40f0e88fbb543baf114ea3b5f..e2932e0123f3c1a7c83930fca771cc71a97c90bb 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 2c0f6501554dba09d55f0c1f467272653b844f16..9d32f45869b3bc6a9e4ae740208fc4bacde1a58e 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 38f1194ded4de98ad6efe772e2fce2792d84a57e..7fcffb3b69b7b3aa027406c6adb43cc33253ade3 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 8da6cba6d0b5f63a43d39beeae7533c62d084b97..07f5ef0d5ad3d9d2a99403902677fa39def51936 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 e02da4386a1c776cd6311e83ee72b1faccde0925..2356937aaa3321ac5d76ccfe36dea1bc13f8ed26 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 dbdebbd1b5683394f93747e6743c19e5687010d8..e7967a4a2e28654a29154e47023c0598ee045707 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 5d8c529cfffa43a15beb1d634625e28c6f8e8eac..e86c2af130f535126aadf0c5965897322b4655d1 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 e7d0b72741d00b59ab86f3a39243c121bd547c0f..4c1e3da8506eda3803a9a9ea2d85127c368712a9 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 5cc8914395dc84e4ef4a04d254b6e0df5f2b7cfa..6931f1004ae80596782b13a08b432364e50ef28e 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 678bf5ea9f580e91ec312665c8921edf9bd59caf..8716e1ede0908eaa3e41922483720d6981e0b74e 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 eda796a94f771674442e1372742bcd642ed728fc..10682f4d45ef08601673aa562bf8c2fc048b1e1e 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 18505e0aad2aa56759be91f7ce747be7e809b11f..d338a0ec26c3e83ba83e25171b17066eff2dad72 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 65e043f5d3546baf4ce1cfefebfa2001eb220d62..649a923ae1b61907519e08b40de8dfd8693c25ec 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 f586191a7c5af105e21d955667c1fec09d23cb51..de35eeca0893777f29c2e3eeca8787b92cd69216 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 b9168cb6ec86eff22e4e68eae33460cef2d4f8c9..313845b6196296a67c140f398cc7d73d36481517 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 df5aa52fa9d0dd2d58c414129afa0d2a2728cf63..6ae3cd5d975c21376c728e8490920d198f4ff7fc 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 8a6de61b04bab9b7823e55bbbdf80cd1b6f23183..c49c7d9a04e4f8ac3f051c944f5670e599307be8 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 19eceae5ef2bd58a146280da5c00cd2373cf28c6..fc81db92b44e8b24761c7fdc642071709d0252e3 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 d6f0a422cdf4ee04765fbbefd04aa746ec7ac60a..7b449853384498a96473cb66d6af44f7600b5e9f 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();