diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 4be38c9fa91fbd0f6bbbb5f0d32d67028ede2520..e20ae6daadc15d9eb93c6944b9d6780ee56c4db9 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -456,7 +456,7 @@ public:
if (mElementCount > 0)
{
- if (mElementCount != i)
+ if ((S32)mElementCount != i)
{
mData[i] = mData[mElementCount]; //might unref data, do not access data after this point
mData[i]->setBinIndex(i);
@@ -481,7 +481,7 @@ public:
{
S32 i = data->getBinIndex();
- if (i >= 0 && i < mElementCount)
+ if (i >= 0 && i < (S32)mElementCount)
{
if (mData[i] == data)
{ //found it
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 450a3dfcec9abfcf9dac4a7c311398c10ccb2321..730f8ec97e1a0a9746c8c8896aa8e3f9ee759a0d 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1925,7 +1925,7 @@ void LLGLDepthTest::checkState()
if (glIsEnabled(GL_DEPTH_TEST) != sDepthEnabled ||
sWriteEnabled != mask ||
- sDepthFunc != func)
+ sDepthFunc != (GLenum)func)
{
if (gDebugSession)
{
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 6fbe48dd90f9e6120285a03ec2857c375ac47b63..accbad5767d640de5c050b7bdb47e1a6e9faff5f 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -77,7 +77,7 @@ public:
struct gl_uniform_data_t {
std::string name;
- GLenum type = -1;
+ GLenum type = (GLenum)-1;
GLint size = -1;
U32 texunit_priority = UINT_MAX; // Lower gets earlier texunits indices.
};
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index bde9090876389a257dcd073445e4d54b6320fc00..815e373ce5ec0fdc6999648dc3e770071061c6cb 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -119,7 +119,7 @@ void LLImageGL::checkTexSize(bool forced) const
GLint texname;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &texname);
BOOL error = FALSE;
- if (texname != mTexName)
+ if (static_cast<LLGLenum>(texname) != mTexName)
{
LL_INFOS() << "Bound: " << texname << " Should bind: " << mTexName << " Default: " << LLImageGL::sDefaultGLTexture->getTexName() << LL_ENDL;
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index bab59ee034a9ef28e723b81bf3bbff8b6f1dda2e..5fc0bef8387130f08717b37c2158b1ddbaeb5404 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1696,7 +1696,7 @@ void LLRender::setAlphaRejectSettings(eCompareFunc func, F32 value)
func = CF_GREATER;
}
- if (cur_func != sGLCompareFunc[func])
+ if (static_cast<GLenum>(cur_func) != sGLCompareFunc[func])
{
LL_ERRS() << "Alpha test function corrupted!" << LL_ENDL;
}
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index d0f8c915b9fdf3bf66f8f65ff38962896d7c2fc9..3b0c7ec72b7a07b30115cc953e2fdb7e8210fe7e 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -273,7 +273,7 @@ void LLVBOPool::seedPool()
{
U32 size = i*LL_VBO_BLOCK_SIZE;
- S32 count = mMissCount[i] - mFreeList[i].size();
+ U32 count = mMissCount[i] - mFreeList[i].size();
for (U32 j = 0; j < count; ++j)
{
allocate(dummy_name, size, true);
@@ -750,7 +750,7 @@ void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indi
GLint elem = 0;
glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &elem);
- if (elem != mGLIndices)
+ if (elem != static_cast<GLint>(mGLIndices))
{
LL_ERRS() << "Wrong index buffer bound!" << LL_ENDL;
}
@@ -1311,7 +1311,7 @@ bool LLVertexBuffer::updateNumVerts(S32 nverts)
nverts = 65536;
}
- U32 needed_size = calcOffsets(mTypeMask, mOffsets, nverts);
+ S32 needed_size = calcOffsets(mTypeMask, mOffsets, nverts);
if (needed_size > mSize || needed_size <= mSize/2)
{
@@ -1331,7 +1331,7 @@ bool LLVertexBuffer::updateNumIndices(S32 nindices)
bool sucsess = true;
- U32 needed_size = sizeof(U16) * nindices;
+ S32 needed_size = sizeof(U16) * nindices;
if (needed_size > mIndicesSize || needed_size <= mIndicesSize/2)
{
@@ -1794,7 +1794,7 @@ volatile U8* LLVertexBuffer::mapIndexBuffer(S32 index, S32 count, bool map_range
GLint elem = 0;
glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &elem);
- if (elem != mGLIndices)
+ if (elem != static_cast<GLint>(mGLIndices))
{
LL_ERRS() << "Wrong index buffer bound!" << LL_ENDL;
}
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index a47b23a29fc3d1e0d82429f0b52ffd9ec1f9c592..3591f0a8e3f3f9b9025520a1b5c75cea996fbedb 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -1548,7 +1548,7 @@ const char *LLXMLNode::parseFloat(const char *str, F64 *dest, U32 precision, Enc
}
if (strncmp(str, "-inf", 4) == 0)
{
- *(U64 *)dest = 0xFFF0000000000000ll;
+ *(U64 *)dest = 0xFFF0000000000000ull;
return str + 4;
}
if (strncmp(str, "1.#INF", 6) == 0)
@@ -1558,7 +1558,7 @@ const char *LLXMLNode::parseFloat(const char *str, F64 *dest, U32 precision, Enc
}
if (strncmp(str, "-1.#INF", 7) == 0)
{
- *(U64 *)dest = 0xFFF0000000000000ll;
+ *(U64 *)dest = 0xFFF0000000000000ull;
return str + 7;
}
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 19ea21a0268d87a8fa03334831fd91b457f4372b..6d6a9fdb79f4613047e626d793aed67afda287ad 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -233,7 +233,7 @@ class LLConversationFilter : public LLFolderViewFilter
{
public:
- enum ESortOrderType
+ enum ESortOrderType : U32
{
SO_NAME = 0, // Sort by name
SO_DATE = 0x1, // Sort by date (most recent)
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index dfaa26ff5df9ca4592bef749330f8eabf4178a38..efaf4a2c9b8d7b5cf13f5d7238ef26b895c58156 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -44,7 +44,7 @@ public:
// This enumeration is a way to refer to what changed in a more
// human readable format. You can mask the value provided by
// chaged() to see if the observer is interested in the change.
- enum
+ enum EObserverMask : U32
{
NONE = 0,
LABEL = 1, // Name changed
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index d89c96dda8aa15e35e4c84857fdb2af6dc3b458a..135d69decf5b8cfee5e20d2b19f5290adbeb9178 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -326,7 +326,7 @@ void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
group->mBuilt = 1.f;
if (group->mVertexBuffer.isNull() ||
!group->mVertexBuffer->isWriteable() ||
- (group->mBufferUsage != group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs))
+ (group->mBufferUsage != (U32)group->mVertexBuffer->getUsage() && LLVertexBuffer::sEnableVBOs))
{
group->mVertexBuffer = createVertexBuffer(mVertexDataMask, group->mBufferUsage);
if (!group->mVertexBuffer->allocateBuffer(vertex_count, index_count, true))
@@ -3306,7 +3306,7 @@ public:
if (gDebugGL)
{
- for (U32 i = 0; i < drawable->getNumFaces(); ++i)
+ for (S32 i = 0; i < drawable->getNumFaces(); ++i)
{
LLFace* facep = drawable->getFace(i);
if (facep)
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index 222f5c4c2d9a2dd0d81a07ad26859e12dd7a162d..f7febdd44128352650e89c267599049b61667073 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -441,7 +441,7 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
else
{
auto file_buffer = std::make_unique<char[]>(file_size + 1);
- if (infile.read(file_buffer.get(), file_size) == file_size)
+ if (infile.read(file_buffer.get(), file_size) == (apr_size_t)file_size)
{
file_buffer[file_size] = '\0';
LL_INFOS() << "Loading BVH file " << getFileName() << LL_ENDL;