summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-06-25 17:00:47 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-06-25 17:00:47 -0400
commitaefdba1230de456784d220982ab8b4dbe3cde17d (patch)
tree52c56bc79725187e9d4a6244e0621667b695d7a1 /indra
parent0727519d9307ed09877073ef17b754526ee3f5b1 (diff)
MAINT-5232: Make LLHTTPClientAdapter not be an LLSingleton.
llhttpclientadapter_test.cpp starts its every test by explicitly instantiating a local LLHTTPClientAdapter object. This is an abuse of LLSingleton, and if it had been properly defined (private constructor), it should never have compiled. Looked at the other way, though, every known reference to LLHTTPClientAdapter instantiates a local object. Why did someone think it should be an LLSingleton in the first place? Remove LLSingleton<> as a base class; remove llsingleton.h. This makes llhttpclientadapter_test.cpp work just fine. One might also question what value this class adds. It seems to do very little -- but more significantly, the ONLY references in the source tree are its declaration, definition and test. Nobody actually uses it anywhere.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llmessage/llhttpclientadapter.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpclientadapter.h b/indra/llmessage/llhttpclientadapter.h
index 270282c66f..ab0d219155 100755
--- a/indra/llmessage/llhttpclientadapter.h
+++ b/indra/llmessage/llhttpclientadapter.h
@@ -28,9 +28,8 @@
#define LL_HTTPCLIENTADAPTER_H
#include "llhttpclientinterface.h"
-#include "llsingleton.h" // LLSingleton<>
-class LLHTTPClientAdapter : public LLHTTPClientInterface, public LLSingleton<LLHTTPClientAdapter>
+class LLHTTPClientAdapter : public LLHTTPClientInterface
{
public:
virtual ~LLHTTPClientAdapter();