diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp index 9332904f94c6ee5a9dae7c49ab685acaa632f38c..7d2ea809e3489ef5f07e956f5816ede3351645f1 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 ae08ac55d686e273e7b1628cc3210dc46d00f262..7b4fa5f7afd3039107007b12461dd040e28be333 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 975ce8a4d5b338f0cd14377bc0aa84f96efa8026..45df2e7cf91978fbf1d67932b48cb3439133f939 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 627841ac091e29e019ff58d5c0450d19366bfca9..37279e11d6579b037d99fa3810e6684721d9d3ee 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(); }