From cff845c2b49fc372c03b545be071fe490e7b9580 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 14 Jul 2014 01:48:27 +0200 Subject: [PATCH] Use pragma once --- glm/common.hpp | 5 +- glm/detail/_features.hpp | 5 +- glm/detail/_literals.hpp | 5 +- glm/detail/_noise.hpp | 5 +- glm/detail/_swizzle.hpp | 5 +- glm/detail/_swizzle_func.hpp | 5 +- glm/detail/_vectorize.hpp | 5 +- glm/detail/dummy.cpp | 6 +- glm/detail/func_common.hpp | 4 +- glm/detail/func_exponential.hpp | 5 +- glm/detail/func_geometric.hpp | 5 +- glm/detail/func_integer.hpp | 6 +- glm/detail/func_matrix.hpp | 5 +- glm/detail/func_noise.hpp | 5 +- glm/detail/func_packing.hpp | 5 +- glm/detail/func_trigonometric.hpp | 7 +- glm/detail/func_vector_relational.hpp | 5 +- glm/detail/hint.hpp | 5 +- glm/detail/intrinsic_common.hpp | 4 +- glm/detail/intrinsic_exponential.hpp | 4 +- glm/detail/intrinsic_geometric.hpp | 4 +- glm/detail/intrinsic_integer.hpp | 4 +- glm/detail/intrinsic_matrix.hpp | 4 +- glm/detail/intrinsic_trigonometric.hpp | 4 +- glm/detail/intrinsic_vector_relational.hpp | 4 +- glm/detail/precision.hpp | 5 +- glm/detail/setup.hpp | 5 +- glm/detail/type_float.hpp | 5 +- glm/detail/type_gentype.hpp | 5 +- glm/detail/type_half.hpp | 5 +- glm/detail/type_int.hpp | 5 +- glm/detail/type_mat.hpp | 5 +- glm/detail/type_mat2x2.hpp | 5 +- glm/detail/type_mat2x3.hpp | 5 +- glm/detail/type_mat2x4.hpp | 5 +- glm/detail/type_mat3x2.hpp | 5 +- glm/detail/type_mat3x3.hpp | 5 +- glm/detail/type_mat3x4.hpp | 5 +- glm/detail/type_mat4x2.hpp | 5 +- glm/detail/type_mat4x3.hpp | 5 +- glm/detail/type_mat4x4.hpp | 5 +- glm/detail/type_vec.hpp | 5 +- glm/detail/type_vec1.hpp | 5 +- glm/detail/type_vec2.hpp | 5 +- glm/detail/type_vec3.hpp | 5 +- glm/detail/type_vec4.hpp | 5 +- glm/exponential.hpp | 5 +- glm/ext.hpp | 5 +- glm/fwd.hpp | 5 +- glm/geometric.hpp | 5 +- glm/glm.hpp | 5 +- glm/gtc/constants.hpp | 5 +- glm/gtc/epsilon.hpp | 5 +- glm/gtc/matrix_access.hpp | 5 +- glm/gtc/matrix_integer.hpp | 5 +- glm/gtc/matrix_inverse.hpp | 5 +- glm/gtc/matrix_transform.hpp | 5 +- glm/gtc/noise.hpp | 5 +- glm/gtc/packing.hpp | 6 +- glm/gtc/quaternion.hpp | 5 +- glm/gtc/random.hpp | 5 +- glm/gtc/reciprocal.hpp | 5 +- glm/gtc/type_precision.hpp | 5 +- glm/gtc/type_ptr.hpp | 6 +- glm/gtc/ulp.hpp | 6 +- glm/gtx/associated_min_max.hpp | 5 +- glm/gtx/bit.hpp | 5 +- glm/gtx/closest_point.hpp | 5 +- glm/gtx/color_space.hpp | 5 +- glm/gtx/color_space_YCoCg.hpp | 5 +- glm/gtx/compatibility.hpp | 6 +- glm/gtx/component_wise.hpp | 5 +- glm/gtx/dual_quaternion.hpp | 5 +- glm/gtx/euler_angles.hpp | 5 +- glm/gtx/extend.hpp | 5 +- glm/gtx/extented_min_max.hpp | 5 +- glm/gtx/fast_exponential.hpp | 5 +- glm/gtx/fast_square_root.hpp | 5 +- glm/gtx/fast_trigonometry.hpp | 5 +- glm/gtx/gradient_paint.hpp | 5 +- glm/gtx/handed_coordinate_space.hpp | 5 +- glm/gtx/inertia.hpp | 5 +- glm/gtx/integer.hpp | 5 +- glm/gtx/intersect.hpp | 5 +- glm/gtx/io.hpp | 5 +- glm/gtx/log_base.hpp | 5 +- glm/gtx/matrix_cross_product.hpp | 5 +- glm/gtx/matrix_interpolation.hpp | 5 +- glm/gtx/matrix_major_storage.hpp | 5 +- glm/gtx/matrix_operation.hpp | 5 +- glm/gtx/matrix_query.hpp | 5 +- glm/gtx/matrix_transform_2d.hpp | 5 +- glm/gtx/mixed_product.hpp | 5 +- glm/gtx/multiple.hpp | 5 +- glm/gtx/norm.hpp | 5 +- glm/gtx/normal.hpp | 5 +- glm/gtx/normalize_dot.hpp | 5 +- glm/gtx/number_precision.hpp | 5 +- glm/gtx/optimum_pow.hpp | 5 +- glm/gtx/orthonormalize.hpp | 5 +- glm/gtx/perpendicular.hpp | 5 +- glm/gtx/polar_coordinates.hpp | 5 +- glm/gtx/projection.hpp | 5 +- glm/gtx/quaternion.hpp | 5 +- glm/gtx/raw_data.hpp | 5 +- glm/gtx/rotate_normalized_axis.hpp | 5 +- glm/gtx/rotate_vector.hpp | 5 +- glm/gtx/scalar_relational.hpp | 5 +- glm/gtx/simd_mat4.hpp | 5 +- glm/gtx/simd_quat.hpp | 103 ++++++++++----------- glm/gtx/simd_vec4.hpp | 5 +- glm/gtx/spline.hpp | 6 +- glm/gtx/std_based_type.hpp | 5 +- glm/gtx/string_cast.hpp | 5 +- glm/gtx/transform.hpp | 5 +- glm/gtx/transform2.hpp | 5 +- glm/gtx/vec1.hpp | 6 +- glm/gtx/vector_angle.hpp | 5 +- glm/gtx/vector_query.hpp | 5 +- glm/gtx/wrap.hpp | 5 +- glm/integer.hpp | 5 +- glm/mat2x2.hpp | 5 +- glm/mat2x3.hpp | 4 +- glm/mat2x4.hpp | 5 +- glm/mat3x2.hpp | 5 +- glm/mat3x3.hpp | 5 +- glm/mat3x4.hpp | 5 +- glm/mat4x2.hpp | 5 +- glm/mat4x3.hpp | 5 +- glm/mat4x4.hpp | 5 +- glm/matrix.hpp | 5 +- glm/packing.hpp | 5 +- glm/trigonometric.hpp | 5 +- glm/vec2.hpp | 5 +- glm/vec3.hpp | 5 +- glm/vec4.hpp | 5 +- glm/vector_relational.hpp | 5 +- readme.txt | 2 + 138 files changed, 191 insertions(+), 595 deletions(-) diff --git a/glm/common.hpp b/glm/common.hpp index 2d787dde0..b22e11b03 100644 --- a/glm/common.hpp +++ b/glm/common.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_COMMON_INCLUDED -#define GLM_COMMON_INCLUDED +#pragma once #include "detail/func_common.hpp" - -#endif//GLM_COMMON_INCLUDED diff --git a/glm/detail/_features.hpp b/glm/detail/_features.hpp index 1c7fe8c96..936672fdf 100644 --- a/glm/detail/_features.hpp +++ b/glm/detail/_features.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_features -#define glm_core_features +#pragma once // #define GLM_CXX98_EXCEPTIONS // #define GLM_CXX98_RTTI @@ -423,5 +422,3 @@ # endif #endif//(GLM_COMPILER & GLM_COMPILER_CLANG) - -#endif//glm_core_features diff --git a/glm/detail/_literals.hpp b/glm/detail/_literals.hpp index 79780ccf6..822208740 100644 --- a/glm/detail/_literals.hpp +++ b/glm/detail/_literals.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_literals -#define glm_core_literals +#pragma once namespace glm { @@ -47,5 +46,3 @@ namespace glm #endif//GLM_CXX11_USER_LITERALS }//namespace glm - -#endif//glm_core_literals diff --git a/glm/detail/_noise.hpp b/glm/detail/_noise.hpp index e366e7c38..583ac0be2 100644 --- a/glm/detail/_noise.hpp +++ b/glm/detail/_noise.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_DETAIL_NOISE_INCLUDED -#define GLM_DETAIL_NOISE_INCLUDED +#pragma once namespace glm{ namespace detail @@ -126,5 +125,3 @@ namespace detail }//namespace detail }//namespace glm -#endif//GLM_DETAIL_NOISE_INCLUDED - diff --git a/glm/detail/_swizzle.hpp b/glm/detail/_swizzle.hpp index 407ffb49c..ebe373191 100644 --- a/glm/detail/_swizzle.hpp +++ b/glm/detail/_swizzle.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_swizzle -#define glm_core_swizzle +#pragma once namespace glm{ namespace detail @@ -836,5 +835,3 @@ namespace glm struct { _swizzle<4, T, P, V, 3,3,3,1> E3 ## E3 ## E3 ## E1; }; \ struct { _swizzle<4, T, P, V, 3,3,3,2> E3 ## E3 ## E3 ## E2; }; \ struct { _swizzle<4, T, P, V, 3,3,3,3> E3 ## E3 ## E3 ## E3; }; - -#endif//glm_core_swizzle diff --git a/glm/detail/_swizzle_func.hpp b/glm/detail/_swizzle_func.hpp index c287bbf5b..a3f6993c3 100644 --- a/glm/detail/_swizzle_func.hpp +++ b/glm/detail/_swizzle_func.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_swizzle_func -#define glm_core_swizzle_func +#pragma once #define GLM_SWIZZLE_GEN_VEC2_ENTRY(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_TYPE, CONST, A, B) \ SWIZZLED_TYPE A ## B() CONST \ @@ -720,5 +719,3 @@ GLM_SWIZZLE_GEN_VEC_FROM_VEC4_COMP(TMPL_TYPE, PRECISION, CLASS_TYPE, SWIZZLED_VEC2_TYPE, SWIZZLED_VEC3_TYPE, SWIZZLED_VEC4_TYPE, s, t, p, q) //GLM_SWIZZLE_GEN_VEC_FROM_VEC4(valType, detail::vec4, detail::vec2, detail::vec3, detail::vec4) - -#endif//glm_core_swizzle_func diff --git a/glm/detail/_vectorize.hpp b/glm/detail/_vectorize.hpp index b653fa9f3..48fe97f3f 100644 --- a/glm/detail/_vectorize.hpp +++ b/glm/detail/_vectorize.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_CORE_DETAIL_INCLUDED -#define GLM_CORE_DETAIL_INCLUDED +#pragma once #include "type_vec1.hpp" #include "type_vec2.hpp" @@ -213,5 +212,3 @@ namespace detail }; }//namespace detail }//namespace glm - -#endif//GLM_CORE_DETAIL_INCLUDED diff --git a/glm/detail/dummy.cpp b/glm/detail/dummy.cpp index 98ca022ce..69ffa7cf6 100644 --- a/glm/detail/dummy.cpp +++ b/glm/detail/dummy.cpp @@ -41,7 +41,8 @@ struct material glm::vec4 diffuse; // Dcm glm::vec4 specular; // Scm float shininess; // Srm -}; +}; + struct light { glm::vec4 ambient; // Acli @@ -58,7 +59,8 @@ struct light float constantAttenuation; // K0 float linearAttenuation; // K1 float quadraticAttenuation;// K2 -}; +}; + // Sample 1 #include // glm::vec3 diff --git a/glm/detail/func_common.hpp b/glm/detail/func_common.hpp index 87734c01a..879465d9c 100644 --- a/glm/detail/func_common.hpp +++ b/glm/detail/func_common.hpp @@ -33,8 +33,7 @@ /// These all operate component-wise. The description is per component. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_FUNC_COMMON_INCLUDED -#define GLM_FUNC_COMMON_INCLUDED +#pragma once #include "setup.hpp" #include "precision.hpp" @@ -469,4 +468,3 @@ namespace glm #include "func_common.inl" -#endif//GLM_FUNC_COMMON_INCLUDED diff --git a/glm/detail/func_exponential.hpp b/glm/detail/func_exponential.hpp index 938208704..1e1f4418a 100644 --- a/glm/detail/func_exponential.hpp +++ b/glm/detail/func_exponential.hpp @@ -33,8 +33,7 @@ /// These all operate component-wise. The description is per component. /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_func_exponential -#define glm_core_func_exponential +#pragma once #include "type_vec1.hpp" #include "type_vec2.hpp" @@ -128,5 +127,3 @@ namespace glm }//namespace glm #include "func_exponential.inl" - -#endif//glm_core_func_exponential diff --git a/glm/detail/func_geometric.hpp b/glm/detail/func_geometric.hpp index 0f83639c8..491e867b1 100644 --- a/glm/detail/func_geometric.hpp +++ b/glm/detail/func_geometric.hpp @@ -33,8 +33,7 @@ /// These operate on vectors as vectors, not component-wise. /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_func_geometric -#define glm_core_func_geometric +#pragma once #include "type_vec3.hpp" @@ -147,5 +146,3 @@ namespace glm }//namespace glm #include "func_geometric.inl" - -#endif//glm_core_func_geometric diff --git a/glm/detail/func_integer.hpp b/glm/detail/func_integer.hpp index d9fbdfd5a..30544947e 100644 --- a/glm/detail/func_integer.hpp +++ b/glm/detail/func_integer.hpp @@ -35,8 +35,7 @@ /// b, inclusive. The lowest-order bit is bit 0. /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_func_integer -#define glm_core_func_integer +#pragma once #include "setup.hpp" @@ -198,6 +197,3 @@ namespace glm }//namespace glm #include "func_integer.inl" - -#endif//glm_core_func_integer - diff --git a/glm/detail/func_matrix.hpp b/glm/detail/func_matrix.hpp index 901c196b1..f7b392fec 100644 --- a/glm/detail/func_matrix.hpp +++ b/glm/detail/func_matrix.hpp @@ -37,8 +37,7 @@ /// floating point version is shown. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_CORE_func_matrix -#define GLM_CORE_func_matrix +#pragma once // Dependencies #include "../detail/precision.hpp" @@ -175,5 +174,3 @@ namespace detail }//namespace glm #include "func_matrix.inl" - -#endif//GLM_CORE_func_matrix diff --git a/glm/detail/func_noise.hpp b/glm/detail/func_noise.hpp index 7a6ae1c02..f7aca6853 100644 --- a/glm/detail/func_noise.hpp +++ b/glm/detail/func_noise.hpp @@ -35,8 +35,7 @@ /// appearance of randomness, but are not truly random. /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_func_noise -#define glm_core_func_noise +#pragma once #include "type_vec1.hpp" #include "type_vec2.hpp" @@ -88,5 +87,3 @@ namespace glm }//namespace glm #include "func_noise.inl" - -#endif//glm_core_func_noise diff --git a/glm/detail/func_packing.hpp b/glm/detail/func_packing.hpp index 454c13ffd..98c639e7c 100644 --- a/glm/detail/func_packing.hpp +++ b/glm/detail/func_packing.hpp @@ -33,8 +33,7 @@ /// These functions do not operate component-wise, rather as described in each case. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_CORE_func_packing -#define GLM_CORE_func_packing +#pragma once #include "type_vec2.hpp" #include "type_vec4.hpp" @@ -191,5 +190,3 @@ namespace glm }//namespace glm #include "func_packing.inl" - -#endif//GLM_CORE_func_packing diff --git a/glm/detail/func_trigonometric.hpp b/glm/detail/func_trigonometric.hpp index 9c4a7b5d4..b3148c148 100644 --- a/glm/detail/func_trigonometric.hpp +++ b/glm/detail/func_trigonometric.hpp @@ -37,8 +37,7 @@ /// These all operate component-wise. The description is per component. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_CORE_func_trigonometric -#define GLM_CORE_func_trigonometric +#pragma once namespace glm { @@ -197,7 +196,3 @@ namespace glm }//namespace glm #include "func_trigonometric.inl" - -#endif//GLM_CORE_func_trigonometric - - diff --git a/glm/detail/func_vector_relational.hpp b/glm/detail/func_vector_relational.hpp index b91395467..94714ab45 100644 --- a/glm/detail/func_vector_relational.hpp +++ b/glm/detail/func_vector_relational.hpp @@ -38,8 +38,7 @@ /// call must match. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_CORE_func_vector_relational -#define GLM_CORE_func_vector_relational +#pragma once #include "precision.hpp" #include "setup.hpp" @@ -141,5 +140,3 @@ namespace glm #endif #include "func_vector_relational.inl" - -#endif//GLM_CORE_func_vector_relational diff --git a/glm/detail/hint.hpp b/glm/detail/hint.hpp index 219f2bd03..2b96c0f6c 100644 --- a/glm/detail/hint.hpp +++ b/glm/detail/hint.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type -#define glm_core_type +#pragma once namespace glm { @@ -36,5 +35,3 @@ namespace glm class nicest {}; class fastest {}; }//namespace glm - -#endif//glm_core_type diff --git a/glm/detail/intrinsic_common.hpp b/glm/detail/intrinsic_common.hpp index 378bdd23d..405bb59a6 100644 --- a/glm/detail/intrinsic_common.hpp +++ b/glm/detail/intrinsic_common.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_detail_intrinsic_common -#define glm_detail_intrinsic_common +#pragma once #include "setup.hpp" @@ -86,4 +85,3 @@ namespace detail #include "intrinsic_common.inl" #endif//GLM_ARCH -#endif//glm_detail_intrinsic_common diff --git a/glm/detail/intrinsic_exponential.hpp b/glm/detail/intrinsic_exponential.hpp index 60a7f6288..7194c3cf0 100644 --- a/glm/detail/intrinsic_exponential.hpp +++ b/glm/detail/intrinsic_exponential.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_detail_intrinsic_exponential -#define glm_detail_intrinsic_exponential +#pragma once #include "setup.hpp" @@ -76,4 +75,3 @@ GLM_FUNC_QUALIFIER __m128 sse_normalize_fast_ps( float * RESTRICT vOut, float * }//namespace glm #endif//GLM_ARCH -#endif//glm_detail_intrinsic_exponential diff --git a/glm/detail/intrinsic_geometric.hpp b/glm/detail/intrinsic_geometric.hpp index d229dcf9c..e21753899 100644 --- a/glm/detail/intrinsic_geometric.hpp +++ b/glm/detail/intrinsic_geometric.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_intrinsic_geometric -#define glm_core_intrinsic_geometric +#pragma once #include "setup.hpp" @@ -73,4 +72,3 @@ namespace detail #include "intrinsic_geometric.inl" #endif//GLM_ARCH -#endif//glm_core_intrinsic_geometric diff --git a/glm/detail/intrinsic_integer.hpp b/glm/detail/intrinsic_integer.hpp index ec25e23c8..b542ac4a9 100644 --- a/glm/detail/intrinsic_integer.hpp +++ b/glm/detail/intrinsic_integer.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_detail_intrinsic_integer -#define glm_detail_intrinsic_integer +#pragma once #include "glm/glm.hpp" @@ -47,4 +46,3 @@ namespace detail #include "intrinsic_integer.inl" #endif//GLM_ARCH -#endif//glm_detail_intrinsic_integer diff --git a/glm/detail/intrinsic_matrix.hpp b/glm/detail/intrinsic_matrix.hpp index 5cfb7d2fe..082f49803 100644 --- a/glm/detail/intrinsic_matrix.hpp +++ b/glm/detail/intrinsic_matrix.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_detail_intrinsic_matrix -#define glm_detail_intrinsic_matrix +#pragma once #include "setup.hpp" @@ -66,4 +65,3 @@ namespace detail #include "intrinsic_matrix.inl" #endif//GLM_ARCH -#endif//glm_detail_intrinsic_matrix diff --git a/glm/detail/intrinsic_trigonometric.hpp b/glm/detail/intrinsic_trigonometric.hpp index 3bb8e6720..9176291cd 100644 --- a/glm/detail/intrinsic_trigonometric.hpp +++ b/glm/detail/intrinsic_trigonometric.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_detail_intrinsic_trigonometric -#define glm_detail_intrinsic_trigonometric +#pragma once #include "setup.hpp" @@ -45,4 +44,3 @@ namespace detail #include "intrinsic_trigonometric.inl" #endif//GLM_ARCH -#endif//glm_detail_intrinsic_trigonometric diff --git a/glm/detail/intrinsic_vector_relational.hpp b/glm/detail/intrinsic_vector_relational.hpp index 9fcbb55c5..af6620d66 100644 --- a/glm/detail/intrinsic_vector_relational.hpp +++ b/glm/detail/intrinsic_vector_relational.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_detail_intrinsic_vector_relational -#define glm_detail_intrinsic_vector_relational +#pragma once #include "setup.hpp" @@ -45,4 +44,3 @@ namespace detail #include "intrinsic_vector_relational.inl" #endif//GLM_ARCH -#endif//glm_detail_intrinsic_vector_relational diff --git a/glm/detail/precision.hpp b/glm/detail/precision.hpp index 983fc8ee7..6be15a346 100644 --- a/glm/detail/precision.hpp +++ b/glm/detail/precision.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_CORE_PRECISION_INCLUDED -#define GLM_CORE_PRECISION_INCLUDED +#pragma once namespace glm { @@ -39,5 +38,3 @@ namespace glm defaultp = highp }; }//namespace glm - -#endif//GLM_CORE_PRECISION_INCLUDED diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 62b3e2cb8..ed254fb67 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_SETUP_INCLUDED -#define GLM_SETUP_INCLUDED +#pragma once #include @@ -801,5 +800,3 @@ namespace glm #else # define GLM_CONSTEXPR #endif - -#endif//GLM_SETUP_INCLUDED diff --git a/glm/detail/type_float.hpp b/glm/detail/type_float.hpp index 0b93517b8..495dbc924 100644 --- a/glm/detail/type_float.hpp +++ b/glm/detail/type_float.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_float -#define glm_core_type_float +#pragma once #include "setup.hpp" @@ -91,5 +90,3 @@ namespace detail /// @} }//namespace glm - -#endif//glm_core_type_float diff --git a/glm/detail/type_gentype.hpp b/glm/detail/type_gentype.hpp index f3571f5d5..59882e4c6 100644 --- a/glm/detail/type_gentype.hpp +++ b/glm/detail/type_gentype.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_gentype -#define glm_core_type_gentype +#pragma once namespace glm { @@ -219,5 +218,3 @@ namespace detail }//namespace glm //#include "type_gentype.inl" - -#endif//glm_core_type_gentype diff --git a/glm/detail/type_half.hpp b/glm/detail/type_half.hpp index 559c5673e..827c28cb4 100644 --- a/glm/detail/type_half.hpp +++ b/glm/detail/type_half.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_half -#define glm_core_type_half +#pragma once #include "setup.hpp" @@ -47,5 +46,3 @@ namespace detail }//namespace glm #include "type_half.inl" - -#endif//glm_core_type_half diff --git a/glm/detail/type_int.hpp b/glm/detail/type_int.hpp index b8b65c00c..fcf99a3fe 100644 --- a/glm/detail/type_int.hpp +++ b/glm/detail/type_int.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_int -#define glm_core_type_int +#pragma once #include "setup.hpp" @@ -187,5 +186,3 @@ namespace detail #endif//GLM_STATIC_ASSERT_NULL }//namespace glm - -#endif//glm_core_type_int diff --git a/glm/detail/type_mat.hpp b/glm/detail/type_mat.hpp index 94105240b..8e2b8bb6c 100644 --- a/glm/detail/type_mat.hpp +++ b/glm/detail/type_mat.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat -#define glm_core_type_mat +#pragma once #include "precision.hpp" @@ -791,5 +790,3 @@ namespace detail /// @} }//namespace glm - -#endif//glm_core_type_mat diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index e547825ec..baa6288f1 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat2x2 -#define glm_core_type_mat2x2 +#pragma once #include "../fwd.hpp" #include "type_vec2.hpp" @@ -259,5 +258,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat2x2.inl" #endif - -#endif //glm_core_type_mat2x2 diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index e9e918832..6be15b341 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat2x3 -#define glm_core_type_mat2x3 +#pragma once #include "../fwd.hpp" #include "type_vec2.hpp" @@ -223,5 +222,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat2x3.inl" #endif - -#endif //glm_core_type_mat2x3 diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 45e0a1509..3c900278e 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat2x4 -#define glm_core_type_mat2x4 +#pragma once #include "../fwd.hpp" #include "type_vec2.hpp" @@ -225,5 +224,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat2x4.inl" #endif - -#endif //glm_core_type_mat2x4 diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index 45b98b206..f2c23f35f 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat3x2 -#define glm_core_type_mat3x2 +#pragma once #include "../fwd.hpp" #include "type_vec2.hpp" @@ -229,5 +228,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat3x2.inl" #endif - -#endif //glm_core_type_mat3x2 diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index fa4bb7a21..82c595e7c 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat3x3 -#define glm_core_type_mat3x3 +#pragma once #include "../fwd.hpp" #include "type_vec3.hpp" @@ -263,5 +262,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat3x3.inl" #endif - -#endif //glm_core_type_mat3x3 diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index 7da8a19d5..af704eb92 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat3x4 -#define glm_core_type_mat3x4 +#pragma once #include "../fwd.hpp" #include "type_vec3.hpp" @@ -229,5 +228,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat3x4.inl" #endif - -#endif //glm_core_type_mat3x4 diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index eb826950e..2adc36fd3 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat4x2 -#define glm_core_type_mat4x2 +#pragma once #include "../fwd.hpp" #include "type_vec2.hpp" @@ -236,5 +235,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat4x2.inl" #endif - -#endif //glm_core_type_mat4x2 diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 636572b3b..03103d775 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat4x3 -#define glm_core_type_mat4x3 +#pragma once #include "../fwd.hpp" #include "type_vec3.hpp" @@ -236,5 +235,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat4x3.inl" #endif //GLM_EXTERNAL_TEMPLATE - -#endif//glm_core_type_mat4x3 diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index d5f652bf8..d5b24ba23 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_mat4x4 -#define glm_core_type_mat4x4 +#pragma once #include "../fwd.hpp" #include "type_vec4.hpp" @@ -264,5 +263,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_mat4x4.inl" #endif//GLM_EXTERNAL_TEMPLATE - -#endif//glm_core_type_mat4x4 diff --git a/glm/detail/type_vec.hpp b/glm/detail/type_vec.hpp index 5a87170a0..b12b87183 100644 --- a/glm/detail/type_vec.hpp +++ b/glm/detail/type_vec.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_vec -#define glm_core_type_vec +#pragma once #include "precision.hpp" #include "type_int.hpp" @@ -512,5 +511,3 @@ namespace detail /// @} }//namespace glm - -#endif//glm_core_type_vec diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 5f3194696..4d0d23c8d 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_gentype1 -#define glm_core_type_gentype1 +#pragma once #include "../fwd.hpp" #include "type_vec.hpp" @@ -273,5 +272,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_vec1.inl" #endif//GLM_EXTERNAL_TEMPLATE - -#endif//glm_core_type_gentype1 diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 42599342d..95365538c 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_gentype2 -#define glm_core_type_gentype2 +#pragma once //#include "../fwd.hpp" #include "type_vec.hpp" @@ -311,5 +310,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_vec2.inl" #endif//GLM_EXTERNAL_TEMPLATE - -#endif//glm_core_type_gentype2 diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index c48721397..465e1f4c6 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_gentype3 -#define glm_core_type_gentype3 +#pragma once //#include "../fwd.hpp" #include "type_vec.hpp" @@ -329,5 +328,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_vec3.inl" #endif//GLM_EXTERNAL_TEMPLATE - -#endif//glm_core_type_gentype3 diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index a82a4aa67..dcc012ebe 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_core_type_gentype4 -#define glm_core_type_gentype4 +#pragma once //#include "../fwd.hpp" #include "setup.hpp" @@ -418,5 +417,3 @@ namespace detail #ifndef GLM_EXTERNAL_TEMPLATE #include "type_vec4.inl" #endif//GLM_EXTERNAL_TEMPLATE - -#endif//glm_core_type_gentype4 diff --git a/glm/exponential.hpp b/glm/exponential.hpp index 4d2c9b8f6..d11f58fff 100644 --- a/glm/exponential.hpp +++ b/glm/exponential.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_EXPONENTIAL_INCLUDED -#define GLM_EXPONENTIAL_INCLUDED +#pragma once #include "detail/func_exponential.hpp" - -#endif//GLM_EXPONENTIAL_INCLUDED diff --git a/glm/ext.hpp b/glm/ext.hpp index ce13a663e..206cd1d72 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -55,8 +55,7 @@ /// (http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showprofile&User=22660). /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_EXT_INCLUDED -#define GLM_EXT_INCLUDED +#pragma once #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED)) # define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED @@ -133,5 +132,3 @@ # include "./gtx/simd_vec4.hpp" # include "./gtx/simd_mat4.hpp" #endif - -#endif //GLM_EXT_INCLUDED diff --git a/glm/fwd.hpp b/glm/fwd.hpp index 9fba848c5..3471fb3b2 100644 --- a/glm/fwd.hpp +++ b/glm/fwd.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_FWD_INCLUDED -#define GLM_FWD_INCLUDED +#pragma once #include "detail/type_int.hpp" #include "detail/type_float.hpp" @@ -2594,5 +2593,3 @@ namespace glm typedef highp_f64quat f64quat; #endif }//namespace glm - -#endif//GLM_FWD_INCLUDED diff --git a/glm/geometric.hpp b/glm/geometric.hpp index df025ea89..98a411a62 100644 --- a/glm/geometric.hpp +++ b/glm/geometric.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GEOMETRIC_INCLUDED -#define GLM_GEOMETRIC_INCLUDED +#pragma once #include "detail/func_geometric.hpp" - -#endif//GLM_GEOMETRIC_INCLUDED diff --git a/glm/glm.hpp b/glm/glm.hpp index b51038074..5526a1fdd 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -77,8 +77,7 @@ #include "detail/_fixes.hpp" -#ifndef GLM_INCLUDED -#define GLM_INCLUDED +#pragma once #include #include @@ -113,5 +112,3 @@ #include "matrix.hpp" #include "vector_relational.hpp" #include "integer.hpp" - -#endif//GLM_INCLUDED diff --git a/glm/gtc/constants.hpp b/glm/gtc/constants.hpp index c01608617..76fc1eb41 100644 --- a/glm/gtc/constants.hpp +++ b/glm/gtc/constants.hpp @@ -36,8 +36,7 @@ /// need to be included to use these features. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_constants -#define GLM_GTC_constants +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -181,5 +180,3 @@ namespace glm } //namespace glm #include "constants.inl" - -#endif//GLM_GTC_constants diff --git a/glm/gtc/epsilon.hpp b/glm/gtc/epsilon.hpp index 58a2cae5b..4befdb5c7 100644 --- a/glm/gtc/epsilon.hpp +++ b/glm/gtc/epsilon.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_epsilon -#define GLM_GTC_epsilon +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -97,5 +96,3 @@ namespace glm }//namespace glm #include "epsilon.inl" - -#endif//GLM_GTC_epsilon diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index df614cc76..b78a018bc 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -34,8 +34,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_matrix_access -#define GLM_GTC_matrix_access +#pragma once // Dependency: #include "../detail/setup.hpp" @@ -83,5 +82,3 @@ namespace glm }//namespace glm #include "matrix_access.inl" - -#endif//GLM_GTC_matrix_access diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index c96fad1b7..76e31c0ee 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -34,8 +34,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_matrix_integer -#define GLM_GTC_matrix_integer +#pragma once // Dependency: #include "../mat2x2.hpp" @@ -510,5 +509,3 @@ namespace glm /// @} }//namespace glm - -#endif//GLM_GTC_matrix_integer diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp index 53e4918f0..803825f0f 100644 --- a/glm/gtc/matrix_inverse.hpp +++ b/glm/gtc/matrix_inverse.hpp @@ -34,8 +34,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_matrix_inverse -#define GLM_GTC_matrix_inverse +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -70,5 +69,3 @@ namespace glm }//namespace glm #include "matrix_inverse.inl" - -#endif//GLM_GTC_matrix_inverse diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index 8cd0b651c..b08ad9c13 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -43,8 +43,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_matrix_transform -#define GLM_GTC_matrix_transform +#pragma once // Dependency: #include "../mat4x4.hpp" @@ -302,5 +301,3 @@ namespace glm }//namespace glm #include "matrix_transform.inl" - -#endif//GLM_GTC_matrix_transform diff --git a/glm/gtc/noise.hpp b/glm/gtc/noise.hpp index bde9987b4..6450129eb 100644 --- a/glm/gtc/noise.hpp +++ b/glm/gtc/noise.hpp @@ -38,8 +38,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_noise -#define GLM_GTC_noise +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -77,5 +76,3 @@ namespace glm }//namespace glm #include "noise.inl" - -#endif//GLM_GTC_noise diff --git a/glm/gtc/packing.hpp b/glm/gtc/packing.hpp index 73abedd59..1233e3497 100644 --- a/glm/gtc/packing.hpp +++ b/glm/gtc/packing.hpp @@ -36,8 +36,7 @@ /// need to be included to use these features. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_packing -#define GLM_GTC_packing +#pragma once // Dependency: #include "type_precision.hpp" @@ -473,6 +472,3 @@ namespace glm }// namespace glm #include "packing.inl" - -#endif//GLM_GTC_packing - diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index a8b0c904d..6cbb3326e 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_quaternion -#define GLM_GTC_quaternion +#pragma once // Dependency: #include "../mat3x3.hpp" @@ -400,5 +399,3 @@ namespace detail } //namespace glm #include "quaternion.inl" - -#endif//GLM_GTC_quaternion diff --git a/glm/gtc/random.hpp b/glm/gtc/random.hpp index 252bf1c70..395bf6a47 100644 --- a/glm/gtc/random.hpp +++ b/glm/gtc/random.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_random -#define GLM_GTC_random +#pragma once // Dependency: #include "../vec2.hpp" @@ -110,5 +109,3 @@ namespace glm }//namespace glm #include "random.inl" - -#endif//GLM_GTC_random diff --git a/glm/gtc/reciprocal.hpp b/glm/gtc/reciprocal.hpp index 428788ece..eb976575b 100644 --- a/glm/gtc/reciprocal.hpp +++ b/glm/gtc/reciprocal.hpp @@ -35,8 +35,7 @@ /// need to be included to use these features. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_reciprocal -#define GLM_GTC_reciprocal +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -129,5 +128,3 @@ namespace glm }//namespace glm #include "reciprocal.inl" - -#endif//GLM_GTC_reciprocal diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp index 63370856d..5e0350528 100644 --- a/glm/gtc/type_precision.hpp +++ b/glm/gtc/type_precision.hpp @@ -40,8 +40,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_type_precision -#define GLM_GTC_type_precision +#pragma once // Dependency: #include "../gtc/quaternion.hpp" @@ -870,5 +869,3 @@ namespace glm }//namespace glm #include "type_precision.inl" - -#endif//GLM_GTC_type_precision diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index d33de141d..314cca442 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -56,8 +56,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_type_ptr -#define GLM_GTC_type_ptr +#pragma once // Dependency: #include "../gtc/quaternion.hpp" @@ -174,6 +173,3 @@ namespace glm }//namespace glm #include "type_ptr.inl" - -#endif//GLM_GTC_type_ptr - diff --git a/glm/gtc/ulp.hpp b/glm/gtc/ulp.hpp index ee67ac61f..ee7a1f0a5 100644 --- a/glm/gtc/ulp.hpp +++ b/glm/gtc/ulp.hpp @@ -36,8 +36,7 @@ /// need to be included to use these features. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTC_ulp -#define GLM_GTC_ulp +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -87,6 +86,3 @@ namespace glm }// namespace glm #include "ulp.inl" - -#endif//GLM_GTC_ulp - diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 247c7f3b6..23f37ca9b 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_associated_min_max -#define GLM_GTX_associated_min_max +#pragma once // Dependency: #include "../glm.hpp" @@ -102,5 +101,3 @@ namespace glm } //namespace glm #include "associated_min_max.inl" - -#endif//GLM_GTX_associated_min_max diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index 28a8e6c83..f358bcc4f 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_bit -#define GLM_GTX_bit +#pragma once // Dependencies #include "../detail/type_int.hpp" @@ -230,5 +229,3 @@ namespace glm } //namespace glm #include "bit.inl" - -#endif//GLM_GTX_bit diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index c25680606..d0f171551 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_closest_point -#define GLM_GTX_closest_point +#pragma once // Dependency: #include "../glm.hpp" @@ -62,5 +61,3 @@ namespace glm }// namespace glm #include "closest_point.inl" - -#endif//GLM_GTX_closest_point diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index 44e2dd13b..d714b6273 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_color_space -#define GLM_GTX_color_space +#pragma once // Dependency: #include "../glm.hpp" @@ -92,5 +91,3 @@ namespace glm }//namespace glm #include "color_space.inl" - -#endif//GLM_GTX_color_space diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index 1f6578cfc..ea2abbf37 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_gtx_color_space_YCoCg -#define glm_gtx_color_space_YCoCg +#pragma once // Dependency: #include "../glm.hpp" @@ -80,5 +79,3 @@ namespace glm }//namespace glm #include "color_space_YCoCg.inl" - -#endif//glm_gtx_color_space_YCoCg diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index c262e3fc1..3435405d9 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_compatibility -#define GLM_GTX_compatibility +#pragma once // Dependency: #include "../glm.hpp" @@ -155,6 +154,3 @@ namespace glm }//namespace glm #include "compatibility.inl" - -#endif//GLM_GTX_compatibility - diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 335b3b97d..0e4c0e2bc 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_component_wise -#define GLM_GTX_component_wise +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -78,5 +77,3 @@ namespace glm }//namespace glm #include "component_wise.inl" - -#endif//GLM_GTX_component_wise diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 101c28ae0..459b00a14 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -38,8 +38,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_dual_quaternion -#define GLM_GTX_dual_quaternion +#pragma once // Dependency: #include "../glm.hpp" @@ -291,5 +290,3 @@ namespace detail } //namespace glm #include "dual_quaternion.inl" - -#endif//GLM_GTX_dual_quaternion diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index d3d6be05f..d213a8397 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_euler_angles -#define GLM_GTX_euler_angles +#pragma once // Dependency: #include "../glm.hpp" @@ -151,5 +150,3 @@ namespace glm }//namespace glm #include "euler_angles.inl" - -#endif//GLM_GTX_euler_angles diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index 499a5ee10..dea53d99d 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_extend -#define GLM_GTX_extend +#pragma once // Dependency: #include "../glm.hpp" @@ -62,5 +61,3 @@ namespace glm }//namespace glm #include "extend.inl" - -#endif//GLM_GTX_extend diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp index 5b4e74e60..ab5eb33bf 100644 --- a/glm/gtx/extented_min_max.hpp +++ b/glm/gtx/extented_min_max.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_extented_min_max -#define GLM_GTX_extented_min_max +#pragma once // Dependency: #include "../glm.hpp" @@ -157,5 +156,3 @@ namespace glm }//namespace glm #include "extented_min_max.inl" - -#endif//GLM_GTX_extented_min_max diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 8b3762cb1..cc151457c 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_fast_exponential -#define GLM_GTX_fast_exponential +#pragma once // Dependency: #include "../glm.hpp" @@ -94,5 +93,3 @@ namespace glm }//namespace glm #include "fast_exponential.inl" - -#endif//GLM_GTX_fast_exponential diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index 0a5d030f5..f62bc278c 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_fast_square_root -#define GLM_GTX_fast_square_root +#pragma once // Dependency: #include "../glm.hpp" @@ -86,5 +85,3 @@ namespace glm }// namespace glm #include "fast_square_root.inl" - -#endif//GLM_GTX_fast_square_root diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index a95e78092..f89a6df6d 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_fast_trigonometry -#define GLM_GTX_fast_trigonometry +#pragma once // Dependency: #include "../glm.hpp" @@ -96,5 +95,3 @@ namespace glm }//namespace glm #include "fast_trigonometry.inl" - -#endif//GLM_GTX_fast_trigonometry diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 2a47e51c7..a057ea80d 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_gradient_paint -#define GLM_GTX_gradient_paint +#pragma once // Dependency: #include "../glm.hpp" @@ -72,5 +71,3 @@ namespace glm }// namespace glm #include "gradient_paint.inl" - -#endif//GLM_GTX_gradient_paint diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index fb046327f..72837d60a 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_handed_coordinate_space -#define GLM_GTX_handed_coordinate_space +#pragma once // Dependency: #include "../glm.hpp" @@ -70,5 +69,3 @@ namespace glm }// namespace glm #include "handed_coordinate_space.inl" - -#endif//GLM_GTX_handed_coordinate_space diff --git a/glm/gtx/inertia.hpp b/glm/gtx/inertia.hpp index c796bfa63..0e9f5f0dc 100644 --- a/glm/gtx/inertia.hpp +++ b/glm/gtx/inertia.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_inertia -#define GLM_GTX_inertia +#pragma once // Dependency: #include "../glm.hpp" @@ -112,5 +111,3 @@ namespace glm }// namespace glm #include "inertia.inl" - -#endif//GLM_GTX_inertia diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 21c3912f8..00f1fd4a2 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_integer -#define GLM_GTX_integer +#pragma once // Dependency: #include "../glm.hpp" @@ -100,5 +99,3 @@ namespace glm }//namespace glm #include "integer.inl" - -#endif//GLM_GTX_integer diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 0a27b02ca..d7d649204 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_intersect -#define GLM_GTX_intersect +#pragma once // Dependency: #include "../glm.hpp" @@ -107,5 +106,3 @@ namespace glm }//namespace glm #include "intersect.inl" - -#endif//GLM_GTX_intersect diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index 7dd22182c..0ddeb4901 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -40,8 +40,7 @@ /// needs to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_io -#define GLM_GTX_io GLM_VERSION +#pragma once // Dependency: #include "../glm.hpp" @@ -222,5 +221,3 @@ namespace glm }//namespace glm #include "io.inl" - -#endif//GLM_GTX_io diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index 2e2f95a7b..7662ed046 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_log_base -#define GLM_GTX_log_base +#pragma once // Dependency: #include "../glm.hpp" @@ -61,5 +60,3 @@ namespace glm }//namespace glm #include "log_base.inl" - -#endif//GLM_GTX_log_base diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index e4cc31ae3..8dca0dda0 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_matrix_cross_product -#define GLM_GTX_matrix_cross_product +#pragma once // Dependency: #include "../glm.hpp" @@ -67,5 +66,3 @@ namespace glm }//namespace glm #include "matrix_cross_product.inl" - -#endif//GLM_GTX_matrix_cross_product diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index 60dec748b..8b21814bd 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_matrix_interpolation -#define GLM_GTX_matrix_interpolation +#pragma once // Dependency: #include "../glm.hpp" @@ -84,5 +83,3 @@ namespace glm }//namespace glm #include "matrix_interpolation.inl" - -#endif//GLM_GTX_matrix_interpolation diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 330fde9ca..a7ea35370 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_matrix_major_storage -#define GLM_GTX_matrix_major_storage +#pragma once // Dependency: #include "../glm.hpp" @@ -139,5 +138,3 @@ namespace glm }//namespace glm #include "matrix_major_storage.inl" - -#endif//GLM_GTX_matrix_major_storage diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index 8e0729ace..a0850c815 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_matrix_operation -#define GLM_GTX_matrix_operation +#pragma once // Dependency: #include "../glm.hpp" @@ -108,5 +107,3 @@ namespace glm }//namespace glm #include "matrix_operation.inl" - -#endif//GLM_GTX_matrix_operation diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 257f33f13..7b2f648fa 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_matrix_query -#define GLM_GTX_matrix_query +#pragma once // Dependency: #include "../glm.hpp" @@ -97,5 +96,3 @@ namespace glm }//namespace glm #include "matrix_query.inl" - -#endif//GLM_GTX_matrix_query diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp index 302d2655c..2a71c94fa 100644 --- a/glm/gtx/matrix_transform_2d.hpp +++ b/glm/gtx/matrix_transform_2d.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_matrix_transform_2d -#define GLM_GTX_matrix_transform_2d +#pragma once // Dependency: #include "../mat3x3.hpp" @@ -101,5 +100,3 @@ namespace glm }//namespace glm #include "matrix_transform_2d.inl" - -#endif//GLM_GTX_matrix_transform_2d diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index fc37b489e..2e858cde6 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_mixed_product -#define GLM_GTX_mixed_product +#pragma once // Dependency: #include "../glm.hpp" @@ -61,5 +60,3 @@ namespace glm }// namespace glm #include "mixed_product.inl" - -#endif//GLM_GTX_mixed_product diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp index df03a6f0e..a1e485b53 100644 --- a/glm/gtx/multiple.hpp +++ b/glm/gtx/multiple.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_multiple -#define GLM_GTX_multiple +#pragma once // Dependency: #include "../glm.hpp" @@ -79,5 +78,3 @@ namespace glm }//namespace glm #include "multiple.inl" - -#endif//GLM_GTX_multiple diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 2bdc0c8d3..c7c4d830e 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_norm -#define GLM_GTX_norm +#pragma once // Dependency: #include "../glm.hpp" @@ -123,5 +122,3 @@ namespace glm }//namespace glm #include "norm.inl" - -#endif//GLM_GTX_norm diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 00966669f..c948b8a23 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_normal -#define GLM_GTX_normal +#pragma once // Dependency: #include "../glm.hpp" @@ -63,5 +62,3 @@ namespace glm }//namespace glm #include "normal.inl" - -#endif//GLM_GTX_normal diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 1d12f6be4..2fcb4a541 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_normalize_dot -#define GLM_GTX_normalize_dot +#pragma once // Dependency: #include "../glm.hpp" @@ -72,5 +71,3 @@ namespace glm }//namespace glm #include "normalize_dot.inl" - -#endif//GLM_GTX_normalize_dot diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index bc3b6a7c1..62f95a9d8 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_number_precision -#define GLM_GTX_number_precision +#pragma once // Dependency: #include "../glm.hpp" @@ -81,5 +80,3 @@ namespace gtx }//namespace glm #include "number_precision.inl" - -#endif//GLM_GTX_number_precision diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index e825d68c8..96e72d78b 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_optimum_pow -#define GLM_GTX_optimum_pow +#pragma once // Dependency: #include "../glm.hpp" @@ -90,5 +89,3 @@ namespace gtx }//namespace glm #include "optimum_pow.inl" - -#endif//GLM_GTX_optimum_pow diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index d9a6446ff..9db33cf68 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_orthonormalize -#define GLM_GTX_orthonormalize +#pragma once // Dependency: #include "../glm.hpp" @@ -68,5 +67,3 @@ namespace glm }//namespace glm #include "orthonormalize.inl" - -#endif//GLM_GTX_orthonormalize diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index ff621449a..d5989517c 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_perpendicular -#define GLM_GTX_perpendicular +#pragma once // Dependency: #include "../glm.hpp" @@ -63,5 +62,3 @@ namespace glm }//namespace glm #include "perpendicular.inl" - -#endif//GLM_GTX_perpendicular diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index c6e431434..87859c188 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_polar_coordinates -#define GLM_GTX_polar_coordinates +#pragma once // Dependency: #include "../glm.hpp" @@ -68,5 +67,3 @@ namespace glm }//namespace glm #include "polar_coordinates.inl" - -#endif//GLM_GTX_polar_coordinates diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index 306be6cb7..072a9d64b 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_projection -#define GLM_GTX_projection +#pragma once // Dependency: #include "../glm.hpp" @@ -61,5 +60,3 @@ namespace glm }//namespace glm #include "projection.inl" - -#endif//GLM_GTX_projection diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index 7b056234b..ae01043a1 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_quaternion -#define GLM_GTX_quaternion +#pragma once // Dependency: #include "../glm.hpp" @@ -209,5 +208,3 @@ namespace glm }//namespace glm #include "quaternion.inl" - -#endif//GLM_GTX_quaternion diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index 71641d14f..d36a11fd2 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_raw_data -#define GLM_GTX_raw_data +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -71,5 +70,3 @@ namespace glm }// namespace glm #include "raw_data.inl" - -#endif//GLM_GTX_raw_data diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp index c51132311..bb7890ae0 100644 --- a/glm/gtx/rotate_normalized_axis.hpp +++ b/glm/gtx/rotate_normalized_axis.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_rotate_normalized_axis -#define GLM_GTX_rotate_normalized_axis +#pragma once // Dependency: #include "../glm.hpp" @@ -88,5 +87,3 @@ namespace glm }//namespace glm #include "rotate_normalized_axis.inl" - -#endif//GLM_GTX_rotate_normalized_axis diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index d5644056e..06eaee01e 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_rotate_vector -#define GLM_GTX_rotate_vector +#pragma once // Dependency: #include "../glm.hpp" @@ -128,5 +127,3 @@ namespace glm }//namespace glm #include "rotate_vector.inl" - -#endif//GLM_GTX_rotate_vector diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp index 487c5ca26..08c7470e3 100644 --- a/glm/gtx/scalar_relational.hpp +++ b/glm/gtx/scalar_relational.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_scalar_relational -#define GLM_GTX_scalar_relational +#pragma once // Dependency: #include "../glm.hpp" @@ -56,5 +55,3 @@ namespace glm }//namespace glm #include "scalar_relational.inl" - -#endif//GLM_GTX_scalar_relational diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 07794c9f0..e4857c83b 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_simd_mat4 -#define GLM_GTX_simd_mat4 +#pragma once // Dependencies #include "../detail/setup.hpp" @@ -201,5 +200,3 @@ namespace detail #include "simd_mat4.inl" #endif//(GLM_ARCH != GLM_ARCH_PURE) - -#endif//GLM_GTX_simd_mat4 diff --git a/glm/gtx/simd_quat.hpp b/glm/gtx/simd_quat.hpp index 1658cca44..a023c9889 100644 --- a/glm/gtx/simd_quat.hpp +++ b/glm/gtx/simd_quat.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_simd_quat -#define GLM_GTX_simd_quat +#pragma once // Dependency: #include "../glm.hpp" @@ -114,14 +113,14 @@ namespace detail ////////////////////////////////////// // Unary arithmetic operators - fquatSIMD& operator =(fquatSIMD const & q); - fquatSIMD& operator*=(float const & s); + fquatSIMD& operator =(fquatSIMD const & q); + fquatSIMD& operator*=(float const & s); fquatSIMD& operator/=(float const & s); }; - ////////////////////////////////////// - // Arithmetic operators + ////////////////////////////////////// + // Arithmetic operators detail::fquatSIMD operator- ( detail::fquatSIMD const & q); @@ -161,37 +160,37 @@ namespace detail /// @addtogroup gtx_simd_quat /// @{ - //! Convert a simdQuat to a quat. + //! Convert a simdQuat to a quat. //! (From GLM_GTX_simd_quat extension) quat quat_cast( detail::fquatSIMD const & x); - //! Convert a simdMat4 to a simdQuat. - //! (From GLM_GTX_simd_quat extension) - detail::fquatSIMD quatSIMD_cast( - detail::fmat4x4SIMD const & m); + //! Convert a simdMat4 to a simdQuat. + //! (From GLM_GTX_simd_quat extension) + detail::fquatSIMD quatSIMD_cast( + detail::fmat4x4SIMD const & m); - //! Converts a mat4 to a simdQuat. - //! (From GLM_GTX_simd_quat extension) - template - detail::fquatSIMD quatSIMD_cast( - detail::tmat4x4 const & m); + //! Converts a mat4 to a simdQuat. + //! (From GLM_GTX_simd_quat extension) + template + detail::fquatSIMD quatSIMD_cast( + detail::tmat4x4 const & m); - //! Converts a mat3 to a simdQuat. - //! (From GLM_GTX_simd_quat extension) - template - detail::fquatSIMD quatSIMD_cast( - detail::tmat3x3 const & m); + //! Converts a mat3 to a simdQuat. + //! (From GLM_GTX_simd_quat extension) + template + detail::fquatSIMD quatSIMD_cast( + detail::tmat3x3 const & m); - //! Convert a simdQuat to a simdMat4 - //! (From GLM_GTX_simd_quat extension) - detail::fmat4x4SIMD mat4SIMD_cast( - detail::fquatSIMD const & q); + //! Convert a simdQuat to a simdMat4 + //! (From GLM_GTX_simd_quat extension) + detail::fmat4x4SIMD mat4SIMD_cast( + detail::fquatSIMD const & q); - //! Converts a simdQuat to a standard mat4. - //! (From GLM_GTX_simd_quat extension) - mat4 mat4_cast( - detail::fquatSIMD const & q); + //! Converts a simdQuat to a standard mat4. + //! (From GLM_GTX_simd_quat extension) + mat4 mat4_cast( + detail::fquatSIMD const & q); /// Returns the length of the quaternion. @@ -206,14 +205,14 @@ namespace detail detail::fquatSIMD normalize( detail::fquatSIMD const & x); - /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... + /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... /// /// @see gtc_quaternion float dot( detail::fquatSIMD const & q1, detail::fquatSIMD const & q2); - /// Spherical linear interpolation of two quaternions. + /// Spherical linear interpolation of two quaternions. /// The interpolation is oriented and the rotation is performed at constant speed. /// For short path spherical linear interpolation, use the slerp function. /// @@ -228,7 +227,7 @@ namespace detail detail::fquatSIMD const & y, float const & a); - /// Linear interpolation of two quaternions. + /// Linear interpolation of two quaternions. /// The interpolation is oriented. /// /// @param x A quaternion @@ -255,14 +254,14 @@ namespace detail float const & a); - /// Faster spherical linear interpolation of two unit length quaternions. - /// - /// This is the same as mix(), except for two rules: - /// 1) The two quaternions must be unit length. - /// 2) The interpolation factor (a) must be in the range [0, 1]. - /// - /// This will use the equivalent to fastAcos() and fastSin(). - /// + /// Faster spherical linear interpolation of two unit length quaternions. + /// + /// This is the same as mix(), except for two rules: + /// 1) The two quaternions must be unit length. + /// 2) The interpolation factor (a) must be in the range [0, 1]. + /// + /// This will use the equivalent to fastAcos() and fastSin(). + /// /// @see gtc_quaternion /// @see - mix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) detail::fquatSIMD fastMix( @@ -270,14 +269,14 @@ namespace detail detail::fquatSIMD const & y, float const & a); - /// Identical to fastMix() except takes the shortest path. - /// - /// The same rules apply here as those in fastMix(). Both quaternions must be unit length and 'a' must be - /// in the range [0, 1]. - /// + /// Identical to fastMix() except takes the shortest path. + /// + /// The same rules apply here as those in fastMix(). Both quaternions must be unit length and 'a' must be + /// in the range [0, 1]. + /// /// @see - fastMix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) /// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) - detail::fquatSIMD fastSlerp( + detail::fquatSIMD fastSlerp( detail::fquatSIMD const & x, detail::fquatSIMD const & y, float const & a); @@ -295,7 +294,7 @@ namespace detail detail::fquatSIMD inverse( detail::fquatSIMD const & q); - /// Build a quaternion from an angle and a normalized axis. + /// Build a quaternion from an angle and a normalized axis. /// /// @param angle Angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise. /// @param axis Axis of the quaternion, must be normalized. @@ -305,7 +304,7 @@ namespace detail float const & angle, vec3 const & axis); - /// Build a quaternion from an angle and a normalized axis. + /// Build a quaternion from an angle and a normalized axis. /// /// @param angle Angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise. /// @param x x component of the x-axis, x, y, z must be a normalized axis @@ -320,9 +319,9 @@ namespace detail float const & z); - // TODO: Move this to somewhere more appropriate. Used with fastMix() and fastSlerp(). - /// Performs the equivalent of glm::fastSin() on each component of the given __m128. - __m128 fastSin(__m128 x); + // TODO: Move this to somewhere more appropriate. Used with fastMix() and fastSlerp(). + /// Performs the equivalent of glm::fastSin() on each component of the given __m128. + __m128 fastSin(__m128 x); /// @} @@ -337,5 +336,3 @@ namespace detail #endif//(GLM_ARCH != GLM_ARCH_PURE) - -#endif//GLM_GTX_simd_quat diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 6259b629f..cc117a4b5 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_simd_vec4 -#define GLM_GTX_simd_vec4 +#pragma once // Dependency: #include "../glm.hpp" @@ -570,5 +569,3 @@ namespace detail #endif #endif//(GLM_ARCH != GLM_ARCH_PURE) - -#endif//GLM_GTX_simd_vec4 diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index d610bf7be..07d07b348 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_spline -#define GLM_GTX_spline +#pragma once // Dependency: #include "../glm.hpp" @@ -85,6 +84,3 @@ namespace glm }//namespace glm #include "spline.inl" - -#endif//GLM_GTX_spline - diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index e13a17cb5..f85977707 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_std_based_type -#define GLM_GTX_std_based_type +#pragma once // Dependency: #include "../glm.hpp" @@ -79,5 +78,3 @@ namespace glm }//namespace glm #include "std_based_type.inl" - -#endif//GLM_GTX_std_based_type diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index bf73e7d3f..9d2217bbf 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -39,8 +39,7 @@ /// This extension is not supported with CUDA /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_string_cast -#define GLM_GTX_string_cast +#pragma once // Dependency: #include "../glm.hpp" @@ -70,5 +69,3 @@ namespace glm }//namespace glm #include "string_cast.inl" - -#endif//GLM_GTX_string_cast diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index bd932d034..03743c752 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -38,8 +38,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_transform -#define GLM_GTX_transform +#pragma once // Dependency: #include "../glm.hpp" @@ -80,5 +79,3 @@ namespace glm }// namespace glm #include "transform.inl" - -#endif//GLM_GTX_transform diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index 5c6adb247..4f8204ef5 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -36,8 +36,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_transform2 -#define GLM_GTX_transform2 +#pragma once // Dependency: #include "../glm.hpp" @@ -131,5 +130,3 @@ namespace glm }// namespace glm #include "transform2.inl" - -#endif//GLM_GTX_transform2 diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp index 035fc360d..57e59e5e7 100644 --- a/glm/gtx/vec1.hpp +++ b/glm/gtx/vec1.hpp @@ -34,8 +34,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_vec1 -#define GLM_GTX_vec1 +#pragma once // Dependency: #include "../glm.hpp" @@ -161,6 +160,3 @@ namespace glm }// namespace glm #include "vec1.inl" - -#endif//GLM_GTX_vec1 - diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index 0647bef22..ea663dfb1 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -37,8 +37,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_vector_angle -#define GLM_GTX_vector_angle +#pragma once // Dependency: #include "../glm.hpp" @@ -84,5 +83,3 @@ namespace glm }// namespace glm #include "vector_angle.inl" - -#endif//GLM_GTX_vector_angle diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index e4ac2b5aa..3d1dbfd0d 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_vector_query -#define GLM_GTX_vector_query +#pragma once // Dependency: #include "../glm.hpp" @@ -86,5 +85,3 @@ namespace glm }// namespace glm #include "vector_query.inl" - -#endif//GLM_GTX_vector_query diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index 8a157a518..2a11a9b77 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -35,8 +35,7 @@ /// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_GTX_wrap -#define GLM_GTX_wrap +#pragma once // Dependency: #include "../glm.hpp" @@ -69,5 +68,3 @@ namespace glm }// namespace glm #include "wrap.inl" - -#endif//GLM_GTX_wrap diff --git a/glm/integer.hpp b/glm/integer.hpp index aa3f8e872..5f7c00a40 100644 --- a/glm/integer.hpp +++ b/glm/integer.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_INTEGER_INCLUDED -#define GLM_INTEGER_INCLUDED +#pragma once #include "detail/func_integer.hpp" - -#endif//GLM_INTEGER_INCLUDED diff --git a/glm/mat2x2.hpp b/glm/mat2x2.hpp index 57f7f8082..b08704461 100644 --- a/glm/mat2x2.hpp +++ b/glm/mat2x2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT2X2_INCLUDED -#define GLM_MAT2X2_INCLUDED +#pragma once #include "detail/type_mat2x2.hpp" @@ -76,5 +75,3 @@ namespace glm typedef detail::tmat2x2 highp_mat2x2; }//namespace glm - -#endif//GLM_MAT2X2_INCLUDED diff --git a/glm/mat2x3.hpp b/glm/mat2x3.hpp index ea020b069..0f50d57bc 100644 --- a/glm/mat2x3.hpp +++ b/glm/mat2x3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT2X3_INCLUDED -#define GLM_MAT2X3_INCLUDED +#pragma once #include "detail/type_mat2x3.hpp" @@ -56,4 +55,3 @@ namespace glm }//namespace glm -#endif//GLM_MAT2X3_INCLUDED diff --git a/glm/mat2x4.hpp b/glm/mat2x4.hpp index 249970120..8c8d136f9 100644 --- a/glm/mat2x4.hpp +++ b/glm/mat2x4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT2X4_INCLUDED -#define GLM_MAT2X4_INCLUDED +#pragma once #include "detail/type_mat2x4.hpp" @@ -55,5 +54,3 @@ namespace glm typedef detail::tmat2x4 highp_mat2x4; }//namespace glm - -#endif//GLM_MAT2X4_INCLUDED diff --git a/glm/mat3x2.hpp b/glm/mat3x2.hpp index 47c1ca4e1..836829c77 100644 --- a/glm/mat3x2.hpp +++ b/glm/mat3x2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT3X2_INCLUDED -#define GLM_MAT3X2_INCLUDED +#pragma once #include "detail/type_mat3x2.hpp" @@ -55,5 +54,3 @@ namespace glm typedef detail::tmat3x2 highp_mat3x2; }//namespace - -#endif//GLM_MAT3X2_INCLUDED diff --git a/glm/mat3x3.hpp b/glm/mat3x3.hpp index 5d7659c96..2ea61b7aa 100644 --- a/glm/mat3x3.hpp +++ b/glm/mat3x3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT3X3_INCLUDED -#define GLM_MAT3X3_INCLUDED +#pragma once #include "detail/type_mat3x3.hpp" @@ -76,5 +75,3 @@ namespace glm typedef detail::tmat3x3 highp_mat3x3; }//namespace glm - -#endif//GLM_MAT3X3_INCLUDED diff --git a/glm/mat3x4.hpp b/glm/mat3x4.hpp index 03b5fee36..66afb7fa6 100644 --- a/glm/mat3x4.hpp +++ b/glm/mat3x4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT3X4_INCLUDED -#define GLM_MAT3X4_INCLUDED +#pragma once #include "detail/type_mat3x4.hpp" @@ -55,5 +54,3 @@ namespace glm typedef detail::tmat3x4 highp_mat3x4; }//namespace glm - -#endif//GLM_MAT3X4_INCLUDED diff --git a/glm/mat4x2.hpp b/glm/mat4x2.hpp index 1e4671a08..1dc272e0a 100644 --- a/glm/mat4x2.hpp +++ b/glm/mat4x2.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT4X2_INCLUDED -#define GLM_MAT4X2_INCLUDED +#pragma once #include "detail/type_mat4x2.hpp" @@ -55,5 +54,3 @@ namespace glm typedef detail::tmat4x2 highp_mat4x2; }//namespace glm - -#endif//GLM_MAT4X2_INCLUDED diff --git a/glm/mat4x3.hpp b/glm/mat4x3.hpp index 14ecee926..1d28b5176 100644 --- a/glm/mat4x3.hpp +++ b/glm/mat4x3.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT4X3_INCLUDED -#define GLM_MAT4X3_INCLUDED +#pragma once #include "detail/type_mat4x3.hpp" @@ -55,5 +54,3 @@ namespace glm typedef detail::tmat4x3 highp_mat4x3; }//namespace glm - -#endif//GLM_MAT4X3_INCLUDED diff --git a/glm/mat4x4.hpp b/glm/mat4x4.hpp index 7e97af690..1d22846ee 100644 --- a/glm/mat4x4.hpp +++ b/glm/mat4x4.hpp @@ -26,8 +26,7 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MAT4X4_INCLUDED -#define GLM_MAT4X4_INCLUDED +#pragma once #include "detail/type_mat4x4.hpp" @@ -76,5 +75,3 @@ namespace glm typedef detail::tmat4x4 highp_mat4x4; }//namespace glm - -#endif//GLM_MAT4X4_INCLUDED diff --git a/glm/matrix.hpp b/glm/matrix.hpp index 6758d81e7..3b4bbb3fc 100644 --- a/glm/matrix.hpp +++ b/glm/matrix.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_MATRIX_INCLUDED -#define GLM_MATRIX_INCLUDED +#pragma once #include "detail/func_matrix.hpp" - -#endif//GLM_MATRIX_INCLUDED diff --git a/glm/packing.hpp b/glm/packing.hpp index e7aa7888c..d62de9529 100644 --- a/glm/packing.hpp +++ b/glm/packing.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_PACKING_INCLUDED -#define GLM_PACKING_INCLUDED +#pragma once #include "detail/func_packing.hpp" - -#endif//GLM_PACKING_INCLUDED diff --git a/glm/trigonometric.hpp b/glm/trigonometric.hpp index 37a791305..51edc9353 100644 --- a/glm/trigonometric.hpp +++ b/glm/trigonometric.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_TRIGONOMETRIC_INCLUDED -#define GLM_TRIGONOMETRIC_INCLUDED +#pragma once #include "detail/func_trigonometric.hpp" - -#endif//GLM_TRIGONOMETRIC_INCLUDED diff --git a/glm/vec2.hpp b/glm/vec2.hpp index 6c8df7a55..6d7e17c22 100644 --- a/glm/vec2.hpp +++ b/glm/vec2.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_VEC2_INCLUDED -#define GLM_VEC2_INCLUDED +#pragma once #include "detail/type_vec2.hpp" - -#endif//GLM_VEC2_INCLUDED diff --git a/glm/vec3.hpp b/glm/vec3.hpp index 2d017e1b1..9e3a8fc0e 100644 --- a/glm/vec3.hpp +++ b/glm/vec3.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_VEC3_INCLUDED -#define GLM_VEC3_INCLUDED +#pragma once #include "detail/type_vec3.hpp" - -#endif//GLM_VEC3_INCLUDED diff --git a/glm/vec4.hpp b/glm/vec4.hpp index 6d7e41991..6b58a2ee6 100644 --- a/glm/vec4.hpp +++ b/glm/vec4.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_VEC4_INCLUDED -#define GLM_VEC4_INCLUDED +#pragma once #include "detail/type_vec4.hpp" - -#endif//GLM_VEC4_INCLUDED diff --git a/glm/vector_relational.hpp b/glm/vector_relational.hpp index 86faf394c..a0f3fd5f1 100644 --- a/glm/vector_relational.hpp +++ b/glm/vector_relational.hpp @@ -26,9 +26,6 @@ /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_VECTOR_RELATIONAL_INCLUDED -#define GLM_VECTOR_RELATIONAL_INCLUDED +#pragma once #include "detail/func_vector_relational.hpp" - -#endif//GLM_VECTOR_RELATIONAL_INCLUDED diff --git a/readme.txt b/readme.txt index f570ffd82..5e1c371e2 100644 --- a/readme.txt +++ b/readme.txt @@ -43,7 +43,9 @@ GLM 0.9.6.0: 2014-XX-XX - Removed degrees for function parameters - Removed GLM_FORCE_RADIANS, active by default - Added move contructors and assignment operators (#141) +- Use pragma once +================================================================================ GLM 0.9.5.5: 2014-XX-XX -------------------------------------------------------------------------------- - Fixed std::nextafter not supported with C++11 on Android #213