mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-22 17:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-29 10:35:19 +01:00
parent 97e4fd1025
commit c839f52697
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/core/core_func_common.cpp
View File

@ -900,11 +900,11 @@ namespace sign
std::clock_t Timestamp5 = std::clock();
std::printf("sign_cmp(rand) Time %d clocks\n", Timestamp1 - Timestamp0);
std::printf("sign_if(rand) Time %d clocks\n", Timestamp2 - Timestamp1);
std::printf("sign_alu1(rand) Time %d clocks\n", Timestamp3 - Timestamp2);
std::printf("sign_alu2(rand) Time %d clocks\n", Timestamp4 - Timestamp3);
std::printf("sign_sub(rand) Time %d clocks\n", Timestamp5 - Timestamp4);
std::printf("sign_cmp(rand) Time %d clocks\n", static_cast<unsigned int>(Timestamp1 - Timestamp0));
std::printf("sign_if(rand) Time %d clocks\n", static_cast<unsigned int>(Timestamp2 - Timestamp1));
std::printf("sign_alu1(rand) Time %d clocks\n", static_cast<unsigned int>(Timestamp3 - Timestamp2));
std::printf("sign_alu2(rand) Time %d clocks\n", static_cast<unsigned int>(Timestamp4 - Timestamp3));
std::printf("sign_sub(rand) Time %d clocks\n", static_cast<unsigned int>(Timestamp5 - Timestamp4));
return Error;
}
@ -947,11 +947,11 @@ namespace sign
std::clock_t Timestamp5 = std::clock();
std::printf("sign_cmp(linear) Time %d clocks\n", Timestamp1 - Timestamp0);
std::printf("sign_if(linear) Time %d clocks\n", Timestamp2 - Timestamp1);
std::printf("sign_alu1(linear) Time %d clocks\n", Timestamp3 - Timestamp2);
std::printf("sign_alu2(linear) Time %d clocks\n", Timestamp4 - Timestamp3);
std::printf("sign_sub(linear) Time %d clocks\n", Timestamp5 - Timestamp4);
std::printf("sign_cmp(linear) Time %d clocks\n", static_cast<unsigned int>(Timestamp1 - Timestamp0));
std::printf("sign_if(linear) Time %d clocks\n", static_cast<unsigned int>(Timestamp2 - Timestamp1));
std::printf("sign_alu1(linear) Time %d clocks\n", static_cast<unsigned int>(Timestamp3 - Timestamp2));
std::printf("sign_alu2(linear) Time %d clocks\n", static_cast<unsigned int>(Timestamp4 - Timestamp3));
std::printf("sign_sub(linear) Time %d clocks\n", static_cast<unsigned int>(Timestamp5 - Timestamp4));
return Error;
}
@ -990,13 +990,13 @@ namespace sign
std::clock_t Timestamp5 = std::clock();
std::printf("Sum %d\n", Sum);
std::printf("Sum %d\n", static_cast<unsigned int>(Sum));
std::printf("sign_cmp(linear_cal) Time %d clocks\n", Timestamp1 - Timestamp0);
std::printf("sign_if(linear_cal) Time %d clocks\n", Timestamp2 - Timestamp1);
std::printf("sign_alu1(linear_cal) Time %d clocks\n", Timestamp3 - Timestamp2);
std::printf("sign_alu2(linear_cal) Time %d clocks\n", Timestamp4 - Timestamp3);
std::printf("sign_sub(linear_cal) Time %d clocks\n", Timestamp5 - Timestamp4);
std::printf("sign_cmp(linear_cal) Time %d clocks\n", static_cast<unsigned int>(Timestamp1 - Timestamp0));
std::printf("sign_if(linear_cal) Time %d clocks\n", static_cast<unsigned int>(Timestamp2 - Timestamp1));
std::printf("sign_alu1(linear_cal) Time %d clocks\n", static_cast<unsigned int>(Timestamp3 - Timestamp2));
std::printf("sign_alu2(linear_cal) Time %d clocks\n", static_cast<unsigned int>(Timestamp4 - Timestamp3));
std::printf("sign_sub(linear_cal) Time %d clocks\n", static_cast<unsigned int>(Timestamp5 - Timestamp4));
return Error;
}

16
test/core/core_func_integer.cpp
View File

@ -182,7 +182,7 @@ namespace bitfieldReverse
else if(Data32[i].Result == FAIL && !Compare)
continue;
printf("glm::bitfieldReverse test fail on test %d\n", i);
std::printf("glm::bitfieldReverse test fail on test %d\n", static_cast<unsigned int>(i));
return 1;
}
@ -205,7 +205,7 @@ namespace bitfieldReverse
else if(Data64[i].Result == FAIL && !Compare)
continue;
printf("glm::extractfield test fail on test %d\n", i);
std::printf("glm::extractfield test fail on test %d\n", static_cast<unsigned int>(i));
return 1;
}
@ -351,7 +351,7 @@ namespace findMSB
std::clock_t Timestamps2 = std::clock();
printf("findMSB - 0.9.5: %d clocks\n", Timestamps2 - Timestamps1);
std::printf("findMSB - 0.9.5: %d clocks\n", static_cast<unsigned int>(Timestamps2 - Timestamps1));
return Error;
}
@ -410,7 +410,7 @@ namespace findMSB
std::clock_t Timestamps2 = std::clock();
printf("findMSB - nlz1: %d clocks\n", Timestamps2 - Timestamps1);
std::printf("findMSB - nlz1: %d clocks\n", static_cast<unsigned int>(Timestamps2 - Timestamps1));
return Error;
}
@ -919,10 +919,10 @@ namespace bitCount
std::clock_t TimeDefault = TimestampsD - TimestampsC;
std::clock_t TimeVec4 = TimestampsE - TimestampsD;
printf("bitCount - TimeIf %d\n", TimeIf);
printf("bitCount - TimeVec %d\n", TimeVec);
printf("bitCount - TimeDefault %d\n", TimeDefault);
printf("bitCount - TimeVec4 %d\n", TimeVec4);
std::printf("bitCount - TimeIf %d\n", static_cast<unsigned int>(TimeIf));
std::printf("bitCount - TimeVec %d\n", static_cast<unsigned int>(TimeVec));
std::printf("bitCount - TimeDefault %d\n", static_cast<unsigned int>(TimeDefault));
std::printf("bitCount - TimeVec4 %d\n", static_cast<unsigned int>(TimeVec4));
return Error;
}