From 97bb74157f14267c43f6b0c44eda19e7ed6336e1 Mon Sep 17 00:00:00 2001 From: Wolfgang Hess Date: Thu, 26 Jan 2017 13:37:02 +0100 Subject: [PATCH] Remove redundant "virtual". (#191) --- cartographer/common/histogram.cc | 5 +++-- cartographer/io/file_writer.h | 2 +- cartographer/sensor/ordered_multi_queue.cc | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cartographer/common/histogram.cc b/cartographer/common/histogram.cc index 56c4287..4ee6d6f 100644 --- a/cartographer/common/histogram.cc +++ b/cartographer/common/histogram.cc @@ -37,8 +37,9 @@ string Histogram::ToString(const int buckets) const { const float max = *std::max_element(values_.begin(), values_.end()); const float mean = std::accumulate(values_.begin(), values_.end(), 0.f) / values_.size(); - string result = "Count: " + std::to_string(values_.size()) + " Min: " + - std::to_string(min) + " Max: " + std::to_string(max) + + string result = "Count: " + std::to_string(values_.size()) + + " Min: " + std::to_string(min) + + " Max: " + std::to_string(max) + " Mean: " + std::to_string(mean); if (min == max) { return result; diff --git a/cartographer/io/file_writer.h b/cartographer/io/file_writer.h index e542201..1effdf1 100644 --- a/cartographer/io/file_writer.h +++ b/cartographer/io/file_writer.h @@ -47,7 +47,7 @@ class FileWriter { // An Implementation of file using std::ofstream. class StreamFileWriter : public FileWriter { public: - virtual ~StreamFileWriter() override; + ~StreamFileWriter() override; StreamFileWriter(const string& filename); diff --git a/cartographer/sensor/ordered_multi_queue.cc b/cartographer/sensor/ordered_multi_queue.cc index 58c2d19..84258ce 100644 --- a/cartographer/sensor/ordered_multi_queue.cc +++ b/cartographer/sensor/ordered_multi_queue.cc @@ -64,8 +64,8 @@ void OrderedMultiQueue::Add(const QueueKey& queue_key, std::unique_ptr data) { auto it = queues_.find(queue_key); if (it == queues_.end()) { - LOG_EVERY_N(WARNING, 1000) << "Ignored data for queue: '" << queue_key - << "'"; + LOG_EVERY_N(WARNING, 1000) + << "Ignored data for queue: '" << queue_key << "'"; return; } it->second.queue.Push(std::move(data));