mirror of
https://github.com/lifegpc/c-utils.git
synced 2026-07-08 01:30:39 +08:00
Fix compile error on MSVC
This commit is contained in:
@@ -428,7 +428,11 @@ void HttpFullBody::pull() {
|
|||||||
|
|
||||||
size_t HttpFullBody::pullData(char* buf, size_t len) {
|
size_t HttpFullBody::pullData(char* buf, size_t len) {
|
||||||
this->pull();
|
this->pull();
|
||||||
|
#ifdef min
|
||||||
|
size_t rlen = min(this->buff.length(), len);
|
||||||
|
#else
|
||||||
size_t rlen = std::min(this->buff.length(), len);
|
size_t rlen = std::min(this->buff.length(), len);
|
||||||
|
#endif
|
||||||
memcpy(buf, this->buff.c_str(), rlen);
|
memcpy(buf, this->buff.c_str(), rlen);
|
||||||
this->buff = this->buff.substr(rlen);
|
this->buff = this->buff.substr(rlen);
|
||||||
return rlen;
|
return rlen;
|
||||||
@@ -620,7 +624,11 @@ std::string Response::read() {
|
|||||||
size_t osize = size;
|
size_t osize = size;
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
if (this->pullData()) break;
|
if (this->pullData()) break;
|
||||||
|
#ifdef min
|
||||||
|
size_t len = min(this->buff.length(), size);
|
||||||
|
#else
|
||||||
auto len = std::min(this->buff.length(), size);
|
auto len = std::min(this->buff.length(), size);
|
||||||
|
#endif
|
||||||
data += this->buff.substr(0, len);
|
data += this->buff.substr(0, len);
|
||||||
this->buff = this->buff.substr(len);
|
this->buff = this->buff.substr(len);
|
||||||
size -= len;
|
size -= len;
|
||||||
|
|||||||
Reference in New Issue
Block a user