|
From: Matthias S. <mat...@us...> - 2007-04-18 22:25:37
|
Update of /cvsroot/boost-sandbox/boost-sandbox/boost/units In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31596/boost/units Modified Files: base_dimension.hpp Log Message: minor Index: base_dimension.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/base_dimension.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- base_dimension.hpp 15 Apr 2007 06:58:05 -0000 1.8 +++ base_dimension.hpp 18 Apr 2007 22:25:37 -0000 1.9 @@ -17,12 +17,15 @@ #include <boost/units/static_rational.hpp> #include <boost/units/units_fwd.hpp> -#include <boost/units/detail/base_dimension_impl.hpp> +#include <boost/units/detail/prevent_ordinal_redefinition_impl.hpp> namespace boost { namespace units { +/// INTERNAL ONLY +template<class T, long N> struct base_dimension_pair { }; + /// Defines a base dimension. To define a dimension you need to provide /// the derived class (CRTP) and a unique integer. /// struct my_dimension : boost::units::base_dimension<my_dimension, 1> {}; @@ -31,8 +34,8 @@ template<class Derived, long N, class = typename detail::ordinal_has_already_been_defined< - sizeof(boost_units_prevent_redefinition(units::long_<N>())) == sizeof(detail::yes) && - sizeof(boost_units_prevent_redefinition(units::base_dimension_pair<Derived, N>())) != sizeof(detail::yes) + sizeof(prevent_ordinal_redefinition(units::long_<N>())) == sizeof(detail::yes) && + sizeof(prevent_ordinal_redefinition(units::base_dimension_pair<Derived, N>())) != sizeof(detail::yes) >::type> class base_dimension : public mpl::long_<N> @@ -46,13 +49,13 @@ /// Register this ordinal /// INTERNAL ONLY friend detail::yes - boost_units_prevent_redefinition(const units::long_<N>&) + prevent_ordinal_redefinition(const units::long_<N>&) { return(detail::yes()); } /// But make sure we can identify the current instantiation! /// INTERNAL ONLY friend detail::yes - boost_units_prevent_redefinition(const units::base_dimension_pair<Derived, N>&) + prevent_ordinal_redefinition(const units::base_dimension_pair<Derived, N>&) { return(detail::yes()); } }; |