Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interval: make operators a class friend

Browse Source 
This makes them better discoverable by MSVC from various non-root
namespaces.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2023-10-01 23:16:36 +02:00
parent 3183b58e0d
commit 010ee71d93
1 changed files with 122 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
include/stdex/interval.hpp
View File

@ -68,154 +68,130 @@ namespace stdex
/// \returns true if x is in [start, end) or false otherwise
///
inline bool contains(_In_ T x) const { return start <= x && x < end; }
};
template <class T, class _Alloc = std::allocator<interval<T>>>
using interval_vector = std::vector<interval<T>, _Alloc>;
}
///
/// Adds two intervals by components
///
/// \param[in] a First interval
/// \param[in] b Second interval
/// \param[in] other Second interval
///
/// \returns Resulting interval
///
template <class T>
inline stdex::interval<T> operator+(_In_ const stdex::interval<T>& a, _In_ const stdex::interval<T>& b)
inline interval<T> operator+(_In_ const interval<T>& other) const
{
return stdex::interval<T>(a.start + b.start, a.end + b.end);
return interval<T>(start + other.start, end + other.end);i.
}
///
/// Moves interval towards the end by a number
///
/// \param[in] i Interval to move
/// \param[in] x Amount to move for
///
/// \returns Moved interval
///
template <class T>
inline stdex::interval<T> operator+(_In_ const stdex::interval<T>& i, _In_ const T x)
inline interval<T> operator+(_In_ const T x) const
{
return stdex::interval<T>(i.start + x, i.end + x);
return interval<T>(start + x, end + x);
}
///
/// Moves interval towards the end by one
///
/// \param[in,out] i Interval to move
///
/// \returns Moved interval
///
template <class T>
inline stdex::interval<T> operator++(_Inout_ stdex::interval<T>& i)
inline interval<T> operator++()
{
++i.start;
++i.end;
return i;
++start;
++end;
return *this;
}
///
/// Moves interval towards the end by one
///
/// \param[in,out] i Interval to move
///
/// \returns Original interval
///
template <class T>
inline stdex::interval<T> operator++(_Inout_ stdex::interval<T>& i, int) // Postfix increment operator.
inline interval<T> operator++(int) // Postfix increment operator.
{
stdex::interval<T> r = i;
++i.start;
++i.end;
interval<T> r = *this;
++start;
++end;
return r;
}
///
/// Subtracts two intervals by components
///
/// \param[in] a First interval
/// \param[in] b Second interval
/// \param[in] other Second interval
///
/// \returns Resulting interval
///
template <class T>
inline stdex::interval<T> operator-(_In_ const stdex::interval<T>& a, _In_ const stdex::interval<T>& b)
inline interval<T> operator-(_In_ const interval<T>& other) const
{
return stdex::interval<T>(a.start - b.start, a.end - b.end);
return interval<T>(start - other.start, end - other.end);
}
///
/// Moves interval towards the beginning by a number
///
/// \param[in] i Interval to move
/// \param[in] x Amount to move for
///
/// \returns Moved interval
///
template <class T>
inline stdex::interval<T> operator-(_In_ const stdex::interval<T>& i, _In_ const T x)
inline interval<T> operator-(_In_ const T x) const
{
return stdex::interval<T>(i.start - x, i.end - x);
return interval<T>(start - x, end - x);
}
///
/// Moves interval towards the begginning by one
///
/// \param[in,out] i Interval to move
///
/// \returns Moved interval
///
template <class T>
inline stdex::interval<T> operator--(_Inout_ stdex::interval<T>& i)
inline interval<T> operator--()
{
--i.start;
--i.end;
return i;
--start;
--end;
return *this;
}
///
/// Moves interval towards the begginning by one
///
/// \param[in,out] i Interval to move
///
/// \returns Original interval
///
template <class T>
inline stdex::interval<T> operator--(_Inout_ stdex::interval<T>& i, int)
inline interval<T> operator--(int) // Postfix decrement operator.
{
stdex::interval<T> r = i;
--i.start;
--i.end;
interval<T> r = *this;
--start;
--end;
return r;
}
///
/// Are intervals identical?
///
/// \param[in] a First interval to compare
/// \param[in] b Second interval to compare
/// \param[in] other Second interval to compare
///
/// \returns true if intervals are identical or false otherwise
///
template <class T>
inline bool operator==(_In_ const stdex::interval<T>& a, _In_ const stdex::interval<T>& b)
inline bool operator==(_In_ const interval<T>& other) const
{
return a.start == b.start && a.end == b.end;
return start == other.start && end == other.end;
}
///
/// Are intervals different?
///
/// \param[in] a First interval to compare
/// \param[in] b Second interval to compare
/// \param[in] other Second interval to compare
///
/// \returns true if intervals are different or false otherwise
///
template <class T>
inline bool operator!=(_In_ const stdex::interval<T>& a, _In_ const stdex::interval<T>& b)
inline bool operator!=(_In_ const interval<T>& other) const
{
return a.start != b.start || a.end != b.end;
return !operator ==(other);
}
};
template <class T, class _Alloc = std::allocator<interval<T>>>
using interval_vector = std::vector<interval<T>, _Alloc>;
}