Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always reset stream state after using std::hex

Browse Source
This commit is contained in:
Aleric Inglewood
2012-09-20 16:50:03 +02:00
parent 27090c541f
commit f3780998ed
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmessage/aicurl.cpp
View File

@@ -247,7 +247,7 @@ void ssl_init(void)
CRYPTO_set_dynlock_destroy_callback(&ssl_dyn_destroy_function); CRYPTO_set_dynlock_destroy_callback(&ssl_dyn_destroy_function);
need_renegotiation_hack = (0x10001000UL <= ssleay); need_renegotiation_hack = (0x10001000UL <= ssleay);
llinfos << "Successful initialization of " << llinfos << "Successful initialization of " <<
SSLeay_version(SSLEAY_VERSION) << " (0x" << std::hex << SSLeay() << ")." << llendl; SSLeay_version(SSLEAY_VERSION) << " (0x" << std::hex << SSLeay() << std::dec << ")." << llendl;
} }
// Cleanup OpenSSL library thread-safety. // Cleanup OpenSSL library thread-safety.
@@ -316,7 +316,7 @@ void initCurl(void (*flush_hook)())
} }
llinfos << "Successful initialization of libcurl " << llinfos << "Successful initialization of libcurl " <<
version_info->version << " (0x" << std::hex << version_info->version_num << "), (" << version_info->version << " (0x" << std::hex << version_info->version_num << std::dec << "), (" <<
version_info->ssl_version; version_info->ssl_version;
if (version_info->libz_version) if (version_info->libz_version)
{ {

6
indra/llmessage/llpartdata.cpp
View File

@@ -238,14 +238,14 @@ BOOL LLPartSysData::unpack(LLDataPacker &dp)
std::ostream& operator<<(std::ostream& s, const LLPartSysData &data) std::ostream& operator<<(std::ostream& s, const LLPartSysData &data)
{ {
s << "Flags: " << std::hex << data.mFlags; s << "Flags: " << std::hex << data.mFlags << std::dec;
s << " Pattern: " << std::hex << (U32) data.mPattern << "\n"; s << " Pattern: " << std::hex << (U32) data.mPattern << std::dec << "\n";
s << "Age: [" << data.mStartAge << ", " << data.mMaxAge << "]\n"; s << "Age: [" << data.mStartAge << ", " << data.mMaxAge << "]\n";
s << "Angle: [" << data.mInnerAngle << ", " << data.mOuterAngle << "]\n"; s << "Angle: [" << data.mInnerAngle << ", " << data.mOuterAngle << "]\n";
s << "Burst Rate: " << data.mBurstRate << "\n"; s << "Burst Rate: " << data.mBurstRate << "\n";
s << "Burst Radius: " << data.mBurstRadius << "\n"; s << "Burst Radius: " << data.mBurstRadius << "\n";
s << "Burst Speed: [" << data.mBurstSpeedMin << ", " << data.mBurstSpeedMax << "]\n"; s << "Burst Speed: [" << data.mBurstSpeedMin << ", " << data.mBurstSpeedMax << "]\n";
s << "Burst Part Count: " << std::hex << (U32) data.mBurstPartCount << "\n"; s << "Burst Part Count: " << std::hex << (U32) data.mBurstPartCount << std::dec << "\n";
s << "Angular Velocity: " << data.mAngularVelocity << "\n"; s << "Angular Velocity: " << data.mAngularVelocity << "\n";
s << "Accel: " << data.mPartAccel; s << "Accel: " << data.mPartAccel;
return s; return s;

6
indra/llrender/llgl.cpp
View File

@@ -97,9 +97,9 @@ void APIENTRY gl_debug_callback(GLenum source,
{ {
llwarns << "----- GL WARNING -------" << llendl; llwarns << "----- GL WARNING -------" << llendl;
} }
llwarns << "Type: " << std::hex << type << llendl; llwarns << "Type: " << std::hex << type << std::dec << llendl;
llwarns << "ID: " << std::hex << id << llendl; llwarns << "ID: " << std::hex << id << std::dec<< llendl;
llwarns << "Severity: " << std::hex << severity << llendl; llwarns << "Severity: " << std::hex << severity << std::dec << llendl;
llwarns << "Message: " << message << llendl; llwarns << "Message: " << message << llendl;
llwarns << "-----------------------" << llendl; llwarns << "-----------------------" << llendl;
if (severity == GL_DEBUG_SEVERITY_HIGH_ARB) if (severity == GL_DEBUG_SEVERITY_HIGH_ARB)

2
indra/llrender/llimagegl.cpp
View File

@@ -1196,7 +1196,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
intformat = GL_COMPRESSED_ALPHA; intformat = GL_COMPRESSED_ALPHA;
break; break;
default: default:
llwarns << "Could not compress format: " << std::hex << intformat << llendl; llwarns << "Could not compress format: " << std::hex << intformat << std::dec << llendl;
break; break;
} }
} }

2
indra/llrender/llrendertarget.cpp
View File

@@ -49,7 +49,7 @@ void check_framebuffer_status()
case GL_FRAMEBUFFER_COMPLETE: case GL_FRAMEBUFFER_COMPLETE:
break; break;
default: default:
llwarns << "check_framebuffer_status failed -- " << std::hex << status << llendl; llwarns << "check_framebuffer_status failed -- " << std::hex << status << std::dec << llendl;
ll_fail("check_framebuffer_status failed"); ll_fail("check_framebuffer_status failed");
break; break;
} }

2
indra/newview/llfloatermodelpreview.cpp
View File

@@ -344,7 +344,7 @@ BOOL stop_gloderror()
if (error != GLOD_NO_ERROR) if (error != GLOD_NO_ERROR)
{ {
llwarns << "GLOD error detected, cannot generate LOD: " << std::hex llwarns << "GLOD error detected, cannot generate LOD: " << std::hex
<< error << llendl; << error << std::dec << llendl;
return TRUE; return TRUE;
} }