point: prefer explicit over blocked namespacing
This commit is contained in:
parent
9711272989
commit
17b5514df4
16
point.ipp
16
point.ipp
@ -18,14 +18,13 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
namespace util {
|
||||
///------------------------------------------------------------------------
|
||||
/// expand point to use homogenous coordinates of a higher dimension.
|
||||
/// ie, fill with (0,..,0,1)
|
||||
template <size_t S, typename T>
|
||||
template <size_t D>
|
||||
point<D,T>
|
||||
point<S,T>::homog (void) const
|
||||
util::point<D,T>
|
||||
util::point<S,T>::homog (void) const
|
||||
{
|
||||
static_assert (D > S, "homog will not overwrite data");
|
||||
|
||||
@ -49,7 +48,7 @@ namespace util {
|
||||
//-------------------------------------------------------------------------
|
||||
template <size_t S, typename T, typename U>
|
||||
typename std::common_type<T,U>::type
|
||||
distance (point<S,T> a, point<S,U> b)
|
||||
util::distance (point<S,T> a, point<S,U> b)
|
||||
{
|
||||
using type_t = typename std::common_type<T,U>::type;
|
||||
static_assert (std::is_floating_point<type_t>::value,
|
||||
@ -62,7 +61,7 @@ namespace util {
|
||||
//-------------------------------------------------------------------------
|
||||
template <size_t S, typename T, typename U>
|
||||
constexpr typename std::common_type<T,U>::type
|
||||
distance2 (point<S,T> a, point<S,U> b)
|
||||
util::distance2 (point<S,T> a, point<S,U> b)
|
||||
{
|
||||
typename std::common_type<T,U>::type sum {0};
|
||||
|
||||
@ -76,7 +75,7 @@ namespace util {
|
||||
//-------------------------------------------------------------------------
|
||||
template <typename T, typename U>
|
||||
typename std::common_type<T,U>::type
|
||||
octile (point2<T> a, point2<U> b)
|
||||
util::octile (point2<T> a, point2<U> b)
|
||||
{
|
||||
using type_t = typename std::common_type<T,U>::type;
|
||||
static_assert (!std::is_integral<type_t>::value,
|
||||
@ -100,7 +99,7 @@ namespace util {
|
||||
//-------------------------------------------------------------------------
|
||||
template <size_t S, typename T, typename U>
|
||||
constexpr typename std::common_type<T,U>::type
|
||||
manhattan (point<S,T> a, point<S,U> b)
|
||||
util::manhattan (point<S,T> a, point<S,U> b)
|
||||
{
|
||||
typename std::common_type<T,U>::type sum {0};
|
||||
|
||||
@ -114,8 +113,7 @@ namespace util {
|
||||
//-------------------------------------------------------------------------
|
||||
template <size_t S, typename T, typename U>
|
||||
constexpr typename std::common_type<T,U>::type
|
||||
chebyshev(point<S,T> a, point<S,U> b)
|
||||
util::chebyshev(point<S,T> a, point<S,U> b)
|
||||
{
|
||||
return util::max (abs (a - b));
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user