nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

point: prefer explicit over blocked namespacing

Browse Source
This commit is contained in:
Danny Robson 2016-12-12 15:45:43 +11:00
parent 9711272989
commit 17b5514df4
1 changed files with 93 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
point.ipp
View File

@ -18,14 +18,13 @@
#include <algorithm> #include <algorithm>
namespace util {
///------------------------------------------------------------------------ ///------------------------------------------------------------------------
/// expand point to use homogenous coordinates of a higher dimension. /// expand point to use homogenous coordinates of a higher dimension.
/// ie, fill with (0,..,0,1) /// ie, fill with (0,..,0,1)
template <size_t S, typename T> template <size_t S, typename T>
template <size_t D> template <size_t D>
point<D,T> util::point<D,T>
point<S,T>::homog (void) const util::point<S,T>::homog (void) const
{ {
static_assert (D > S, "homog will not overwrite data"); static_assert (D > S, "homog will not overwrite data");
@ -49,7 +48,7 @@ namespace util {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <size_t S, typename T, typename U> template <size_t S, typename T, typename U>
typename std::common_type<T,U>::type 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; using type_t = typename std::common_type<T,U>::type;
static_assert (std::is_floating_point<type_t>::value, static_assert (std::is_floating_point<type_t>::value,
@ -62,7 +61,7 @@ namespace util {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <size_t S, typename T, typename U> template <size_t S, typename T, typename U>
constexpr typename std::common_type<T,U>::type 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}; typename std::common_type<T,U>::type sum {0};
@ -76,7 +75,7 @@ namespace util {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <typename T, typename U> template <typename T, typename U>
typename std::common_type<T,U>::type 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; using type_t = typename std::common_type<T,U>::type;
static_assert (!std::is_integral<type_t>::value, static_assert (!std::is_integral<type_t>::value,
@ -100,7 +99,7 @@ namespace util {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <size_t S, typename T, typename U> template <size_t S, typename T, typename U>
constexpr typename std::common_type<T,U>::type 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}; typename std::common_type<T,U>::type sum {0};
@ -114,8 +113,7 @@ namespace util {
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <size_t S, typename T, typename U> template <size_t S, typename T, typename U>
constexpr typename std::common_type<T,U>::type 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)); return util::max (abs (a - b));
} }
}