|
From: Matthias S. <mat...@us...> - 2007-03-29 22:39:48
|
Update of /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19900/conversions Modified Files: conversion_headers.hpp convert_degrees_to_gradians.hpp convert_degrees_to_radians.hpp convert_gradians_to_degrees.hpp convert_gradians_to_radians.hpp convert_radians_to_degrees.hpp convert_radians_to_gradians.hpp Log Message: angle conversions using trivial_inverse_conversion Index: conversion_headers.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/conversion_headers.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- conversion_headers.hpp 29 Mar 2007 19:10:39 -0000 1.2 +++ conversion_headers.hpp 29 Mar 2007 22:39:47 -0000 1.3 @@ -16,12 +16,17 @@ #include <boost/units/systems/conversions/convert_si_to_cgs.hpp> #endif -//#if defined(BOOST_UNITS_SI_BASE_HPP) && defined(BOOST_UNITS_TRIG_HPP) -// #include <boost/units/systems/conversions/convert_trig_to_si.hpp> -// #include <boost/units/systems/conversions/convert_si_to_trig.hpp> -//#endif -// -//#if defined(BOOST_UNITS_TRIG_HPP) && defined(BOOST_UNITS_CGS_BASE_HPP) -// #include <boost/units/systems/conversions/convert_cgs_to_trig.hpp> -// #include <boost/units/systems/conversions/convert_trig_to_cgs.hpp> -//#endif +#if defined(BOOST_UNITS_DEGREES_HPP) && defined(BOOST_UNITS_GRADIANS_HPP) + #include <boost/units/systems/conversions/convert_degrees_to_gradians.hpp> + #include <boost/units/systems/conversions/convert_gradians_to_degrees.hpp> +#endif + +#if defined(BOOST_UNITS_DEGREES_HPP) && defined(BOOST_UNITS_RADIANS_HPP) + #include <boost/units/systems/conversions/convert_degrees_to_radians.hpp> + #include <boost/units/systems/conversions/convert_radians_to_degrees.hpp> +#endif + +#if defined(BOOST_UNITS_GRADIANS_HPP) && defined(BOOST_UNITS_RADIANS_HPP) + #include <boost/units/systems/conversions/convert_gradians_to_radians.hpp> + #include <boost/units/systems/conversions/convert_radians_to_gradians.hpp> +#endif Index: convert_gradians_to_radians.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/convert_gradians_to_radians.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convert_gradians_to_radians.hpp 29 Mar 2007 20:24:05 -0000 1.1 +++ convert_gradians_to_radians.hpp 29 Mar 2007 22:39:47 -0000 1.2 @@ -11,10 +11,6 @@ #ifndef BOOST_UNITS_CONVERT_GRADIANS_TO_RADIANS_HPP #define BOOST_UNITS_CONVERT_GRADIANS_TO_RADIANS_HPP -#include <boost/units/systems/angles/convert_radians_to_gradians.hpp> - -} // namespace units - -} // namespace boost +#include <boost/units/systems/conversions/convert_radians_to_gradians.hpp> #endif // BOOST_UNITS_CONVERT_GRADIANS_TO_RADIANS_HPP Index: convert_gradians_to_degrees.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/convert_gradians_to_degrees.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convert_gradians_to_degrees.hpp 29 Mar 2007 20:24:05 -0000 1.1 +++ convert_gradians_to_degrees.hpp 29 Mar 2007 22:39:47 -0000 1.2 @@ -11,10 +11,6 @@ #ifndef BOOST_UNITS_CONVERT_GRADIANS_TO_DEGREES_HPP #define BOOST_UNITS_CONVERT_GRADIANS_TO_DEGREES_HPP -#include <boost/units/systems/angles/convert_degrees_to_gradians.hpp> - -} // namespace units - -} // namespace boost +#include <boost/units/systems/conversions/convert_degrees_to_gradians.hpp> #endif // BOOST_UNITS_CONVERT_GRADIANS_TO_DEGREES_HPP Index: convert_radians_to_gradians.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/convert_radians_to_gradians.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convert_radians_to_gradians.hpp 29 Mar 2007 20:24:05 -0000 1.1 +++ convert_radians_to_gradians.hpp 29 Mar 2007 22:39:47 -0000 1.2 @@ -22,10 +22,11 @@ // conversions from radians to gradians template<> -struct base_unit_converter<angle_tag,angle::radian_system_tag,angle::gradian_system_tag> +struct base_unit_converter<angle_tag,radian_ns::system_tag,gradian_ns::system_tag> : #ifdef BOOST_UNITS_ENABLE_IMPLICIT_UNIT_CONVERSION - : public implicitly_convertible, trivial_inverse_conversion + public implicitly_convertible, #endif + public trivial_inverse_conversion { typedef double type; static type value() { return 200.0/3.1415926535897932385; } Index: convert_radians_to_degrees.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/convert_radians_to_degrees.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convert_radians_to_degrees.hpp 29 Mar 2007 20:24:05 -0000 1.1 +++ convert_radians_to_degrees.hpp 29 Mar 2007 22:39:47 -0000 1.2 @@ -22,10 +22,11 @@ // conversions from radians to degrees template<> -struct base_unit_converter<angle_tag,angle::radian_system_tag,angle::degree_system_tag> +struct base_unit_converter<angle_tag,radian_ns::system_tag,degree_ns::system_tag> : #ifdef BOOST_UNITS_ENABLE_IMPLICIT_UNIT_CONVERSION - : public implicitly_convertible, trivial_inverse_conversion + public implicitly_convertible, #endif + public trivial_inverse_conversion { typedef double type; static type value() { return 180.0/3.1415926535897932385; } Index: convert_degrees_to_gradians.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/convert_degrees_to_gradians.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convert_degrees_to_gradians.hpp 29 Mar 2007 20:24:05 -0000 1.1 +++ convert_degrees_to_gradians.hpp 29 Mar 2007 22:39:47 -0000 1.2 @@ -22,10 +22,11 @@ // conversions from degrees to gradians template<> -struct base_unit_converter<angle_tag,angle::degree_system_tag,angle::gradian_system_tag> +struct base_unit_converter<angle_tag,degree_ns::system_tag,gradian_ns::system_tag> : #ifdef BOOST_UNITS_ENABLE_IMPLICIT_UNIT_CONVERSION - : public implicitly_convertible, trivial_inverse_conversion + public implicitly_convertible, #endif + public trivial_inverse_conversion { typedef double type; static type value() { return 200.0/180.0; } Index: convert_degrees_to_radians.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/units/systems/conversions/convert_degrees_to_radians.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- convert_degrees_to_radians.hpp 29 Mar 2007 20:24:05 -0000 1.1 +++ convert_degrees_to_radians.hpp 29 Mar 2007 22:39:47 -0000 1.2 @@ -11,10 +11,6 @@ #ifndef BOOST_UNITS_CONVERT_DEGREES_TO_RADIANS_HPP #define BOOST_UNITS_CONVERT_DEGREES_TO_RADIANS_HPP -#include <boost/units/systems/angles/convert_degrees_to_radians.hpp> - -} // namespace units - -} // namespace boost +#include <boost/units/systems/conversions/convert_radians_to_degrees.hpp> #endif // BOOST_UNITS_CONVERT_DEGREES_TO_RADIANS_HPP |