mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-04 20:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Printing of a space separator for unitless quantites disabled

Browse Source
This commit is contained in:
Mateusz Pusz
2020-02-24 20:01:57 +01:00
parent d53a5337f3
commit 1f63fdb945
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,12 +116,6 @@ namespace units {
return format_to(out, treat_as_floating_point<Rep> ? "{:" + sign_text + "g}" : "{:" + sign_text + "}", val); return format_to(out, treat_as_floating_point<Rep> ? "{:" + sign_text + "g}" : "{:" + sign_text + "}", val);
} }
template<typename Dimension, typename Unit, typename OutputIt>
inline static OutputIt format_units_quantity_unit(OutputIt out)
{
return format_to(out, "{}", unit_text<Dimension, Unit>().c_str());
}
template<typename OutputIt, typename Dimension, typename Unit, typename Rep> template<typename OutputIt, typename Dimension, typename Unit, typename Rep>
struct units_formatter { struct units_formatter {
OutputIt out; OutputIt out;
@@ -147,7 +141,7 @@ namespace units {
void on_quantity_unit() void on_quantity_unit()
{ {
out = format_units_quantity_unit<Dimension, Unit>(out); format_to(out, "{}", unit_text<Dimension, Unit>().c_str());
} }
}; };
@@ -306,10 +300,13 @@ public:
// deal with quantity content // deal with quantity content
if(begin == end || *begin == '}') { if(begin == end || *begin == '}') {
// default format should print value followed by the unit separeted with 1 space // default format should print value followed by the unit separated with 1 space
out = units::detail::format_units_quantity_value(out, q.count(), specs.sign, precision); out = units::detail::format_units_quantity_value(out, q.count(), specs.sign, precision);
constexpr auto symbol = units::detail::unit_text<Dimension, Unit>();
if(symbol.size()) {
*out++ = CharT(' '); *out++ = CharT(' ');
units::detail::format_units_quantity_unit<Dimension, Unit>(out); format_to(out, "{}", symbol.c_str());
}
} }
else { else {
// user provided format // user provided format

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

@@ -308,7 +308,12 @@ public:
template<class CharT, class Traits> template<class CharT, class Traits>
friend std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity& q) friend std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const quantity& q)
{ {
return os << q.count() << " " << detail::unit_text<quantity::dimension, quantity::unit>(); constexpr auto symbol = detail::unit_text<quantity::dimension, quantity::unit>();
os << q.count();
if (symbol.size()) {
os << " " << symbol;
}
return os;
} }
}; };