Skip to content

Commit ad8013d

Browse files
committed
resolve more sonar cloud warnings
Signed-off-by: Martijn Govers <[email protected]>
1 parent 8455f68 commit ad8013d

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

power_grid_model_c/power_grid_model/include/power_grid_model/common/multi_threaded_logging.hpp

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,25 @@ class MultiThreadedLoggerImpl : public MultiThreadedLogger {
2020
class ThreadLogger : public LoggerType {
2121
public:
2222
ThreadLogger(MultiThreadedLoggerImpl& parent) : parent_{&parent} {}
23-
ThreadLogger(ThreadLogger const&) = default;
24-
ThreadLogger& operator=(ThreadLogger const&) = default;
25-
ThreadLogger(ThreadLogger&&) noexcept = default;
26-
ThreadLogger& operator=(ThreadLogger&&) noexcept = default;
23+
ThreadLogger(ThreadLogger const& other) : LoggerType{other}, parent_{other.parent_} {};
24+
ThreadLogger& operator=(ThreadLogger const& other) {
25+
if (this != &other) {
26+
LoggerType::operator=(other);
27+
parent_ = other.parent_;
28+
}
29+
return *this;
30+
};
31+
ThreadLogger(ThreadLogger&& other) noexcept
32+
: LoggerType{std::forward<LoggerType>(other)}, parent_{other.parent_} {};
33+
ThreadLogger& operator=(ThreadLogger&& other) noexcept {
34+
if (this != &other) {
35+
auto* const parent = other.parent_;
36+
other.parent_ = nullptr;
37+
LoggerType::operator=(std::move(other));
38+
parent_ = parent;
39+
}
40+
return *this;
41+
};
2742
~ThreadLogger() noexcept override { sync(); }
2843
void sync() const { parent_->sync(*this); }
2944

power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Timer {
2626
Timer(Logger& log, LogEvent code) : log_{&log}, code_{code}, start_{Clock::now()} {}
2727

2828
Timer(Timer const&) = delete;
29-
Timer(Timer&&) = default;
29+
Timer(Timer&& other) : log_{other.log_}, code_{other.code_}, start_{other.start_} { other.log_ = nullptr; }
3030
Timer& operator=(Timer const&) = delete;
3131

3232
Timer& operator=(Timer&& timer) noexcept {

0 commit comments

Comments
 (0)