rational: add type deducing divide/multiply

This commit is contained in:
Danny Robson 2015-09-21 16:35:48 +10:00
parent 4b253a57f7
commit a83aa188e4
4 changed files with 48 additions and 9 deletions

View File

@ -210,6 +210,7 @@ UTIL_FILES = \
range.ipp \ range.ipp \
rational.cpp \ rational.cpp \
rational.hpp \ rational.hpp \
rational.ipp \
ray.cpp \ ray.cpp \
ray.hpp \ ray.hpp \
region.cpp \ region.cpp \

View File

@ -160,13 +160,6 @@ rational<T>::operator/ (const T rhs) const
} }
//-----------------------------------------------------------------------------
template <typename T>
rational<T>
util::operator/ (T lhs, rational<T> rhs) {
return rhs.inverse () * lhs;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template struct util::rational<uint32_t>; template struct util::rational<uint32_t>;
template struct util::rational< int32_t>; template struct util::rational< int32_t>;

View File

@ -51,8 +51,15 @@ namespace util {
T d; T d;
}; };
template <typename T> template <typename T, typename U>
rational<T> operator/ (T, rational<T>); rational<typename std::common_type<T,U>::type>
operator/ (U, rational<T>);
template <typename T, typename U>
rational<typename std::common_type<T,U>::type>
operator* (U, rational<T>);
} }
#include "rational.ipp"
#endif #endif

38
rational.ipp Normal file
View File

@ -0,0 +1,38 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2015 Danny Robson <danny@nerdcruft.net>
*/
#ifdef __UTIL_RATIONAL_IPP
#error
#endif
#define __UTIL_RATIONAL_IPP
//-----------------------------------------------------------------------------
template <typename T, typename U>
util::rational<typename std::common_type<T,U>::type>
util::operator/ (U lhs, rational<T> rhs)
{
return rhs.inverse () * lhs;
}
//-----------------------------------------------------------------------------
template <typename T, typename U>
util::rational<typename std::common_type<T,U>::type>
util::operator* (U lhs, rational<T> rhs)
{
return rhs * lhs;
}