diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 69eaad10..fa11a391 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1452,7 +1452,7 @@ typedef GTestMutexLock MutexLock; // without knowing its type. class [[nodiscard]] ThreadLocalValueHolderBase { public: - virtual ~ThreadLocalValueHolderBase() {} + virtual ~ThreadLocalValueHolderBase() = default; }; // Provides a way for a thread to send notifications to a ThreadLocal @@ -1466,8 +1466,8 @@ class [[nodiscard]] ThreadLocalBase { virtual ThreadLocalValueHolderBase* NewValueForCurrentThread() const = 0; protected: - ThreadLocalBase() {} - virtual ~ThreadLocalBase() {} + ThreadLocalBase() = default; + virtual ~ThreadLocalBase() = default; private: ThreadLocalBase(const ThreadLocalBase&) = delete; @@ -1496,7 +1496,7 @@ class GTEST_API_ [[nodiscard]] ThreadWithParamBase { protected: class Runnable { public: - virtual ~Runnable() {} + virtual ~Runnable() = default; virtual void Run() = 0; }; @@ -1515,14 +1515,14 @@ class [[nodiscard]] ThreadWithParam : public ThreadWithParamBase { ThreadWithParam(UserThreadFunc* func, T param, Notification* thread_can_start) : ThreadWithParamBase(new RunnableImpl(func, param), thread_can_start) {} - virtual ~ThreadWithParam() {} + ~ThreadWithParam() override {} private: class RunnableImpl : public Runnable { public: RunnableImpl(UserThreadFunc* func, T param) : func_(func), param_(param) {} - virtual ~RunnableImpl() {} - virtual void Run() { func_(param_); } + ~RunnableImpl() override {} + void Run() override { func_(param_); } private: UserThreadFunc* const func_; @@ -1605,8 +1605,8 @@ class [[nodiscard]] ThreadLocal : public ThreadLocalBase { class ValueHolderFactory { public: - ValueHolderFactory() {} - virtual ~ValueHolderFactory() {} + ValueHolderFactory() = default; + virtual ~ValueHolderFactory() = default; virtual ValueHolder* MakeNewHolder() const = 0; private: @@ -1616,7 +1616,7 @@ class [[nodiscard]] ThreadLocal : public ThreadLocalBase { class DefaultValueHolderFactory : public ValueHolderFactory { public: - DefaultValueHolderFactory() {} + DefaultValueHolderFactory() = default; ValueHolder* MakeNewHolder() const override { return new ValueHolder(); } private: