From 331c08098dff773721b4787679f68e9bacac36eb Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 9 Mar 2021 20:02:22 -0500
Subject: [PATCH] Fix some warnings from gcc
---
indra/llcorehttp/_httppolicy.cpp | 4 ++++
indra/llcorehttp/httpcommon.cpp | 4 ----
indra/llcorehttp/httpcommon.h | 2 +-
indra/newview/llimview.cpp | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp
index 371794e63fd..85ca3108e43 100644
--- a/indra/llcorehttp/_httppolicy.cpp
+++ b/indra/llcorehttp/_httppolicy.cpp
@@ -162,12 +162,16 @@ void HttpPolicy::retryOp(const HttpOpRequest::ptr_t &op)
// mPolicyRetries limited to 100
U32 delta_factor = op->mPolicyRetries <= 10 ? 1 << op->mPolicyRetries : 1024;
HttpTime delta = llmin(delta_min * delta_factor, delta_max);
+#if SHOW_DEBUG
bool external_delta(false);
+#endif
if (op->mReplyRetryAfter > 0 && op->mReplyRetryAfter < 30)
{
delta = op->mReplyRetryAfter * U64L(1000000);
+#if SHOW_DEBUG
external_delta = true;
+#endif
}
op->mPolicyRetryAt = now + delta;
++op->mPolicyRetries;
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index 457fafd0f7a..eb4bb2a392a 100644
--- a/indra/llcorehttp/httpcommon.cpp
+++ b/indra/llcorehttp/httpcommon.cpp
@@ -47,10 +47,6 @@
namespace LLCore
{
-HttpStatus::type_enum_t EXT_CURL_EASY;
-HttpStatus::type_enum_t EXT_CURL_MULTI;
-HttpStatus::type_enum_t LLCORE;
-
HttpStatus::operator U32() const
{
// Effectively, concatenate mType (high) with mStatus (low).
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index 01df4f934d0..72437590129 100644
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -299,7 +299,7 @@ enum HttpError
struct HttpStatus
{
typedef unsigned short type_enum_t;
- enum : type_enum_t
+ enum EType : type_enum_t
{
EXT_CURL_EASY = 0, ///< mStatus is an error from a curl_easy_*() call
EXT_CURL_MULTI = 1, ///< mStatus is an error from a curl_multi_*() call
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 64c9be7188d..2758ddf13dc 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2724,11 +2724,11 @@ void LLIMMgr::addMessage(
//*NOTE session_name is empty in case of incoming P2P sessions
std::string fixed_session_name = from;
- bool name_is_setted = false;
+// bool name_is_setted = false;
if(!session_name.empty() && session_name.size()>1)
{
fixed_session_name = session_name;
- name_is_setted = true;
+// name_is_setted = true;
}
// bool skip_message = false;
// bool from_linden = LLMuteList::getInstance()->isLinden(from);
--
GitLab