diff options
Diffstat (limited to 'boost/units')
-rw-r--r-- | boost/units/base_units/information/bit.hpp | 7 | ||||
-rw-r--r-- | boost/units/base_units/information/byte.hpp | 6 | ||||
-rw-r--r-- | boost/units/base_units/information/hartley.hpp | 6 | ||||
-rw-r--r-- | boost/units/base_units/information/nat.hpp | 6 | ||||
-rw-r--r-- | boost/units/base_units/information/shannon.hpp | 6 | ||||
-rw-r--r-- | boost/units/detail/linear_algebra.hpp | 2 | ||||
-rw-r--r-- | boost/units/static_rational.hpp | 6 | ||||
-rw-r--r-- | boost/units/systems/information/bit.hpp | 13 | ||||
-rw-r--r-- | boost/units/systems/information/byte.hpp | 13 | ||||
-rw-r--r-- | boost/units/systems/information/hartley.hpp | 13 | ||||
-rw-r--r-- | boost/units/systems/information/nat.hpp | 13 | ||||
-rw-r--r-- | boost/units/systems/information/prefixes.hpp | 10 | ||||
-rw-r--r-- | boost/units/systems/information/shannon.hpp | 13 |
13 files changed, 65 insertions, 49 deletions
diff --git a/boost/units/base_units/information/bit.hpp b/boost/units/base_units/information/bit.hpp index d3cd5d736f..28a413ea18 100644 --- a/boost/units/base_units/information/bit.hpp +++ b/boost/units/base_units/information/bit.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_BIT_BASE_UNIT_HPP -#define BOOST_UNITS_INFORMATION_BIT_BASE_UNIT_HPP +#ifndef BOOST_UNITS_BASE_UNITS_INFORMATION_BIT_HPP_INCLUDED +#define BOOST_UNITS_BASE_UNITS_INFORMATION_BIT_HPP_INCLUDED #include <string> @@ -38,5 +38,4 @@ BOOST_TYPEOF_REGISTER_TYPE(boost::units::information::bit_base_unit) #endif - -#endif // BOOST_UNITS_INFORMATION_BIT_BASE_UNIT_HPP +#endif // BOOST_UNITS_BASE_UNITS_INFORMATION_BIT_HPP_INCLUDED diff --git a/boost/units/base_units/information/byte.hpp b/boost/units/base_units/information/byte.hpp index 61898bf38b..6cd9692d3b 100644 --- a/boost/units/base_units/information/byte.hpp +++ b/boost/units/base_units/information/byte.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNIT_SYSTEMS_INFORMATION_BYTE_HPP -#define BOOST_UNIT_SYSTEMS_INFORMATION_BYTE_HPP +#ifndef BOOST_UNITS_BASE_UNITS_INFORMATION_BYTE_HPP_INCLUDED +#define BOOST_UNITS_BASE_UNITS_INFORMATION_BYTE_HPP_INCLUDED #include <boost/units/scaled_base_unit.hpp> #include <boost/units/static_rational.hpp> @@ -33,4 +33,4 @@ struct base_unit_info<information::byte_base_unit> { } // namespace units } // namespace boost -#endif // BOOST_UNIT_SYSTEMS_INFORMATION_BYTE_HPP +#endif // BOOST_UNITS_BASE_UNITS_INFORMATION_BYTE_HPP_INCLUDED diff --git a/boost/units/base_units/information/hartley.hpp b/boost/units/base_units/information/hartley.hpp index 8184b2473d..c3df2d287b 100644 --- a/boost/units/base_units/information/hartley.hpp +++ b/boost/units/base_units/information/hartley.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNIT_SYSTEMS_INFORMATION_HARTLEY_HPP -#define BOOST_UNIT_SYSTEMS_INFORMATION_HARTLEY_HPP +#ifndef BOOST_UNITS_BASE_UNITS_INFORMATION_HARTLEY_HPP_INCLUDED +#define BOOST_UNITS_BASE_UNITS_INFORMATION_HARTLEY_HPP_INCLUDED #include <boost/units/conversion.hpp> #include <boost/units/base_units/information/bit.hpp> @@ -27,4 +27,4 @@ BOOST_TYPEOF_REGISTER_TYPE(boost::units::information::hartley_base_unit) #endif -#endif // BOOST_UNIT_SYSTEMS_INFORMATION_HARTLEY_HPP +#endif // BOOST_UNITS_BASE_UNITS_INFORMATION_HARTLEY_HPP_INCLUDED diff --git a/boost/units/base_units/information/nat.hpp b/boost/units/base_units/information/nat.hpp index 24c1d1067f..a307215193 100644 --- a/boost/units/base_units/information/nat.hpp +++ b/boost/units/base_units/information/nat.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNIT_SYSTEMS_INFORMATION_NAT_HPP -#define BOOST_UNIT_SYSTEMS_INFORMATION_NAT_HPP +#ifndef BOOST_UNITS_BASE_UNITS_INFORMATION_NAT_HPP_INCLUDED +#define BOOST_UNITS_BASE_UNITS_INFORMATION_NAT_HPP_INCLUDED #include <boost/units/conversion.hpp> #include <boost/units/base_units/information/bit.hpp> @@ -27,4 +27,4 @@ BOOST_TYPEOF_REGISTER_TYPE(boost::units::information::nat_base_unit) #endif -#endif // BOOST_UNIT_SYSTEMS_INFORMATION_NAT_HPP +#endif // BOOST_UNITS_BASE_UNITS_INFORMATION_NAT_HPP_INCLUDED diff --git a/boost/units/base_units/information/shannon.hpp b/boost/units/base_units/information/shannon.hpp index f76efae844..b52bf7afb9 100644 --- a/boost/units/base_units/information/shannon.hpp +++ b/boost/units/base_units/information/shannon.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNIT_SYSTEMS_INFORMATION_SHANNON_HPP -#define BOOST_UNIT_SYSTEMS_INFORMATION_SHANNON_HPP +#ifndef BOOST_UNITS_BASE_UNITS_INFORMATION_SHANNON_HPP_INCLUDED +#define BOOST_UNITS_BASE_UNITS_INFORMATION_SHANNON_HPP_INCLUDED #include <boost/units/scaled_base_unit.hpp> #include <boost/units/static_rational.hpp> @@ -33,4 +33,4 @@ struct base_unit_info<information::shannon_base_unit> { } // namespace units } // namespace boost -#endif // BOOST_UNIT_SYSTEMS_INFORMATION_SHANNON_HPP +#endif // BOOST_UNITS_BASE_UNITS_INFORMATION_SHANNON_HPP_INCLUDED diff --git a/boost/units/detail/linear_algebra.hpp b/boost/units/detail/linear_algebra.hpp index 20964a9edd..96b27a2532 100644 --- a/boost/units/detail/linear_algebra.hpp +++ b/boost/units/detail/linear_algebra.hpp @@ -246,7 +246,7 @@ struct determine_extra_equations { typedef typename RowsBegin::item top_row; typedef typename determine_extra_equations_skip_zeros_impl< top_row::item::Numerator == 0, - RowsBegin::item::size::value == 1 + RowsBegin::size::value == 1 >::template apply< RowsBegin, RowsBegin::size::value, diff --git a/boost/units/static_rational.hpp b/boost/units/static_rational.hpp index 5263e75d8b..1296f06c86 100644 --- a/boost/units/static_rational.hpp +++ b/boost/units/static_rational.hpp @@ -11,7 +11,7 @@ #ifndef BOOST_UNITS_STATIC_RATIONAL_HPP #define BOOST_UNITS_STATIC_RATIONAL_HPP -#include <boost/math/common_factor_ct.hpp> +#include <boost/integer/common_factor_ct.hpp> #include <boost/mpl/less.hpp> #include <boost/mpl/arithmetic.hpp> @@ -83,7 +83,7 @@ class static_rational typedef boost::mpl::integral_c<integer_type, D> D_type; typedef typename make_integral_c< - (::boost::math::static_gcd< + (::boost::integer::static_gcd< ::boost::units::static_abs<N>::value, ::boost::units::static_abs<D>::value >::value)>::type gcd_type; @@ -133,7 +133,7 @@ class static_rational /// greatest common divisor of N and D // need cast to signed because static_gcd returns unsigned long static const integer_type den = - static_cast<integer_type>(boost::math::static_gcd<nabs,dabs>::value) * ((D < 0) ? -1 : 1); + static_cast<integer_type>(boost::integer::static_gcd<nabs,dabs>::value) * ((D < 0) ? -1 : 1); public: // for mpl arithmetic support diff --git a/boost/units/systems/information/bit.hpp b/boost/units/systems/information/bit.hpp index 5d97118034..bd8f34bb8a 100644 --- a/boost/units/systems/information/bit.hpp +++ b/boost/units/systems/information/bit.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_BIT_HPP -#define BOOST_UNITS_INFORMATION_BIT_HPP +#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_BIT_HPP_INCLUDED +#define BOOST_UNITS_SYSTEMS_INFORMATION_BIT_HPP_INCLUDED #include <boost/units/systems/information/byte.hpp> #include <boost/units/base_units/information/bit.hpp> @@ -20,11 +20,14 @@ namespace information { namespace hu { namespace bit { typedef unit<information_dimension, make_system<bit_base_unit>::type> info; -}} +} // namespace bit +} // namespace hu BOOST_UNITS_STATIC_CONSTANT(bit, hu::bit::info); BOOST_UNITS_STATIC_CONSTANT(bits, hu::bit::info); -}}} +} // namespace information +} // namespace units +} // namespace boost -#endif +#endif // BOOST_UNITS_SYSTEMS_INFORMATION_BIT_HPP_INCLUDED diff --git a/boost/units/systems/information/byte.hpp b/boost/units/systems/information/byte.hpp index ac80c41093..8ea743cd9d 100644 --- a/boost/units/systems/information/byte.hpp +++ b/boost/units/systems/information/byte.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_BYTE_HPP -#define BOOST_UNITS_INFORMATION_BYTE_HPP +#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_BYTE_HPP_INCLUDED +#define BOOST_UNITS_SYSTEMS_INFORMATION_BYTE_HPP_INCLUDED #include <boost/units/make_system.hpp> #include <boost/units/unit.hpp> @@ -27,7 +27,8 @@ typedef unit<dimensionless_type, system> dimensionless; namespace hu { namespace byte { typedef unit<information_dimension, system> info; -}} +} // namespace bit +} // namespace hu BOOST_UNITS_STATIC_CONSTANT(byte, hu::byte::info); BOOST_UNITS_STATIC_CONSTANT(bytes, hu::byte::info); @@ -37,6 +38,8 @@ BOOST_UNITS_STATIC_CONSTANT(bytes, hu::byte::info); // must be explicitly referred to typedef hu::byte::info info; -}}} +} // namespace information +} // namespace units +} // namespace boost -#endif +#endif // BOOST_UNITS_SYSTEMS_INFORMATION_BYTE_HPP_INCLUDED diff --git a/boost/units/systems/information/hartley.hpp b/boost/units/systems/information/hartley.hpp index 5701614511..d0b25b7bce 100644 --- a/boost/units/systems/information/hartley.hpp +++ b/boost/units/systems/information/hartley.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_HARTLEY_HPP -#define BOOST_UNITS_INFORMATION_HARTLEY_HPP +#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_HARTLEY_HPP_INCLUDED +#define BOOST_UNITS_SYSTEMS_INFORMATION_HARTLEY_HPP_INCLUDED #include <boost/units/systems/information/byte.hpp> #include <boost/units/base_units/information/hartley.hpp> @@ -20,11 +20,14 @@ namespace information { namespace hu { namespace hartley { typedef unit<information_dimension, make_system<hartley_base_unit>::type> info; -}} +} // namespace bit +} // namespace hu BOOST_UNITS_STATIC_CONSTANT(hartley, hu::hartley::info); BOOST_UNITS_STATIC_CONSTANT(hartleys, hu::hartley::info); -}}} +} // namespace information +} // namespace units +} // namespace boost -#endif +#endif // BOOST_UNITS_SYSTEMS_INFORMATION_HARTLEY_HPP_INCLUDED diff --git a/boost/units/systems/information/nat.hpp b/boost/units/systems/information/nat.hpp index f4430d8ce4..eb24178940 100644 --- a/boost/units/systems/information/nat.hpp +++ b/boost/units/systems/information/nat.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_NAT_HPP -#define BOOST_UNITS_INFORMATION_NAT_HPP +#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_NAT_HPP_INCLUDED +#define BOOST_UNITS_SYSTEMS_INFORMATION_NAT_HPP_INCLUDED #include <boost/units/systems/information/byte.hpp> #include <boost/units/base_units/information/nat.hpp> @@ -20,11 +20,14 @@ namespace information { namespace hu { namespace nat { typedef unit<information_dimension, make_system<nat_base_unit>::type> info; -}} +} // namespace bit +} // namespace hu BOOST_UNITS_STATIC_CONSTANT(nat, hu::nat::info); BOOST_UNITS_STATIC_CONSTANT(nats, hu::nat::info); -}}} +} // namespace information +} // namespace units +} // namespace boost -#endif +#endif // BOOST_UNITS_SYSTEMS_INFORMATION_NAT_HPP_INCLUDED diff --git a/boost/units/systems/information/prefixes.hpp b/boost/units/systems/information/prefixes.hpp index 52b13618bf..1c092f9ae4 100644 --- a/boost/units/systems/information/prefixes.hpp +++ b/boost/units/systems/information/prefixes.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_PREFIXES_HPP -#define BOOST_UNITS_INFORMATION_PREFIXES_HPP +#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_PREFIXES_HPP_INCLUDED +#define BOOST_UNITS_SYSTEMS_INFORMATION_PREFIXES_HPP_INCLUDED #include <boost/units/make_scaled_unit.hpp> #include <boost/units/static_rational.hpp> @@ -36,8 +36,10 @@ BOOST_UNITS_INFOSYS_PREFIX(60, exbi); BOOST_UNITS_INFOSYS_PREFIX(70, zebi); BOOST_UNITS_INFOSYS_PREFIX(80, yobi); -}}} +} // namespace information +} // namespace units +} // namespace boost #undef BOOST_UNITS_INFOSYS_PREFIX -#endif +#endif // BOOST_UNITS_SYSTEMS_INFORMATION_PREFIXES_HPP_INCLUDED diff --git a/boost/units/systems/information/shannon.hpp b/boost/units/systems/information/shannon.hpp index a2488fbaf3..e3069c953a 100644 --- a/boost/units/systems/information/shannon.hpp +++ b/boost/units/systems/information/shannon.hpp @@ -7,8 +7,8 @@ // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) -#ifndef BOOST_UNITS_INFORMATION_SHANNON_HPP -#define BOOST_UNITS_INFORMATION_SHANNON_HPP +#ifndef BOOST_UNITS_SYSTEMS_INFORMATION_SHANNON_HPP_INCLUDED +#define BOOST_UNITS_SYSTEMS_INFORMATION_SHANNON_HPP_INCLUDED #include <boost/units/systems/information/byte.hpp> #include <boost/units/base_units/information/shannon.hpp> @@ -20,11 +20,14 @@ namespace information { namespace hu { namespace shannon { typedef unit<information_dimension, make_system<shannon_base_unit>::type> info; -}} +} // namespace bit +} // namespace hu BOOST_UNITS_STATIC_CONSTANT(shannon, hu::shannon::info); BOOST_UNITS_STATIC_CONSTANT(shannons, hu::shannon::info); -}}} +} // namespace information +} // namespace units +} // namespace boost -#endif +#endif // BOOST_UNITS_SYSTEMS_INFORMATION_SHANNON_HPP_INCLUDED |