Menu
▾
▴
[Boost-sandbox-cvs] boost-sandbox/boost/units quantity.hpp, 1.19, 1.20
|
From: Steven W. <ste...@us...> - 2007-04-13 02:24:32
|
Update of /cvsroot/boost-sandbox/boost-sandbox/boost/units In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17203/boost-sandbox/boost/units Modified Files: quantity.hpp Log Message: don't hard-code unit<...> into multiplication and division Index: quantity.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/quantity.hpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- quantity.hpp 13 Apr 2007 01:06:31 -0000 1.19 +++ quantity.hpp 13 Apr 2007 02:22:56 -0000 1.20 @@ -671,117 +671,109 @@ } /// runtime quantity times scalar -template<class System, - class Dim, +template<class Unit, class X, class Y> inline -typename multiply_typeof_helper< quantity<unit<Dim,System>,X>,Y >::type -operator*(const quantity<unit<Dim,System>,X>& lhs,const Y& rhs) +typename multiply_typeof_helper< quantity<Unit,X>,Y >::type +operator*(const quantity<Unit,X>& lhs,const Y& rhs) { - typedef typename multiply_typeof_helper< quantity<unit<Dim,System>,X>,Y >::type type; + typedef typename multiply_typeof_helper< quantity<Unit,X>,Y >::type type; return type::from_value(lhs.value()*rhs); } /// runtime scalar times quantity -template<class System, - class Dim, +template<class Unit, class X, class Y> inline -typename multiply_typeof_helper< X,quantity<unit<Dim,System>,Y> >::type -operator*(const X& lhs,const quantity<unit<Dim,System>,Y>& rhs) +typename multiply_typeof_helper< X,quantity<Unit,Y> >::type +operator*(const X& lhs,const quantity<Unit,Y>& rhs) { - typedef typename multiply_typeof_helper< X,quantity<unit<Dim,System>,Y> >::type type; + typedef typename multiply_typeof_helper< X,quantity<Unit,Y> >::type type; return type::from_value(lhs*rhs.value()); } /// runtime quantity divided by scalar -template<class System, - class Dim, +template<class Unit, class X, class Y> inline -typename divide_typeof_helper< quantity<unit<Dim,System>,X>,Y >::type -operator/(const quantity<unit<Dim,System>,X>& lhs,const Y& rhs) +typename divide_typeof_helper< quantity<Unit,X>,Y >::type +operator/(const quantity<Unit,X>& lhs,const Y& rhs) { - typedef typename divide_typeof_helper< quantity<unit<Dim,System>,X>,Y >::type type; + typedef typename divide_typeof_helper< quantity<Unit,X>,Y >::type type; return type::from_value(lhs.value()/rhs); } /// runtime scalar divided by quantity -template<class System, - class Dim, +template<class Unit, class X, class Y> inline -typename divide_typeof_helper< X,quantity<unit<Dim,System>,Y> >::type -operator/(const X& lhs,const quantity<unit<Dim,System>,Y>& rhs) +typename divide_typeof_helper< X,quantity<Unit,Y> >::type +operator/(const X& lhs,const quantity<Unit,Y>& rhs) { - typedef typename divide_typeof_helper< X,quantity<unit<Dim,System>,Y> >::type type; + typedef typename divide_typeof_helper< X,quantity<Unit,Y> >::type type; return type::from_value(lhs/rhs.value()); } /// runtime unit times quantity template<class System1, - class System2, class Dim1, - class Dim2, + class Unit2, class Y> inline -typename multiply_typeof_helper< unit<Dim1,System1>,quantity<unit<Dim2,System2>,Y> >::type -operator*(const unit<Dim1,System1>&,const quantity<unit<Dim2,System2>,Y>& rhs) +typename multiply_typeof_helper< unit<Dim1,System1>,quantity<Unit2,Y> >::type +operator*(const unit<Dim1,System1>&,const quantity<Unit2,Y>& rhs) { - typedef typename multiply_typeof_helper< unit<Dim1,System1>,quantity<unit<Dim2,System2>,Y> >::type type; + typedef typename multiply_typeof_helper< unit<Dim1,System1>,quantity<Unit2,Y> >::type type; return type::from_value(rhs.value()); } /// runtime unit divided by quantity template<class System1, - class System2, class Dim1, - class Dim2, + class Unit2, class Y> inline -typename divide_typeof_helper< unit<Dim1,System1>,quantity<unit<Dim2,System2>,Y> >::type -operator/(const unit<Dim1,System1>&,const quantity<unit<Dim2,System2>,Y>& rhs) +typename divide_typeof_helper< unit<Dim1,System1>,quantity<Unit2,Y> >::type +operator/(const unit<Dim1,System1>&,const quantity<Unit2,Y>& rhs) { - typedef typename divide_typeof_helper< unit<Dim1,System1>,quantity<unit<Dim2,System2>,Y> >::type type; + typedef typename divide_typeof_helper< unit<Dim1,System1>,quantity<Unit2,Y> >::type type; return type::from_value(Y(1)/rhs.value()); } /// runtime quantity times unit -template<class System1, +template<class Unit1, class System2, - class Dim1, class Dim2, class Y> inline -typename multiply_typeof_helper< quantity<unit<Dim1,System1>,Y>,unit<Dim2,System2> >::type -operator*(const quantity<unit<Dim1,System1>,Y>& lhs,const unit<Dim2,System2>&) +typename multiply_typeof_helper< quantity<Unit1,Y>,unit<Dim2,System2> >::type +operator*(const quantity<Unit1,Y>& lhs,const unit<Dim2,System2>&) { - typedef typename multiply_typeof_helper< quantity<unit<Dim1,System1>,Y>,unit<Dim2,System2> >::type type; + typedef typename multiply_typeof_helper< quantity<Unit1,Y>,unit<Dim2,System2> >::type type; return type::from_value(lhs.value()); } /// runtime quantity divided by unit -template<class System1, +template<class Unit1, class System2, - class Dim1, class Dim2, class Y> inline -typename divide_typeof_helper< quantity<unit<Dim1,System1>,Y>,unit<Dim2,System2> >::type -operator/(const quantity<unit<Dim1,System1>,Y>& lhs,const unit<Dim2,System2>&) +typename divide_typeof_helper< quantity<Unit1,Y>,unit<Dim2,System2> >::type +operator/(const quantity<Unit1,Y>& lhs,const unit<Dim2,System2>&) { - typedef typename divide_typeof_helper< quantity<unit<Dim1,System1>,Y>,unit<Dim2,System2> >::type type; + typedef typename divide_typeof_helper< quantity<Unit1,Y>,unit<Dim2,System2> >::type type; return type::from_value(lhs.value()); } @@ -837,37 +829,33 @@ } /// runtime quantity times quantity -template<class System1, - class System2, - class Dim1, - class Dim2, +template<class Unit1, + class Unit2, class X, class Y> inline -typename multiply_typeof_helper< quantity<unit<Dim1,System1>,X>,quantity<unit<Dim2,System2>,Y> >::type -operator*(const quantity<unit<Dim1,System1>,X>& lhs, - const quantity<unit<Dim2,System2>,Y>& rhs) +typename multiply_typeof_helper< quantity<Unit1,X>,quantity<Unit2,Y> >::type +operator*(const quantity<Unit1,X>& lhs, + const quantity<Unit2,Y>& rhs) { - typedef typename multiply_typeof_helper< quantity<unit<Dim1,System1>,X>, - quantity<unit<Dim2,System2>,Y> >::type type; + typedef typename multiply_typeof_helper< quantity<Unit1,X>, + quantity<Unit2,Y> >::type type; return type::from_value(lhs.value()*rhs.value()); } /// runtime quantity divided by quantity -template<class System1, - class System2, - class Dim1, - class Dim2, +template<class Unit1, + class Unit2, class X, class Y> inline -typename divide_typeof_helper< quantity<unit<Dim1,System1>,X>,quantity<unit<Dim2,System2>,Y> >::type -operator/(const quantity<unit<Dim1,System1>,X>& lhs, - const quantity<unit<Dim2,System2>,Y>& rhs) +typename divide_typeof_helper< quantity<Unit1,X>,quantity<Unit2,Y> >::type +operator/(const quantity<Unit1,X>& lhs, + const quantity<Unit2,Y>& rhs) { - typedef typename divide_typeof_helper< quantity<unit<Dim1,System1>,X>, - quantity<unit<Dim2,System2>,Y> >::type type; + typedef typename divide_typeof_helper< quantity<Unit1,X>, + quantity<Unit2,Y> >::type type; return type::from_value(lhs.value()/rhs.value()); } |
