diff --git a/CMakeLists.txt b/CMakeLists.txt index f385a13b..81fea159 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ endif() if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_definitions(-Weverything -Wpedantic -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-documentation -Wno-gnu-anonymous-struct -Wno-nested-anon-types) - add_definitions(-Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare) + add_definitions(-Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-double-promotion) endif() option(GLM_TEST_ENABLE_LANG_EXTENSIONS "Enable language extensions" OFF) diff --git a/test/gtx/gtx_io.cpp b/test/gtx/gtx_io.cpp index f28b464b..a06d1cf6 100644 --- a/test/gtx/gtx_io.cpp +++ b/test/gtx/gtx_io.cpp @@ -30,7 +30,7 @@ namespace } template - std::basic_string type_name(std::basic_ostream& os, T const&) + std::basic_string type_name(std::basic_ostream&, T const&) { std::basic_ostringstream ostr; diff --git a/test/gtx/gtx_matrix_factorisation.cpp b/test/gtx/gtx_matrix_factorisation.cpp index 40e56e4b..d2522f58 100644 --- a/test/gtx/gtx_matrix_factorisation.cpp +++ b/test/gtx/gtx_matrix_factorisation.cpp @@ -19,7 +19,7 @@ int test_qr(matType m) for (glm::length_t i = 0; i < C; i++) for (glm::length_t j = 0; j < R; j++) - Error += std::abs(err[i][j]) > epsilon ? 1 : 0; + Error += glm::abs(err[i][j]) > epsilon ? 1 : 0; //Test if the columns of q are orthonormal for (glm::length_t i = 0; i < (C < R ? C : R); i++) @@ -27,7 +27,7 @@ int test_qr(matType m) Error += (length(q[i]) - 1) > epsilon ? 1 : 0; for (glm::length_t j = 0; j epsilon ? 1 : 0; + Error += glm::abs(dot(q[i], q[j])) > epsilon ? 1 : 0; } //Test if the matrix r is upper triangular @@ -54,7 +54,7 @@ int test_rq(matType m) for (glm::length_t i = 0; i < C; i++) for (glm::length_t j = 0; j < R; j++) - Error += std::abs(err[i][j]) > epsilon ? 1 : 0; + Error += glm::abs(err[i][j]) > epsilon ? 1 : 0; //Test if the rows of q are orthonormal matType<(C < R ? C : R), C, T, P> tq = transpose(q); @@ -64,7 +64,7 @@ int test_rq(matType m) Error += (length(tq[i]) - 1) > epsilon ? 1 : 0; for (glm::length_t j = 0; j epsilon ? 1 : 0; + Error += glm::abs(dot(tq[i], tq[j])) > epsilon ? 1 : 0; } //Test if the matrix r is upper triangular