* add ccstd::vector
* replace cc::vector with ccstd::vector 
* replace std::vector with ccstd::vector
* do not include <vector>
This commit is contained in:
minggo
2022-03-21 15:55:02 +08:00
committed by GitHub
parent 71288fcf7a
commit 34bf14269c
358 changed files with 1459 additions and 1485 deletions

View File

@@ -47,9 +47,9 @@ namespace cc {
namespace network {
using HttpRequestHeaders = std::vector<std::string>;
using HttpRequestHeaders = ccstd::vector<std::string>;
using HttpRequestHeadersIter = HttpRequestHeaders::iterator;
using HttpCookies = std::vector<std::string>;
using HttpCookies = ccstd::vector<std::string>;
using HttpCookiesIter = HttpCookies::iterator;
static HttpClient *gHttpClient = nullptr; // pointer to singleton
@@ -66,7 +66,7 @@ struct CookiesInfo {
//static size_t writeData(void *ptr, size_t size, size_t nmemb, void *stream)
static size_t writeData(void *buffer, size_t sizes, HttpResponse *response) {
auto *recvBuffer = static_cast<std::vector<char> *>(response->getResponseData());
auto *recvBuffer = static_cast<ccstd::vector<char> *>(response->getResponseData());
recvBuffer->clear();
recvBuffer->insert(recvBuffer->end(), static_cast<char *>(buffer), (static_cast<char *>(buffer)) + sizes);
return sizes;
@@ -74,7 +74,7 @@ static size_t writeData(void *buffer, size_t sizes, HttpResponse *response) {
//static size_t writeHeaderData(void *ptr, size_t size, size_t nmemb, void *stream)
size_t writeHeaderData(void *buffer, size_t sizes, HttpResponse *response) {
auto *recvBuffer = static_cast<std::vector<char> *>(response->getResponseHeader());
auto *recvBuffer = static_cast<ccstd::vector<char> *>(response->getResponseHeader());
recvBuffer->clear();
recvBuffer->insert(recvBuffer->end(), static_cast<char *>(buffer), static_cast<char *>(buffer) + sizes);
return sizes;
@@ -433,7 +433,7 @@ private:
return;
}
std::vector<CookiesInfo> cookiesInfoVec;
ccstd::vector<CookiesInfo> cookiesInfoVec;
cookiesInfoVec.clear();
for (auto &cookies : cookiesVec) {
@@ -448,7 +448,7 @@ private:
CookiesInfo co;
std::stringstream streamInfo(cookies);
std::string item;
std::vector<std::string> elems;
ccstd::vector<std::string> elems;
while (std::getline(streamInfo, item, '\t')) {
elems.push_back(item);
@@ -669,7 +669,7 @@ void HttpClient::processResponse(HttpResponse *response, char *responseMessage)
int contentLength = urlConnection.getResponseHeaderByKeyInt("Content-Length");
char *contentInfo = urlConnection.getResponseContent(response);
if (nullptr != contentInfo) {
auto *recvBuffer = static_cast<std::vector<char> *>(response->getResponseData());
auto *recvBuffer = static_cast<ccstd::vector<char> *>(response->getResponseData());
recvBuffer->clear();
recvBuffer->insert(recvBuffer->begin(), contentInfo, contentInfo + urlConnection.getContentLength());
}