[Boost-sandbox-cvs] boost-sandbox/boost/units base_dimension.hpp, 1.10, 1.11

[Steven W. <ste...@us...>]

Update of /cvsroot/boost-sandbox/boost-sandbox/boost/units
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12750/boost-sandbox/boost/units

Modified Files:
	base_dimension.hpp 
Log Message:
Minor name changes, made base_unit and base_dimension independent

Index: base_dimension.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/base_dimension.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- base_dimension.hpp	29 Apr 2007 00:48:15 -0000	1.10
+++ base_dimension.hpp	29 Apr 2007 02:36:22 -0000	1.11
@@ -23,6 +23,11 @@
 
 namespace units {
 
+/// This must be in namespace boost::units so that ADL
+/// will work with friend functions defined inline.
+/// INTERNAL ONLY
+template<long N> struct base_dimension_ordinal { };
+
 /// INTERNAL ONLY
 template<class T, long N> struct base_dimension_pair { };
 
@@ -34,8 +39,8 @@
 template<class Derived,
          long N,
          class = typename detail::ordinal_has_already_been_defined<
-             sizeof(prevent_ordinal_redefinition(units::long_<N>())) == sizeof(detail::yes) &&
-             sizeof(prevent_ordinal_redefinition(units::base_dimension_pair<Derived, N>())) != sizeof(detail::yes)
+             sizeof(boost_units_is_registered(units::base_dimension_ordinal<N>())) == sizeof(detail::yes) &&
+             sizeof(boost_units_is_registered(units::base_dimension_pair<Derived, N>())) != sizeof(detail::yes)
          >::type>
 class base_dimension : 
     public mpl::long_<N> 
@@ -49,13 +54,13 @@
         /// Register this ordinal
         /// INTERNAL ONLY
         friend detail::yes 
-        prevent_ordinal_redefinition(const units::long_<N>&) 
+        boost_units_is_registered(const units::base_dimension_ordinal<N>&) 
         { return(detail::yes()); }
         
         /// But make sure we can identify the current instantiation!
         /// INTERNAL ONLY
         friend detail::yes 
-        prevent_ordinal_redefinition(const units::base_dimension_pair<Derived, N>&) 
+        boost_units_is_registered(const units::base_dimension_pair<Derived, N>&) 
         { return(detail::yes()); }
 };