Skip to content

Commit ed701f9

Browse files
committed
Compiler fixies
1 parent 79a179f commit ed701f9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

indra/newview/llfloaterblacklist.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void LLFloaterBlacklist::onClickRemove(void* user_data)
208208
if(list->getFirstSelected())
209209
{
210210
uuid_vec_t selectedIDs = list->getSelectedIDs();
211-
typename uuid_vec_t::const_iterator iterator;
211+
uuid_vec_t::const_iterator iterator;
212212
for(iterator = selectedIDs.begin();
213213
iterator != selectedIDs.end();
214214
++iterator)

indra/newview/llinventorybridge.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,7 @@ int get_folder_levels(LLInventoryCategory* inv_cat)
21972197

21982198
int max_child_levels = 0;
21992199

2200-
for (S32 i=0; i < cats->size(); ++i)
2200+
for (size_t i=0; i < cats->size(); ++i)
22012201
{
22022202
LLInventoryCategory* category = cats->at(i);
22032203
max_child_levels = llmax(max_child_levels, get_folder_levels(category));
@@ -2447,7 +2447,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
24472447

24482448
if (is_movable == TRUE)
24492449
{
2450-
for (S32 i=0; i < descendent_items.size(); ++i)
2450+
for (size_t i=0; i < descendent_items.size(); ++i)
24512451
{
24522452
LLInventoryItem* item = descendent_items[i];
24532453
if (!can_move_to_outbox(item))

indra/newview/llvovolume.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3951,7 +3951,7 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
39513951

39523952
LLMatrix4a src;
39533953
// clamp k to kMaxJoints to avoid reading garbage off stack in release
3954-
src.setMul(mp[(idx[k] < count) ? idx[k] : 0], w);
3954+
src.setMul(mp[(idx[k] < (S32)count) ? idx[k] : 0], w);
39553955

39563956
final_mat.add(src);
39573957
}

0 commit comments

Comments
 (0)