roland/xo-indentlog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge upstream

Browse source
This commit is contained in:
Roland Conybeare 2025-05-08 20:06:28 -05:00
commit d43c4af0b4
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/xo/indentlog/print/function.hpp
View file

@ -147,7 +147,12 @@ namespace xo {
/* clang footnote like [CharT = char] instead of [with CharT = char] */
std::size_t p = s.find(" [");
#else
# if (__GNUC__ > 13) || ((__GNUC__ == 13) && (__GNUC_MINOR__ >= 3))
/* gcc footnote like [CharT = char] instead of [with CharT = char] starting w/ gcc 13.3 (approximately ?)*/
std::size_t p = s.find(" [");
# else
std::size_t p = s.find(" [with ");
# endif
#endif
return s.substr(0, p);

2
include/xo/indentlog/timeutil/timeutil.hpp
View file

@ -259,7 +259,7 @@ namespace xo {
auto [t0_tm, t0_usec] = utc_split_tm(t0);
/* no std::format in clang11 afaict */
char usec_buf[8];
char usec_buf[15];
snprintf(usec_buf, sizeof(usec_buf), "%06d", t0_usec);