Christophe Riccio 11 vuotta sitten
vanhempi
sitoutus
c839f52697
2 muutettua tiedostoa jossa 24 lisäystä ja 24 poistoa
  1. 16 16
      test/core/core_func_common.cpp
  2. 8 8
      test/core/core_func_integer.cpp

+ 16 - 16
test/core/core_func_common.cpp

@@ -900,11 +900,11 @@ namespace sign
 
 
 		std::clock_t Timestamp5 = std::clock();
 		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;
 		return Error;
 	}
 	}
@@ -947,11 +947,11 @@ namespace sign
 
 
 		std::clock_t Timestamp5 = std::clock();
 		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;
 		return Error;
 	}
 	}
@@ -990,13 +990,13 @@ namespace sign
 
 
 		std::clock_t Timestamp5 = std::clock();
 		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;
 		return Error;
 	}
 	}

+ 8 - 8
test/core/core_func_integer.cpp

@@ -182,7 +182,7 @@ namespace bitfieldReverse
 			else if(Data32[i].Result == FAIL && !Compare)
 			else if(Data32[i].Result == FAIL && !Compare)
 				continue;
 				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;
 			return 1;
 		}
 		}
 		
 		
@@ -205,7 +205,7 @@ namespace bitfieldReverse
 			else if(Data64[i].Result == FAIL && !Compare)
 			else if(Data64[i].Result == FAIL && !Compare)
 				continue;
 				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;
 			return 1;
 		}
 		}
 		
 		
@@ -351,7 +351,7 @@ namespace findMSB
 
 
 		std::clock_t Timestamps2 = std::clock();
 		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;
 		return Error;
 	}
 	}
@@ -410,7 +410,7 @@ namespace findMSB
 
 
 		std::clock_t Timestamps2 = std::clock();
 		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;
 		return Error;
 	}
 	}
@@ -919,10 +919,10 @@ namespace bitCount
 		std::clock_t TimeDefault = TimestampsD - TimestampsC;
 		std::clock_t TimeDefault = TimestampsD - TimestampsC;
 		std::clock_t TimeVec4 = TimestampsE - TimestampsD;
 		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;
 		return Error;
 	}
 	}