sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Range ADL for some MSVC versions

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-23 17:00:43 +01:00
parent f6505613db
commit 2fb69867c4
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/sfizz/Range.h
View file

@ -7,7 +7,6 @@
#pragma once #pragma once
#include "MathHelpers.h" #include "MathHelpers.h"
#include "Macros.h" #include "Macros.h"
#include <initializer_list>
#include <type_traits> #include <type_traits>
#include <limits> #include <limits>
@ -159,29 +158,16 @@ private:
template <class T> using UncheckedRange = Range<T, false>; template <class T> using UncheckedRange = Range<T, false>;
template <class Type, bool C1, bool C2>
bool operator==(const Range<Type, C1>& lhs, const Range<Type, C2>& rhs) noexcept
{
return lhs.getStart() == rhs.getStart() && lhs.getEnd() == rhs.getEnd();
} }
template <class Type, bool C1, bool C2> template <class Type, bool C1, bool C2>
bool operator==(const sfz::Range<Type, C1>& lhs, const sfz::Range<Type, C2>& rhs) bool operator!=(const Range<Type, C1>& lhs, const Range<Type, C2>& rhs) noexcept
{ {
return (lhs.getStart() == rhs.getStart()) && (lhs.getEnd() == rhs.getEnd()); return !operator==(lhs, rhs);
} }
template <class Type, bool C1, bool C2> } // namespace sfz
bool operator!=(const sfz::Range<Type, C1>& lhs, const sfz::Range<Type, C2>& rhs)
{
return (lhs.getStart() != rhs.getStart()) || (lhs.getEnd() != rhs.getEnd());
}
template <class Type, bool C>
bool operator==(const sfz::Range<Type, C>& lhs, const std::pair<Type, Type>& rhs)
{
return (lhs.getStart() == rhs.first) && (lhs.getEnd() == rhs.second);
}
template <class Type, bool C>
bool operator==(const std::pair<Type, Type>& lhs, const sfz::Range<Type, C>& rhs)
{
return rhs == lhs;
}

4
tests/RangeT.cpp
View file

@ -12,13 +12,9 @@ TEST_CASE("[Range] Equality operators")
{ {
sfz::Range<int> intRange { 1, 1 }; sfz::Range<int> intRange { 1, 1 };
REQUIRE(intRange == sfz::Range<int>(1, 1)); REQUIRE(intRange == sfz::Range<int>(1, 1));
REQUIRE(intRange == std::pair<int, int>(1, 1));
REQUIRE(std::pair<int, int>(1, 1) == intRange);
sfz::Range<float> floatRange { 1.0f, 1.0f }; sfz::Range<float> floatRange { 1.0f, 1.0f };
REQUIRE(floatRange == sfz::Range<float>(1.0f, 1.0f)); REQUIRE(floatRange == sfz::Range<float>(1.0f, 1.0f));
REQUIRE(floatRange == std::pair<float, float>(1.0f, 1.0f));
REQUIRE(std::pair<float, float>(1.0f, 1.0f) == floatRange);
} }
TEST_CASE("[Range] Default ranges for classical types") TEST_CASE("[Range] Default ranges for classical types")