nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

colour: use numeric_iterator and make_infix for ostream

Browse Source
This commit is contained in:
Danny Robson 2017-10-10 16:50:15 +11:00
parent ba2eb48d63
commit c0e8a947d0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
colour.cpp
View File

@ -384,12 +384,9 @@ namespace json::tree {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
template <size_t S, typename T> template <size_t S, typename T>
std::ostream& std::ostream&
util::operator<< (std::ostream &os, util::colour<S,T> c) { util::operator<< (std::ostream &os, util::colour<S,T> c)
os << "colour("; {
for (size_t i = 0; i < S - 1; ++i) return os << "[ " << util::make_infix (util::numeric_view (c), ", ") << ']';
os << +c[i] << ", ";
os << +c[S-1] << ")";
return os;
} }
@ -438,8 +435,10 @@ util::operator>> (std::istream &is, util::colour<S,T> &c)
return is; return is;
} }
//-----------------------------------------------------------------------------
template std::istream& util::operator>> (std::istream&, util::colour<3,uint8_t>&); template std::istream& util::operator>> (std::istream&, util::colour<3,uint8_t>&);
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define INSTANTIATE_S_T(S,T) \ #define INSTANTIATE_S_T(S,T) \
template \ template \