summaryrefslogtreecommitdiffstats
path: root/src/HTTP
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-07-20 13:19:18 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2017-07-21 15:41:51 +0200
commita56cfd1f42663856e346a26cbad401aec07bed91 (patch)
tree2bbdef2d6d09e8625ceaddba443b3a97b2febb5e /src/HTTP
parentFastRandom: Remove discrepancy between arg and return value type. (#3846) (diff)
downloadcuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.gz
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.bz2
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.lz
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.xz
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.zst
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.zip
Diffstat (limited to '')
-rw-r--r--src/HTTP/HTTPMessage.h2
-rw-r--r--src/HTTP/TransferEncodingParser.h2
-rw-r--r--src/HTTP/UrlClient.cpp12
-rw-r--r--src/HTTP/UrlClient.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/HTTP/HTTPMessage.h b/src/HTTP/HTTPMessage.h
index 9afcd5b97..659fd5331 100644
--- a/src/HTTP/HTTPMessage.h
+++ b/src/HTTP/HTTPMessage.h
@@ -96,7 +96,7 @@ public:
// Force a virtual destructor in descendants:
virtual ~cUserData() {}
};
- typedef SharedPtr<cUserData> cUserDataPtr;
+ typedef std::shared_ptr<cUserData> cUserDataPtr;
/** Creates a new instance of the class, containing the method and URL provided by the client. */
diff --git a/src/HTTP/TransferEncodingParser.h b/src/HTTP/TransferEncodingParser.h
index ce3d01df7..328186029 100644
--- a/src/HTTP/TransferEncodingParser.h
+++ b/src/HTTP/TransferEncodingParser.h
@@ -11,7 +11,7 @@
// fwd:
class cTransferEncodingParser;
-typedef SharedPtr<cTransferEncodingParser> cTransferEncodingParserPtr;
+typedef std::shared_ptr<cTransferEncodingParser> cTransferEncodingParserPtr;
diff --git a/src/HTTP/UrlClient.cpp b/src/HTTP/UrlClient.cpp
index 29d5e28d7..f7d12028d 100644
--- a/src/HTTP/UrlClient.cpp
+++ b/src/HTTP/UrlClient.cpp
@@ -16,7 +16,7 @@
// fwd:
class cSchemeHandler;
-typedef SharedPtr<cSchemeHandler> cSchemeHandlerPtr;
+typedef std::shared_ptr<cSchemeHandler> cSchemeHandlerPtr;
@@ -40,7 +40,7 @@ public:
{
// Create a new instance of cUrlClientRequest, wrapped in a SharedPtr, so that it has a controlled lifetime.
// Cannot use std::make_shared, because the constructor is not public
- SharedPtr<cUrlClientRequest> ptr (new cUrlClientRequest(
+ std::shared_ptr<cUrlClientRequest> ptr (new cUrlClientRequest(
a_Method, a_URL, std::move(a_Callbacks), std::move(a_Headers), a_Body, std::move(a_Options)
));
return ptr->DoRequest(ptr);
@@ -128,10 +128,10 @@ protected:
/** SharedPtr to self, so that this object can keep itself alive for as long as it needs,
and pass self as callbacks to cNetwork functions. */
- SharedPtr<cUrlClientRequest> m_Self;
+ std::shared_ptr<cUrlClientRequest> m_Self;
/** The handler that "talks" the protocol specified in m_UrlScheme, handles all the sending and receiving. */
- SharedPtr<cSchemeHandler> m_SchemeHandler;
+ std::shared_ptr<cSchemeHandler> m_SchemeHandler;
/** The link handling the request. */
cTCPLinkPtr m_Link;
@@ -161,7 +161,7 @@ protected:
}
- std::pair<bool, AString> DoRequest(SharedPtr<cUrlClientRequest> a_Self);
+ std::pair<bool, AString> DoRequest(std::shared_ptr<cUrlClientRequest> a_Self);
// cNetwork::cConnectCallbacks override: TCP link connected:
@@ -569,7 +569,7 @@ void cUrlClientRequest::OnRemoteClosed()
-std::pair<bool, AString> cUrlClientRequest::DoRequest(SharedPtr<cUrlClientRequest> a_Self)
+std::pair<bool, AString> cUrlClientRequest::DoRequest(std::shared_ptr<cUrlClientRequest> a_Self)
{
// We need a shared pointer to self, care must be taken not to pass any other ptr:
ASSERT(a_Self.get() == this);
diff --git a/src/HTTP/UrlClient.h b/src/HTTP/UrlClient.h
index ac772235e..02c7cb89c 100644
--- a/src/HTTP/UrlClient.h
+++ b/src/HTTP/UrlClient.h
@@ -86,7 +86,7 @@ public:
for such a response; instead, the redirect is silently attempted. */
virtual void OnRedirecting(const AString & a_NewLocation) {}
};
- typedef UniquePtr<cCallbacks> cCallbacksPtr;
+ typedef std::unique_ptr<cCallbacks> cCallbacksPtr;
/** Used for HTTP status codes. */