diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index 68ea98de..b77efae5 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -188,11 +188,13 @@ int test_ctr() { int Error(0); +#if (GLM_LANG & GLM_LANG_CXX11_FLAG) || (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12) //Error += std::is_trivially_default_constructible::value ? 0 : 1; //Error += std::is_trivially_copy_assignable::value ? 0 : 1; Error += std::is_trivially_copyable::value ? 0 : 1; //Error += std::is_copy_constructible::value ? 0 : 1; //Error += std::has_trivial_copy_constructor::value ? 0 : 1; +#endif #if(GLM_HAS_INITIALIZER_LISTS) glm::mat4 m0( diff --git a/test/core/core_type_vec1.cpp b/test/core/core_type_vec1.cpp index 6dfc33fc..d32d4be8 100644 --- a/test/core/core_type_vec1.cpp +++ b/test/core/core_type_vec1.cpp @@ -44,6 +44,18 @@ int test_vec1_ctor() { int Error = 0; +#if (GLM_LANG & GLM_LANG_CXX11_FLAG) || (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12) +// Error += std::is_trivially_default_constructible::value ? 0 : 1; +// Error += std::is_trivially_copy_assignable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + + Error += std::has_trivial_copy_constructor::value ? 0 : 1; + Error += std::is_copy_constructible::value ? 0 : 1; +#endif + /* #if GLM_HAS_INITIALIZER_LISTS { diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index 12a897e4..5a797cb8 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -201,6 +201,18 @@ int test_vec2_ctor() { int Error = 0; +#if (GLM_LANG & GLM_LANG_CXX11_FLAG) || (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12) +// Error += std::is_trivially_default_constructible::value ? 0 : 1; +// Error += std::is_trivially_copy_assignable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + + Error += std::has_trivial_copy_constructor::value ? 0 : 1; + Error += std::is_copy_constructible::value ? 0 : 1; +#endif + #if GLM_HAS_INITIALIZER_LISTS { glm::vec2 a{ 0, 1 }; diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index f1cc8b91..f2fe3ad2 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -19,8 +19,20 @@ int test_vec3_ctor() { int Error = 0; - -#if(GLM_HAS_INITIALIZER_LISTS) + +#if (GLM_LANG & GLM_LANG_CXX11_FLAG) || (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12) +// Error += std::is_trivially_default_constructible::value ? 0 : 1; +// Error += std::is_trivially_copy_assignable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + + Error += std::has_trivial_copy_constructor::value ? 0 : 1; + Error += std::is_copy_constructible::value ? 0 : 1; +#endif + +#if (GLM_HAS_INITIALIZER_LISTS) { glm::vec3 a{ 0, 1, 2 }; std::vector v = { diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index 1ceb7a04..e373dbad 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -47,14 +47,17 @@ int test_vec4_ctor() glm::ivec4 B(A); Error += glm::all(glm::equal(A, B)) ? 0 : 1; +#if (GLM_LANG & GLM_LANG_CXX11_FLAG) || (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12) // Error += std::is_trivially_default_constructible::value ? 0 : 1; // Error += std::is_trivially_copy_assignable::value ? 0 : 1; Error += std::is_trivially_copyable::value ? 0 : 1; -// Error += std::is_trivially_copy_assignable::value ? 0 : 1; -// Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; + Error += std::is_trivially_copyable::value ? 0 : 1; Error += std::has_trivial_copy_constructor::value ? 0 : 1; Error += std::is_copy_constructible::value ? 0 : 1; +#endif #if GLM_HAS_INITIALIZER_LISTS {