From edc4865eab6fdbd6e227c231866bfab83f15e87d Mon Sep 17 00:00:00 2001
From: Eric Cousineau <eric.cousineau@tri.global>
Date: Mon, 15 Feb 2021 17:19:30 -0500
Subject: [PATCH] moar clang-tidy

---
 include/pybind11/pybind11.h       |  2 +-
 include/pybind11/pytypes.h        |  2 +-
 tests/test_ownership_transfer.cpp | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
index 1536b1c7d7..63db280788 100644
--- a/include/pybind11/pybind11.h
+++ b/include/pybind11/pybind11.h
@@ -1328,7 +1328,7 @@ template <>
 struct holder_check_impl<detail::HolderTypeId::SharedPtr> : public holder_check_impl<detail::HolderTypeId::Unknown> {
     template <typename holder_type>
     static bool check_destruct(detail::instance* inst, detail::holder_erased holder_raw) {
-        const holder_type& h = holder_raw.cast<holder_type>();
+        const auto& h = holder_raw.cast<holder_type>();
         handle src((PyObject*)inst);
         const detail::type_info *lowest_type = get_lowest_type(src, false);
         if (!lowest_type)
diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h
index 147ad93325..2ce750da97 100644
--- a/include/pybind11/pytypes.h
+++ b/include/pybind11/pytypes.h
@@ -1638,7 +1638,7 @@ class wrapper : public Base {
  public:
   using Base::Base;
 
-  virtual ~wrapper() {
+  virtual ~wrapper() {  // NOLINT(modernize-use-override)
       delete_py_if_in_cpp();
   }
 
diff --git a/tests/test_ownership_transfer.cpp b/tests/test_ownership_transfer.cpp
index bedae4c8fb..49724e04eb 100644
--- a/tests/test_ownership_transfer.cpp
+++ b/tests/test_ownership_transfer.cpp
@@ -95,27 +95,27 @@ class DefinePyBaseWrapped : public py::wrapper<DefineBase<label>> {
 };
 
 // BaseBad - No wrapper alias.
-typedef DefineBase<BaseBadLabel> BaseBad;
-typedef DefineBaseContainer<BaseBadLabel> BaseBadContainer;
-typedef Stats<ChildBadLabel> ChildBadStats;
+using BaseBad = DefineBase<BaseBadLabel>;
+using BaseBadContainer = DefineBaseContainer<BaseBadLabel>;
+using ChildBadStats = Stats<ChildBadLabel>;
 
 // Base - wrapper alias used in pybind definition.
-typedef DefineBase<BaseLabel> Base;
-typedef DefinePyBase<BaseLabel> PyBase;
-typedef DefineBaseContainer<BaseLabel> BaseContainer;
-typedef Stats<ChildLabel> ChildStats;
+using Base = DefineBase<BaseLabel>;
+using PyBase = DefinePyBase<BaseLabel>;
+using BaseContainer = DefineBaseContainer<BaseLabel>;
+using ChildStats = Stats<ChildLabel>;
 
 // - Unique Ptr
 // BaseBad - No wrapper alias.
-typedef DefineBase<BaseBadUniqueLabel> BaseBadUnique;
-typedef DefineBaseUniqueContainer<BaseBadUniqueLabel> BaseBadUniqueContainer;
-typedef Stats<ChildBadUniqueLabel> ChildBadUniqueStats;
+using BaseBadUnique = DefineBase<BaseBadUniqueLabel>;
+using BaseBadUniqueContainer = DefineBaseUniqueContainer<BaseBadUniqueLabel>;
+using ChildBadUniqueStats = Stats<ChildBadUniqueLabel>;
 
 // Base - wrapper alias used directly.
-typedef DefineBase<BaseUniqueLabel> BaseUnique;
-typedef DefinePyBaseWrapped<BaseUniqueLabel> PyBaseUnique;
-typedef DefineBaseUniqueContainer<BaseUniqueLabel> BaseUniqueContainer;
-typedef Stats<ChildUniqueLabel> ChildUniqueStats;
+using BaseUnique = DefineBase<BaseUniqueLabel>;
+using PyBaseUnique = DefinePyBaseWrapped<BaseUniqueLabel>;
+using BaseUniqueContainer = DefineBaseUniqueContainer<BaseUniqueLabel>;
+using ChildUniqueStats = Stats<ChildUniqueLabel>;
 
 class PyInstanceStats {
  public: