From 90f006b1cd8413db3390f27ed3486a138f32dd9d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 17 Aug 2021 16:49:00 -0700 Subject: [PATCH] clang-tidy: use delete The clang warning for pending_signals_t was about the operator= return type being wrong (misc-unconventional-assign-operator). Signed-off-by: Rosen Penev --- src/env_universal_common.h | 8 +++----- src/event.cpp | 4 ++-- src/parser.h | 8 ++++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/env_universal_common.h b/src/env_universal_common.h index bb441b90f..95182a95b 100644 --- a/src/env_universal_common.h +++ b/src/env_universal_common.h @@ -179,14 +179,12 @@ class universal_notifier_t { strategy_named_pipe, }; + universal_notifier_t(const universal_notifier_t &) = delete; + universal_notifier_t &operator=(const universal_notifier_t &) = delete; + protected: universal_notifier_t(); - private: - // No copying. - universal_notifier_t &operator=(const universal_notifier_t &); - universal_notifier_t(const universal_notifier_t &x); - public: static notifier_strategy_t resolve_default_strategy(); virtual ~universal_notifier_t(); diff --git a/src/event.cpp b/src/event.cpp index 4daa8bc28..97d146898 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -42,8 +42,8 @@ class pending_signals_t { pending_signals_t() = default; /// No copying. - pending_signals_t(const pending_signals_t &); - void operator=(const pending_signals_t &); + pending_signals_t(const pending_signals_t &) = delete; + pending_signals_t& operator=(const pending_signals_t &) = delete; /// Mark a signal as pending. This may be called from a signal handler. /// We expect only one signal handler to execute at once. diff --git a/src/parser.h b/src/parser.h index 4b73884b6..2e87a404d 100644 --- a/src/parser.h +++ b/src/parser.h @@ -269,10 +269,6 @@ class parser_t : public std::enable_shared_from_this { /// to profile_items). deque does not move items on reallocation. std::deque profile_items; - // No copying allowed. - parser_t(const parser_t &); - parser_t &operator=(const parser_t &); - /// Adds a job to the beginning of the job list. void job_add(shared_ptr job); @@ -290,6 +286,10 @@ class parser_t : public std::enable_shared_from_this { static std::shared_ptr principal; public: + // No copying allowed. + parser_t(const parser_t &) = delete; + parser_t &operator=(const parser_t &) = delete; + /// Get the "principal" parser, whatever that is. static parser_t &principal_parser();