Skip to content

Commit ddb62cc

Browse files
committed
public virtual destructor
Signed-off-by: Martijn Govers <[email protected]>
1 parent 720984d commit ddb62cc

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

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

1616
public:
@@ -78,9 +78,8 @@ class CalculationInfo final: public Logger {
7878
}
7979
void accumulate_log(LogEvent tag, double value) { data_[tag] += value; }
8080
void maximize_log(LogEvent tag, double value) {
81-
if (auto& stored_value = data_[tag]; value > stored_value) {
82-
stored_value = value;
83-
}
81+
auto& stored_value = data_[tag];
82+
stored_value = std::max(value, stored_value);
8483
}
8584

8685
public:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ class Logger {
5252

5353
Logger(Logger&&) noexcept = default;
5454
Logger& operator=(Logger&&) noexcept = default;
55+
virtual ~Logger() = default;
5556

5657
protected:
5758
Logger() = default;
5859
Logger(Logger const&) = default;
5960
Logger& operator=(Logger const&) = default;
60-
virtual ~Logger() = default;
6161
};
6262

6363
} // namespace common::logging

0 commit comments

Comments
 (0)