Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-09-29 01:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of ranges and to_hex in the same compile unit

Browse Source 
When trying to use spdlog/fmt/bin_to_hex.h in the same compile unit as spdlog/fmt/bundled/ranges.h you got a compile error because there was a multiple definitions for iterable classes. This fix renames the begin() and end() getters in dump_info into getBegin()/getEnd() in order to avoid this collision.

Added an example of ranges in example.cpp to show that it actually works (an to_hex example was already there)
This commit is contained in:
Roocks Patrick (MTN PTT / External)
2021-12-01 15:37:48 +01:00
parent cabbe65be4
commit d93cea97ec
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/spdlog/fmt/bin_to_hex.h
View File

@@ -39,11 +39,12 @@ public:
, size_per_line_(size_per_line)
{}
It begin() const
// do not use begin() and end() to avoid collision with fmt/ranges
It getBegin() const
{
return begin_;
}
It end() const
It getEnd() const
{
return end_;
}
@@ -144,14 +145,14 @@ struct formatter<spdlog::details::dump_info<T>, char>
#endif
int size_per_line = static_cast<int>(the_range.size_per_line());
auto start_of_line = the_range.begin();
for (auto i = the_range.begin(); i != the_range.end(); i++)
auto start_of_line = the_range.getBegin();
for (auto i = the_range.getBegin(); i != the_range.getEnd(); i++)
{
auto ch = static_cast<unsigned char>(*i);
if (put_newlines && (i == the_range.begin() || i - start_of_line >= size_per_line))
if (put_newlines && (i == the_range.getBegin() || i - start_of_line >= size_per_line))
{
if (show_ascii && i != the_range.begin())
if (show_ascii && i != the_range.getBegin())
{
*inserter++ = delimiter;
*inserter++ = delimiter;
@@ -162,7 +163,7 @@ struct formatter<spdlog::details::dump_info<T>, char>
}
}
put_newline(inserter, static_cast<size_t>(i - the_range.begin()));
put_newline(inserter, static_cast<size_t>(i - the_range.getBegin()));
// put first byte without delimiter in front of it
*inserter++ = hex_chars[(ch >> 4) & 0x0f];
@@ -181,9 +182,9 @@ struct formatter<spdlog::details::dump_info<T>, char>
}
if (show_ascii) // add ascii to last line
{
if (the_range.end() - the_range.begin() > size_per_line)
if (the_range.getEnd() - the_range.getBegin() > size_per_line)
{
auto blank_num = size_per_line - (the_range.end() - start_of_line);
auto blank_num = size_per_line - (the_range.getEnd() - start_of_line);
while (blank_num-- > 0)
{
*inserter++ = delimiter;
@@ -196,7 +197,7 @@ struct formatter<spdlog::details::dump_info<T>, char>
}
*inserter++ = delimiter;
*inserter++ = delimiter;
for (auto j = start_of_line; j != the_range.end(); j++)
for (auto j = start_of_line; j != the_range.getEnd(); j++)
{
auto pc = static_cast<unsigned char>(*j);
*inserter++ = std::isprint(pc) ? static_cast<char>(*j) : '.';