diff --git a/glm/core/func_common.hpp b/glm/core/func_common.hpp
index 1c3295a7..7287ab96 100644
--- a/glm/core/func_common.hpp
+++ b/glm/core/func_common.hpp
@@ -213,22 +213,22 @@ namespace glm
typename genType::value_type const & minVal,
typename genType::value_type const & maxVal);
- //! @return If genTypeU is a floating scalar or vector:
- //! Returns x * (1.0 - a) + y * a, i.e., the linear blend of
- //! x and y using the floating-point value a.
- //! The value for a is not restricted to the range [0, 1].
- //!
- //! @return If genTypeU is a boolean scalar or vector:
- //! Selects which vector each returned component comes
- //! from. For a component of a that is false, the
- //! corresponding component of x is returned. For a
- //! component of a that is true, the corresponding
- //! component of y is returned. Components of x and y that
- //! are not selected are allowed to be invalid floating point
- //! values and will have no effect on the results. Thus, this
- //! provides different functionality than
- //! genType mix(genType x, genType y, genType(a))
- //! where a is a Boolean vector.
+ /// If genTypeU is a floating scalar or vector:
+ /// Returns x * (1.0 - a) + y * a, i.e., the linear blend of
+ /// x and y using the floating-point value a.
+ /// The value for a is not restricted to the range [0, 1].
+ ///
+ /// If genTypeU is a boolean scalar or vector:
+ /// Selects which vector each returned component comes
+ /// from. For a component of a that is false, the
+ /// corresponding component of x is returned. For a
+ /// component of a that is true, the corresponding
+ /// component of y is returned. Components of x and y that
+ /// are not selected are allowed to be invalid floating point
+ /// values and will have no effect on the results. Thus, this
+ /// provides different functionality than
+ /// genType mix(genType x, genType y, genType(a))
+ /// where a is a Boolean vector.
///
/// @see GLSL mix man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
diff --git a/glm/core/func_exponential.hpp b/glm/core/func_exponential.hpp
index 557ac175..20ea05b9 100644
--- a/glm/core/func_exponential.hpp
+++ b/glm/core/func_exponential.hpp
@@ -41,16 +41,16 @@ namespace glm
/// @addtogroup core_func_exponential
/// @{
- /// Returns x raised to the y power.
+ /// Returns 'base' raised to the power 'exponent'.
///
- /// @param x pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
- /// @param y
+ /// @param base Floating point value. pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision.
+ /// @param exponent Floating point value representing the 'exponent'.
/// @tparam genType Floating-point scalar or vector types.
///
/// @see GLSL pow man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- genType pow(genType const & x, genType const & y);
+ genType pow(genType const & base, genType const & exponent);
/// Returns the natural exponentiation of x, i.e., e^x.
///
diff --git a/glm/core/type_mat.hpp b/glm/core/type_mat.hpp
index cbf0c205..f55f3aca 100644
--- a/glm/core/type_mat.hpp
+++ b/glm/core/type_mat.hpp
@@ -34,40 +34,6 @@
namespace glm{
namespace detail
{
- //template
- //<
- // typename T,
- // template class C,
- // template class R
- //>
- //struct matType
- //{
- // enum ctor{null};
- // typedef T value_type;
- // typedef std::size_t size_type;
- // typedef C col_type;
- // typedef R row_type;
- // static size_type const col_size;
- // static size_type const row_size;
- //};
-
- //template
- //<
- // typename T,
- // template class C,
- // template class R
- //>
- //typename matType::size_type const
- //matType::col_size = matType::col_type::value_size;
-
- //template
- //<
- // typename T,
- // template class C,
- // template class R
- //>
- //typename matType::size_type const
- //matType::row_size = matType::row_type::value_size;
}//namespace detail
}//namespace glm
diff --git a/readme.txt b/readme.txt
index 53f44910..bf3a807d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -37,7 +37,7 @@ More informations in GLM manual:
http://glm.g-truc.net/glm.pdf
================================================================================
-GLM 0.9.4.2: 2013-01-XX
+GLM 0.9.4.2: 2013-02-14
--------------------------------------------------------------------------------
- Fixed compAdd from GTX_component_wise
- Fixed SIMD support for Intel compiler on Windows
@@ -48,6 +48,7 @@ GLM 0.9.4.2: 2013-01-XX
- Fixed mix for vec4 SSE implementation
- Fixed 0x2013 dash character in comments that cause issue in Windows
Japanese mode
+- Fixed documentation warnings
================================================================================
GLM 0.9.4.1: 2012-12-22