From f846aa8334199f6639e1139c1c2a818be40395b0 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 1 Apr 2019 16:04:04 +0200 Subject: [PATCH] Build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883 --- glm/gtx/associated_min_max.hpp | 2 +- glm/gtx/bit.hpp | 2 +- glm/gtx/closest_point.hpp | 2 +- glm/gtx/color_encoding.hpp | 6 +++++- glm/gtx/color_space.hpp | 2 +- glm/gtx/color_space_YCoCg.hpp | 2 +- glm/gtx/common.hpp | 2 +- glm/gtx/compatibility.hpp | 2 +- glm/gtx/component_wise.hpp | 2 +- glm/gtx/dual_quaternion.hpp | 2 +- glm/gtx/easing.hpp | 2 +- glm/gtx/euler_angles.hpp | 2 +- glm/gtx/extend.hpp | 2 +- glm/gtx/extended_min_max.hpp | 2 +- glm/gtx/exterior_product.hpp | 6 +++++- glm/gtx/fast_exponential.hpp | 2 +- glm/gtx/fast_square_root.hpp | 2 +- glm/gtx/fast_trigonometry.hpp | 2 +- glm/gtx/functions.hpp | 6 +++++- glm/gtx/gradient_paint.hpp | 2 +- glm/gtx/handed_coordinate_space.hpp | 2 +- glm/gtx/hash.hpp | 2 +- glm/gtx/integer.hpp | 2 +- glm/gtx/intersect.hpp | 2 +- glm/gtx/io.hpp | 2 +- glm/gtx/log_base.hpp | 2 +- glm/gtx/matrix_cross_product.hpp | 2 +- glm/gtx/matrix_decompose.hpp | 2 +- glm/gtx/matrix_factorisation.hpp | 2 +- glm/gtx/matrix_interpolation.hpp | 2 +- glm/gtx/matrix_major_storage.hpp | 2 +- glm/gtx/matrix_operation.hpp | 2 +- glm/gtx/matrix_query.hpp | 2 +- glm/gtx/matrix_transform_2d.hpp | 2 +- glm/gtx/mixed_product.hpp | 2 +- glm/gtx/norm.hpp | 2 +- glm/gtx/normal.hpp | 2 +- glm/gtx/normalize_dot.hpp | 2 +- glm/gtx/number_precision.hpp | 2 +- glm/gtx/optimum_pow.hpp | 2 +- glm/gtx/orthonormalize.hpp | 2 +- glm/gtx/perpendicular.hpp | 2 +- glm/gtx/polar_coordinates.hpp | 2 +- glm/gtx/projection.hpp | 2 +- glm/gtx/quaternion.hpp | 2 +- glm/gtx/range.hpp | 2 +- glm/gtx/raw_data.hpp | 2 +- glm/gtx/rotate_normalized_axis.hpp | 2 +- glm/gtx/rotate_vector.hpp | 2 +- glm/gtx/scalar_multiplication.hpp | 2 +- glm/gtx/scalar_relational.hpp | 2 +- glm/gtx/spline.hpp | 2 +- glm/gtx/std_based_type.hpp | 2 +- glm/gtx/string_cast.hpp | 2 +- glm/gtx/texture.hpp | 2 +- glm/gtx/transform.hpp | 2 +- glm/gtx/transform2.hpp | 2 +- glm/gtx/type_aligned.hpp | 2 +- glm/gtx/type_trait.hpp | 2 +- glm/gtx/vec_swizzle.hpp | 2 +- glm/gtx/vector_angle.hpp | 2 +- glm/gtx/vector_query.hpp | 2 +- glm/gtx/wrap.hpp | 2 +- readme.md | 4 ++++ 64 files changed, 79 insertions(+), 63 deletions(-) diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index c4a695e4..d1a41c06 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_associated_min_max extension included") # endif #endif diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index f6b608c3..60a7aef1 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_bit extension included") # endif #endif diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index ae145f5f..de6dbbff 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_closest_point extension included") # endif #endif diff --git a/glm/gtx/color_encoding.hpp b/glm/gtx/color_encoding.hpp index 8581b159..96ded2a2 100644 --- a/glm/gtx/color_encoding.hpp +++ b/glm/gtx/color_encoding.hpp @@ -20,7 +20,11 @@ #include #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTC_color_encoding extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTC_color_encoding is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# else +# pragma message("GLM: GLM_GTC_color_encoding extension included") +# endif #endif namespace glm diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index 09afdc09..a6343921 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_color_space extension included") # endif #endif diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index ec405d64..dd2b7716 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_color_space_YCoCg extension included") # endif #endif diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp index de999efb..254ada2d 100644 --- a/glm/gtx/common.hpp +++ b/glm/gtx/common.hpp @@ -21,7 +21,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_common extension included") # endif #endif diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index 98a47a79..f1b00a6b 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_compatibility extension included") # endif #endif diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 7ebfc840..34a2b0a3 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -21,7 +21,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_component_wise extension included") # endif #endif diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index d3d99556..6a51ab7d 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -23,7 +23,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_dual_quaternion extension included") # endif #endif diff --git a/glm/gtx/easing.hpp b/glm/gtx/easing.hpp index fa954186..57f3d61b 100644 --- a/glm/gtx/easing.hpp +++ b/glm/gtx/easing.hpp @@ -24,7 +24,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_easing is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_easing extension included") # endif #endif diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index 35a15316..27236973 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -21,7 +21,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_euler_angles extension included") # endif #endif diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index a69faf4a..28b7c5c0 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_extend extension included") # endif #endif diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp index 5b328dd8..ad23a91d 100644 --- a/glm/gtx/extended_min_max.hpp +++ b/glm/gtx/extended_min_max.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_extented_min_max extension included") # endif #endif diff --git a/glm/gtx/exterior_product.hpp b/glm/gtx/exterior_product.hpp index 473630e3..5522df78 100644 --- a/glm/gtx/exterior_product.hpp +++ b/glm/gtx/exterior_product.hpp @@ -18,7 +18,11 @@ #include "../detail/qualifier.hpp" #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_exterior_product extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_exterior_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# else +# pragma message("GLM: GLM_GTX_exterior_product extension included") +# endif #endif namespace glm diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 450b1a64..6fb72865 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_fast_exponential extension included") # endif #endif diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index 2b24d85c..9fb3f2fc 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -22,7 +22,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_fast_square_root extension included") # endif #endif diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index cead03d4..2650d6e4 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_fast_trigonometry extension included") # endif #endif diff --git a/glm/gtx/functions.hpp b/glm/gtx/functions.hpp index 6bd746c4..9f4166c4 100644 --- a/glm/gtx/functions.hpp +++ b/glm/gtx/functions.hpp @@ -19,7 +19,11 @@ #include "../detail/type_vec2.hpp" #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_functions extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_functions is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# else +# pragma message("GLM: GLM_GTX_functions extension included") +# endif #endif namespace glm diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 41345204..6f85bf48 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_gradient_paint extension included") # endif #endif diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index 9e396a8c..3c859689 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_handed_coordinate_space extension included") # endif #endif diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp index 2ab07495..93b1bc2d 100644 --- a/glm/gtx/hash.hpp +++ b/glm/gtx/hash.hpp @@ -15,7 +15,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_hash extension included") # endif #endif diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 8b79f51e..d0b4c61a 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_integer extension included") # endif #endif diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 04e16f68..3c78f2b8 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -24,7 +24,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_closest_point extension included") # endif #endif diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index e5c48337..8d974f00 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -26,7 +26,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_io extension included") # endif #endif diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index 84936661..ba28c9d7 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_log_base extension included") # endif #endif diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index 65f7bf1b..1e585f9a 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_cross_product extension included") # endif #endif diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp index be255f65..acd7a7f0 100644 --- a/glm/gtx/matrix_decompose.hpp +++ b/glm/gtx/matrix_decompose.hpp @@ -23,7 +23,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_decompose extension included") # endif #endif diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp index a5548002..5a975d60 100644 --- a/glm/gtx/matrix_factorisation.hpp +++ b/glm/gtx/matrix_factorisation.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_factorisation extension included") # endif #endif diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index 7c8a414f..7d5ad4cd 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_interpolation extension included") # endif #endif diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 220b795c..8c6bc22d 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_major_storage extension included") # endif #endif diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index a96408e3..de6ff1f8 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_operation extension included") # endif #endif diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 0f613260..8011b2b1 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -21,7 +21,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_query extension included") # endif #endif diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp index 02d9539c..5f9c5402 100644 --- a/glm/gtx/matrix_transform_2d.hpp +++ b/glm/gtx/matrix_transform_2d.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_matrix_transform_2d extension included") # endif #endif diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index 0514e363..b242e357 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_mixed_product extension included") # endif #endif diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 7c52c93a..cdf60e05 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_norm extension included") # endif #endif diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index c6e216df..068682f7 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_normal extension included") # endif #endif diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index ebc58a8c..51958023 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_normalize_dot extension included") # endif #endif diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 8dec706b..3a606bda 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -21,7 +21,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_number_precision extension included") # endif #endif diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index 17953452..9284a474 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_optimum_pow extension included") # endif #endif diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 785f58ed..3e004fb0 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -21,7 +21,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_orthonormalize extension included") # endif #endif diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index 20079e84..72b77b6e 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_perpendicular extension included") # endif #endif diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index de61b7d6..b3991125 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_polar_coordinates extension included") # endif #endif diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index c1b4f66c..678f3ad5 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_projection extension included") # endif #endif diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index 26e0343e..05a71dfa 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -23,7 +23,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_quaternion extension included") # endif #endif diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp index 7bcdc6a6..93bcb9a6 100644 --- a/glm/gtx/range.hpp +++ b/glm/gtx/range.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_range extension included") # endif #endif diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index 7c63a0ff..86cbe77d 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_raw_data extension included") # endif #endif diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp index 9a61aa6a..2103ca08 100644 --- a/glm/gtx/rotate_normalized_axis.hpp +++ b/glm/gtx/rotate_normalized_axis.hpp @@ -22,7 +22,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included") # endif #endif diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index 5bc8e1f5..dcd5b95a 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -22,7 +22,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_rotate_vector extension included") # endif #endif diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp index 3b1bc70d..f391f8de 100644 --- a/glm/gtx/scalar_multiplication.hpp +++ b/glm/gtx/scalar_multiplication.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_scalar_multiplication extension included") # endif #endif diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp index bf94adb2..8be9c57b 100644 --- a/glm/gtx/scalar_relational.hpp +++ b/glm/gtx/scalar_relational.hpp @@ -18,7 +18,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_extend extension included") # endif #endif diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index 29f48960..731c979e 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_spline extension included") # endif #endif diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 9d08e733..cd3be8cb 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_std_based_type extension included") # endif #endif diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index a8109aae..27846bf8 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -27,7 +27,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_string_cast extension included") # endif #endif diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp index b0e5c2dc..20585e68 100644 --- a/glm/gtx/texture.hpp +++ b/glm/gtx/texture.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_texture extension included") # endif #endif diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index e2f47528..0279fc8b 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -22,7 +22,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_transform extension included") # endif #endif diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index 27431380..0d8ba9d9 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_transform2 extension included") # endif #endif diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp index fb379a87..2ae522c1 100644 --- a/glm/gtx/type_aligned.hpp +++ b/glm/gtx/type_aligned.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_type_aligned extension included") # endif #endif diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp index 92d4f412..56685c8c 100644 --- a/glm/gtx/type_trait.hpp +++ b/glm/gtx/type_trait.hpp @@ -15,7 +15,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_type_trait extension included") # endif #endif diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp index c45f195d..1c49abcb 100644 --- a/glm/gtx/vec_swizzle.hpp +++ b/glm/gtx/vec_swizzle.hpp @@ -17,7 +17,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_vec_swizzle extension included") # endif #endif diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index ed0ad790..9ae43712 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -23,7 +23,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_vector_angle extension included") # endif #endif diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index da6e3a9e..77c7b974 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -20,7 +20,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_vector_query extension included") # endif #endif diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index 7d8017b8..02c51965 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -19,7 +19,7 @@ #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # ifndef GLM_ENABLE_EXPERIMENTAL # pragma message("GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") -# elif +# else # pragma message("GLM: GLM_GTX_wrap extension included") # endif #endif diff --git a/readme.md b/readme.md index b15b3775..f6af09e8 100644 --- a/readme.md +++ b/readme.md @@ -52,6 +52,10 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) ## Release notes +### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01 +#### Fixes: +- Build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883 + ### [GLM 0.9.9.4](https://github.com/g-truc/glm/releases/tag/0.9.9.4) - 2019-03-19 #### Features: - Added mix implementation for matrices in EXT_matrix_common #842