From 530bf560b2c2c9bf534bb3ba4f588c72a59be703 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 23 Mar 2015 13:28:24 -0700 Subject: Continue with gcc issues. --- indra/llcorehttp/httpcommon.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp index 1aece696e3..c201400423 100755 --- a/indra/llcorehttp/httpcommon.cpp +++ b/indra/llcorehttp/httpcommon.cpp @@ -131,18 +131,18 @@ std::string HttpStatus::toString() const { return std::string(""); } - switch (mDetails->mType) + switch (this->mDetails->mType) { case EXT_CURL_EASY: - return std::string(curl_easy_strerror(CURLcode(mDetails->mStatus))); + return std::string(curl_easy_strerror(CURLcode(this->mDetails->mStatus))); case EXT_CURL_MULTI: - return std::string(curl_multi_strerror(CURLMcode(mDetails->mStatus))); + return std::string(curl_multi_strerror(CURLMcode(this->mDetails->mStatus))); case LLCORE: - if (mDetails->mStatus >= 0 && mDetails->mStatus < llcore_errors_count) + if (this->mDetails->mStatus >= 0 && this->mDetails->mStatus < llcore_errors_count) { - return std::string(llcore_errors[mDetails->mStatus]); + return std::string(llcore_errors[this->mDetails->mStatus]); } break; @@ -154,7 +154,7 @@ std::string HttpStatus::toString() const while (true) { int at((bottom + top) / 2); - if (mDetails->mType == http_errors[at].mCode) + if (this->mDetails->mType == http_errors[at].mCode) { return std::string(http_errors[at].mText); } @@ -162,7 +162,7 @@ std::string HttpStatus::toString() const { break; } - else if (mDetails->mType < http_errors[at].mCode) + else if (this->mDetails->mType < http_errors[at].mCode) { top = at; } @@ -182,9 +182,9 @@ std::string HttpStatus::toTerseString() const { std::ostringstream result; - unsigned int error_value((unsigned short)mDetails->mStatus); + unsigned int error_value((unsigned short)(this->mDetails->mStatus)); - switch (mDetails->mType) + switch (this->mDetails->mType) { case EXT_CURL_EASY: result << "Easy_"; @@ -202,7 +202,7 @@ std::string HttpStatus::toTerseString() const if (isHttpStatus()) { result << "Http_"; - error_value = mDetails->mType; + error_value = this->mDetails->mType; } else { @@ -244,7 +244,7 @@ bool HttpStatus::isRetryable() const // Disable the '*this == inv_status' test and look for 'Core_9' // failures in log files. - return ((isHttpStatus() && mDetails->mType >= 499 && mDetails->mType <= 599) || // Include special 499 in retryables + return ((isHttpStatus() && this->mDetails->mType >= 499 && this->mDetails->mType <= 599) || // Include special 499 in retryables *this == cant_connect || // Connection reset/endpoint problems *this == cant_res_proxy || // DNS problems *this == cant_res_host || // DNS problems -- cgit v1.2.3