Browse Source

Fixed warnings

Christophe Riccio 10 years ago
parent
commit
357eaf7071

+ 1 - 1
test/core/core_setup_message.cpp

@@ -196,7 +196,7 @@ int test_instruction_set()
 
 
 int test_cpp_version()
 int test_cpp_version()
 {
 {
-	std::printf("__cplusplus: %d\n", __cplusplus);
+	std::printf("__cplusplus: %ld\n", __cplusplus);
 	
 	
 	return 0;
 	return 0;
 }
 }

+ 2 - 2
test/core/core_type_vec4.cpp

@@ -398,7 +398,7 @@ int test_vec4_perf_AoS(std::size_t Size)
 
 
 	std::clock_t EndTime = std::clock();
 	std::clock_t EndTime = std::clock();
 
 
-  std::printf("AoS: %d\n", EndTime - StartTime);
+  std::printf("AoS: %ld\n", EndTime - StartTime);
 
 
 	return Error;
 	return Error;
 }
 }
@@ -437,7 +437,7 @@ int test_vec4_perf_SoA(std::size_t Size)
 
 
 	std::clock_t EndTime = std::clock();
 	std::clock_t EndTime = std::clock();
 
 
-	std::printf("SoA: %d\n", EndTime - StartTime);
+	std::printf("SoA: %ld\n", EndTime - StartTime);
 
 
 	return Error;
 	return Error;
 }
 }

+ 7 - 7
test/gtc/gtc_integer.cpp

@@ -99,7 +99,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<int>: %d clocks\n", End - Begin);
+			printf("glm::log2<int>: %ld clocks\n", End - Begin);
 		}
 		}
 
 
 		{
 		{
@@ -113,7 +113,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<ivec4>: %d clocks\n", End - Begin);
+			printf("glm::log2<ivec4>: %ld clocks\n", End - Begin);
 		}
 		}
 
 
 #		if GLM_HAS_BITSCAN_WINDOWS
 #		if GLM_HAS_BITSCAN_WINDOWS
@@ -135,7 +135,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<ivec4> inlined: %d clocks\n", End - Begin);
+			printf("glm::log2<ivec4> inlined: %ld clocks\n", End - Begin);
 		}
 		}
 
 
 
 
@@ -155,7 +155,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<ivec4> inlined no cast: %d clocks\n", End - Begin);
+			printf("glm::log2<ivec4> inlined no cast: %ld clocks\n", End - Begin);
 		}
 		}
 
 
 
 
@@ -175,7 +175,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<ivec4> reinterpret: %d clocks\n", End - Begin);
+			printf("glm::log2<ivec4> reinterpret: %ld clocks\n", End - Begin);
 		}
 		}
 #		endif//GLM_HAS_BITSCAN_WINDOWS
 #		endif//GLM_HAS_BITSCAN_WINDOWS
 
 
@@ -190,7 +190,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<float>: %d clocks\n", End - Begin);
+			printf("glm::log2<float>: %ld clocks\n", End - Begin);
 		}
 		}
 
 
 		{
 		{
@@ -204,7 +204,7 @@ namespace log2_
 
 
 			std::clock_t End = clock();
 			std::clock_t End = clock();
 
 
-			printf("glm::log2<vec4>: %d clocks\n", End - Begin);
+			printf("glm::log2<vec4>: %ld clocks\n", End - Begin);
 		}
 		}
 
 
 		return Error;
 		return Error;

+ 4 - 4
test/gtx/gtx_type_aligned.cpp

@@ -47,7 +47,7 @@ int test_decl()
 			glm::vec4 B;
 			glm::vec4 B;
 		};
 		};
 
 
-		printf("vec4 - Aligned: %d, unaligned: %d\n", sizeof(S1), sizeof(S2));
+		printf("vec4 - Aligned: %ld, unaligned: %ld\n", sizeof(S1), sizeof(S2));
 
 
 		Error += sizeof(S1) >= sizeof(S2) ? 0 : 1;
 		Error += sizeof(S1) >= sizeof(S2) ? 0 : 1;
 	}
 	}
@@ -65,7 +65,7 @@ int test_decl()
 			glm::aligned_vec3 B;
 			glm::aligned_vec3 B;
 		};
 		};
 
 
-		printf("vec3: %d, aligned: %d\n", sizeof(S1), sizeof(S2));
+		printf("vec3: %ld, aligned: %ld\n", sizeof(S1), sizeof(S2));
 
 
 		Error += sizeof(S1) <= sizeof(S2) ? 0 : 1;
 		Error += sizeof(S1) <= sizeof(S2) ? 0 : 1;
 	}
 	}
@@ -83,7 +83,7 @@ int test_decl()
 			glm::vec4 B;
 			glm::vec4 B;
 		};
 		};
 
 
-		printf("vec4 - Aligned: %d, unaligned: %d\n", sizeof(S1), sizeof(S2));
+		printf("vec4 - Aligned: %ld, unaligned: %ld\n", sizeof(S1), sizeof(S2));
 
 
 		Error += sizeof(S1) >= sizeof(S2) ? 0 : 1;
 		Error += sizeof(S1) >= sizeof(S2) ? 0 : 1;
 	}
 	}
@@ -101,7 +101,7 @@ int test_decl()
 			glm::dvec4 B;
 			glm::dvec4 B;
 		};
 		};
 
 
-		printf("dvec4 - Aligned: %d, unaligned: %d\n", sizeof(S1), sizeof(S2));
+		printf("dvec4 - Aligned: %ld, unaligned: %ld\n", sizeof(S1), sizeof(S2));
 
 
 		Error += sizeof(S1) >= sizeof(S2) ? 0 : 1;
 		Error += sizeof(S1) >= sizeof(S2) ? 0 : 1;
 	}
 	}