Browse Source

Math: minor cleanup and code shuffling.

pull/331/head
Vladimír Vondruš 7 years ago
parent
commit
e7af6bf07b
  1. 1
      src/Magnum/Math/Angle.h
  2. 1
      src/Magnum/Math/BoolVector.h
  3. 1
      src/Magnum/Math/Math.h
  4. 14
      src/Magnum/Math/Range.h
  5. 1
      src/Magnum/Math/Test/CubicHermiteTest.cpp

1
src/Magnum/Math/Angle.h

@ -29,7 +29,6 @@
* @brief Class @ref Magnum::Math::Deg, @ref Magnum::Math::Rad, literal @link Magnum::Math::Literals::operator""_degf() @endlink, @link Magnum::Math::Literals::operator""_radf() @endlink, @link Magnum::Math::Literals::operator""_deg() @endlink, @link Magnum::Math::Literals::operator""_rad() @endlink
*/
#include <Corrade/configure.h>
#include <Corrade/Utility/Debug.h>
#include "Magnum/visibility.h"

1
src/Magnum/Math/BoolVector.h

@ -29,7 +29,6 @@
* @brief Class @ref Magnum::Math::BoolVector
*/
#include <Corrade/configure.h>
#include <Corrade/Utility/Debug.h>
#include "Magnum/Types.h"

1
src/Magnum/Math/Math.h

@ -30,7 +30,6 @@
*/
#include <cstddef>
#include <Corrade/configure.h>
#include "Magnum/Types.h"

14
src/Magnum/Math/Range.h

@ -736,13 +736,6 @@ template<UnsignedInt dimensions, class T> Corrade::Utility::Debug& operator<<(Co
return debug << Corrade::Utility::Debug::nospace << "})";
}
template<UnsignedInt dimensions, class T> inline bool Range<dimensions, T>::operator==(const Range<dimensions, T>& other) const {
/* For non-scalar types default implementation of TypeTraits would be used,
which is just operator== */
return TypeTraits<VectorType>::equals(_min, other._min) &&
TypeTraits<VectorType>::equals(_max, other._max);
}
/* Explicit instantiation for commonly used types */
#ifndef DOXYGEN_GENERATING_OUTPUT
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Range<1, Float>&);
@ -756,6 +749,13 @@ extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utili
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Range<3, Double>&);
#endif
template<UnsignedInt dimensions, class T> inline bool Range<dimensions, T>::operator==(const Range<dimensions, T>& other) const {
/* For non-scalar types default implementation of TypeTraits would be used,
which is just operator== */
return TypeTraits<VectorType>::equals(_min, other._min) &&
TypeTraits<VectorType>::equals(_max, other._max);
}
namespace Implementation {
template<UnsignedInt dimensions, class T> struct StrictWeakOrdering<Range<dimensions, T>> {

1
src/Magnum/Math/Test/CubicHermiteTest.cpp

@ -32,7 +32,6 @@
#include "Magnum/Math/Vector2.h"
#include "Magnum/Math/StrictWeakOrdering.h"
namespace Magnum { namespace Math { namespace Test { namespace {
struct CubicHermiteTest: Corrade::TestSuite::Tester {

Loading…
Cancel
Save