Skip to content

Commit ff561f1

Browse files
committed
fix compilation
Signed-off-by: Martijn Govers <[email protected]>
1 parent bbc901e commit ff561f1

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

power_grid_model_c/power_grid_model/include/power_grid_model/common/calculation_info.hpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,28 @@
1010

1111
namespace power_grid_model {
1212
namespace common::logging {
13-
class CalculationInfo : public NoLogger {
13+
class CalculationInfo : public Logger {
1414
using Data = std::map<LogEvent, double>;
1515

1616
public:
1717
using Report = std::add_lvalue_reference_t<std::add_const_t<Data>>;
1818
static_assert(std::same_as<Report, Data const&>);
1919

20-
void log(LogEvent tag, double value) override { log_impl(tag, value); }
21-
void log(LogEvent tag, Idx value) override { log_impl(tag, static_cast<double>(value)); }
22-
20+
CalculationInfo() = default;
2321
CalculationInfo(CalculationInfo const&) = default;
2422
CalculationInfo(CalculationInfo&&) noexcept = default;
2523
CalculationInfo& operator=(CalculationInfo const&) = default;
2624
CalculationInfo& operator=(CalculationInfo&&) noexcept = default;
25+
~CalculationInfo() = default;
26+
27+
void log(LogEvent tag) override {
28+
// ignore all such events for now
29+
}
30+
void log(LogEvent tag, std::string_view /*message*/) override {
31+
// ignore all such events for now
32+
}
33+
void log(LogEvent tag, double value) override { log_impl(tag, value); }
34+
void log(LogEvent tag, Idx value) override { log_impl(tag, static_cast<double>(value)); }
2735

2836
private:
2937
Data data_;

power_grid_model_c/power_grid_model/include/power_grid_model/common/logging.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ class Logger {
4949
virtual void log(LogEvent tag, std::string_view message) = 0;
5050
virtual void log(LogEvent tag, double value) = 0;
5151
virtual void log(LogEvent tag, Idx value) = 0;
52-
virtual ~Logger() = 0;
52+
53+
Logger(Logger&&) noexcept = default;
54+
Logger& operator=(Logger&&) noexcept = default;
5355

5456
protected:
57+
Logger() = default;
5558
Logger(Logger const&) = default;
56-
Logger(Logger&&) noexcept = default;
5759
Logger& operator=(Logger const&) = default;
58-
Logger& operator=(Logger&&) noexcept = default;
60+
virtual ~Logger() = default;
5961
};
6062

6163
} // namespace common::logging

power_grid_model_c/power_grid_model/include/power_grid_model/common/logging_impl.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ class NoLogger : public Logger {
2424
void log(LogEvent /*tag*/, Idx /*value*/) override {
2525
// no logging
2626
}
27-
NoLogger(NoLogger const&) = default;
28-
NoLogger(NoLogger&&) noexcept = default;
29-
NoLogger& operator=(NoLogger const&) = default;
30-
NoLogger& operator=(NoLogger&&) noexcept = default;
31-
~NoLogger() override = default;
3227
};
3328

3429
} // namespace power_grid_model::common::logging

0 commit comments

Comments
 (0)