From 07237a18beec303d160775afa7e8b2f4c5390a4f Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 2 Sep 2020 17:10:10 +0300 Subject: [PATCH] Fix Logger const-correctness. GitOrigin-RevId: 437ed337638a9841f7695fd77b89191f1b36c584 --- tdnet/td/net/SslStream.cpp | 2 +- tdutils/td/utils/format.h | 4 ++-- tdutils/td/utils/logging.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tdnet/td/net/SslStream.cpp b/tdnet/td/net/SslStream.cpp index 92d68e363..64f3af931 100644 --- a/tdnet/td/net/SslStream.cpp +++ b/tdnet/td/net/SslStream.cpp @@ -124,7 +124,7 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) { int err = X509_STORE_CTX_get_error(ctx); auto warning = PSTRING() << "verify error:num=" << err << ":" << X509_verify_cert_error_string(err) - << ":depth=" << X509_STORE_CTX_get_error_depth(ctx) << ":" << buf; + << ":depth=" << X509_STORE_CTX_get_error_depth(ctx) << ":" << Slice(buf, std::strlen(buf)); double now = Time::now(); static std::mutex warning_mutex; diff --git a/tdutils/td/utils/format.h b/tdutils/td/utils/format.h index f6bbc4063..a3b5b3a46 100644 --- a/tdutils/td/utils/format.h +++ b/tdutils/td/utils/format.h @@ -174,7 +174,7 @@ inline StringBuilder &operator<<(StringBuilder &logger, Time t) { while (i + 1 < durations_n && t.seconds_ > 10 * durations[i + 1].value) { i++; } - logger << StringBuilder::FixedDouble(t.seconds_ / durations[i].value, 1) << durations[i].name; + logger << StringBuilder::FixedDouble(t.seconds_ / durations[i].value, 1) << Slice(durations[i].name); return logger; } @@ -200,7 +200,7 @@ inline StringBuilder &operator<<(StringBuilder &logger, Size t) { while (i + 1 < sizes_n && t.size_ > 10 * sizes[i + 1].value) { i++; } - logger << t.size_ / sizes[i].value << sizes[i].name; + logger << t.size_ / sizes[i].value << Slice(sizes[i].name); return logger; } diff --git a/tdutils/td/utils/logging.h b/tdutils/td/utils/logging.h index 94a20c13e..07d37c384 100644 --- a/tdutils/td/utils/logging.h +++ b/tdutils/td/utils/logging.h @@ -251,7 +251,7 @@ class Logger { Logger(LogInterface &log, const LogOptions &options, int log_level, Slice file_name, int line_num, Slice comment); template - Logger &operator<<(const T &other) { + Logger &operator<<(T &&other) { sb_ << other; return *this; }