From 4040c50afd2232d243a048961909a225be9c87f8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 10 Aug 2021 22:44:01 -0400
Subject: [PATCH] Reset stream state to decimal
---
indra/llcommon/llprocess.cpp | 2 +-
indra/llcommon/llprocessor.cpp | 4 ++--
indra/llcorehttp/_httplibcurl.cpp | 2 +-
indra/llcorehttp/httpcommon.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 9332904f94c..7d2ea809e34 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -899,7 +899,7 @@ std::string LLProcess::getStatusString(const std::string& desc, const Status& st
if (status.mState == KILLED)
#if LL_WINDOWS
- return STRINGIZE(desc << " killed with exception " << std::hex << status.mData);
+ return STRINGIZE(desc << " killed with exception " << std::hex << status.mData << std::dec);
#else
return STRINGIZE(desc << " killed by signal " << status.mData
<< " (" << apr_signal_description_get(status.mData) << ")");
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index ae08ac55d68..7b4fa5f7afd 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -191,7 +191,7 @@ namespace
case 0xF: return "Intel Pentium 4";
case 0x10: return "Intel Itanium 2 (IA-64)";
}
- return STRINGIZE("Intel <unknown 0x" << std::hex << composed_family << ">");
+ return STRINGIZE("Intel <unknown 0x" << std::hex << composed_family << std::dec << ">");
}
std::string amd_CPUFamilyName(int composed_family)
@@ -213,7 +213,7 @@ namespace
case 0x18: return "AMD Hygon Dhyana";
case 0x19: return "AMD Zen 3";
}
- return STRINGIZE("AMD <unknown 0x" << std::hex << composed_family << ">");
+ return STRINGIZE("AMD <unknown 0x" << std::hex << composed_family << std::dec << ">");
}
std::string compute_CPUFamilyName(const char* cpu_vendor, int family, int ext_family)
diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp
index 975ce8a4d5b..45df2e7cf91 100644
--- a/indra/llcorehttp/_httplibcurl.cpp
+++ b/indra/llcorehttp/_httplibcurl.cpp
@@ -408,7 +408,7 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode
else
{
LL_WARNS(LOG_CORE) << "Curl multi_handle or handle is NULL on remove! multi:"
- << std::hex << multi_handle << " h:" << std::hex << handle << std::dec << LL_ENDL;
+ << std::hex << multi_handle << " h:" << handle << std::dec << LL_ENDL;
}
op->mCurlHandle = NULL;
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
index 627841ac091..37279e11d65 100644
--- a/indra/llcorehttp/httpcommon.cpp
+++ b/indra/llcorehttp/httpcommon.cpp
@@ -50,7 +50,7 @@ std::string HttpStatus::toHex() const
std::ostringstream result;
result.width(8);
result.fill('0');
- result << std::hex << operator U32();
+ result << std::hex << operator U32() << std::dec;
return result.str();
}
--
GitLab