From 20442dcbf3d66a10ca6c7397bb5bef8585625dcf Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Mon, 27 Nov 2017 10:52:29 +0100
Subject: [PATCH] http: remove THttpEngine destructor declaration
---
net/http/inc/THttpEngine.h | 3 ---
net/http/src/THttpEngine.cxx | 11 +----------
net/http/src/THttpServer.cxx | 5 +----
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/net/http/inc/THttpEngine.h b/net/http/inc/THttpEngine.h
index ee03a5141fc..09859de8f78 100644
--- a/net/http/inc/THttpEngine.h
+++ b/net/http/inc/THttpEngine.h
@@ -33,8 +33,6 @@ protected:
virtual void Process() {}
public:
- virtual ~THttpEngine();
-
/** Method to create all components of engine. Called once from by the server */
virtual Bool_t Create(const char *) { return kFALSE; }
@@ -44,5 +42,4 @@ public:
ClassDef(THttpEngine, 0) // abstract class which should provide http-based protocol for server
};
-
#endif
diff --git a/net/http/src/THttpEngine.cxx b/net/http/src/THttpEngine.cxx
index b797265b21b..289c76f0bb2 100644
--- a/net/http/src/THttpEngine.cxx
+++ b/net/http/src/THttpEngine.cxx
@@ -26,15 +26,6 @@ ClassImp(THttpEngine);
////////////////////////////////////////////////////////////////////////////////
/// normal constructor
-THttpEngine::THttpEngine(const char *name, const char *title)
- : TNamed(name, title), fServer(nullptr)
+THttpEngine::THttpEngine(const char *name, const char *title) : TNamed(name, title), fServer(nullptr)
{
}
-
-////////////////////////////////////////////////////////////////////////////////
-/// destructor
-
-THttpEngine::~THttpEngine()
-{
- fServer = nullptr;
-}
diff --git a/net/http/src/THttpServer.cxx b/net/http/src/THttpServer.cxx
index 2b4179f4424..e9f6cb4672b 100644
--- a/net/http/src/THttpServer.cxx
+++ b/net/http/src/THttpServer.cxx
@@ -56,10 +56,7 @@ public:
/// timeout handler
/// used to process http requests in main ROOT thread
- virtual void Timeout()
- {
- fServer.ProcessRequests();
- }
+ virtual void Timeout() { fServer.ProcessRequests(); }
};
//////////////////////////////////////////////////////////////////////////////////////////////////
--
GitLab