feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

refactor: More stream-specific implementation moved to quantity_io.h

Browse Source
This commit is contained in:
Mateusz Pusz
2020-12-28 15:46:00 +01:00
parent 283d8f063e
commit 55e5cac33f
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/include/units/bits/unit_text.h
View File

@@ -26,7 +26,6 @@
#include <units/bits/external/text_tools.h> #include <units/bits/external/text_tools.h>
#include <units/prefix.h> #include <units/prefix.h>
#include <units/derived_dimension.h> #include <units/derived_dimension.h>
#include <sstream>
namespace units::detail { namespace units::detail {
@@ -178,14 +177,4 @@ constexpr auto unit_text()
} }
} }
template<typename CharT, class Traits, typename D, typename U, typename Rep>
void to_stream(std::basic_ostream<CharT, Traits>& os, const quantity<D, U, Rep>& q)
{
os << q.count();
constexpr auto symbol = detail::unit_text<D, U>();
if constexpr (symbol.standard().size()) {
os << " " << symbol.standard();
}
}
} // namespace units::detail } // namespace units::detail

1
src/include/units/quantity.h
View File

@@ -30,7 +30,6 @@
#include <units/generic/dimensionless.h> #include <units/generic/dimensionless.h>
#include <units/quantity_cast.h> #include <units/quantity_cast.h>
#include <compare> #include <compare>
#include <ostream>
namespace units { namespace units {

15
src/include/units/quantity_io.h
View File

@@ -25,9 +25,24 @@
#include <units/bits/external/fixed_string_io.h> #include <units/bits/external/fixed_string_io.h>
#include <units/quantity.h> #include <units/quantity.h>
#include <sstream>
namespace units { namespace units {
namespace detail {
template<typename CharT, class Traits, typename D, typename U, typename Rep>
void to_stream(std::basic_ostream<CharT, Traits>& os, const quantity<D, U, Rep>& q)
{
os << q.count();
constexpr auto symbol = detail::unit_text<D, U>();
if constexpr (symbol.standard().size()) {
os << " " << symbol.standard();
}
}
} // namespace detail
template<typename CharT, typename Traits, typename D, typename U, typename Rep> template<typename CharT, typename Traits, typename D, typename U, typename Rep>
std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity<D, U, Rep>& q) std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity<D, U, Rep>& q)
requires requires { os << q.count(); } requires requires { os << q.count(); }