Merge topic 'clang-tidy-config'

d0c3e47d clang-tidy: add option CMake_RUN_CLANG_TIDY
894ff96c auto_ptr: silence clang-tidy warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !790

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index 2b5c059..773602a 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -100,10 +100,10 @@ public:
   /** Assign from an auto_ptr holding a compatible object.  This
       transfers ownership to the left-hand-side of the assignment.  */
   template <class Y>
-  auto_ptr& operator=(auto_ptr<Y> cm_AUTO_PTR_CONST& a) throw()
+  auto_ptr& operator=(auto_ptr<Y> cm_AUTO_PTR_CONST& a) throw() // NOLINT
   {
     this->reset(cm_AUTO_PTR_CAST(a).release());
-    return *this;
+    return *this; // NOLINT
   }
 
   /**
@@ -127,10 +127,10 @@ public:
 
   /** Assign from another auto_ptr holding an object of the same type.
       This transfers ownership to the newly constructed auto_ptr.  */
-  auto_ptr& operator=(auto_ptr cm_AUTO_PTR_CONST& a) throw()
+  auto_ptr& operator=(auto_ptr cm_AUTO_PTR_CONST& a) throw() // NOLINT
   {
     this->reset(cm_AUTO_PTR_CAST(a).release());
-    return *this;
+    return *this; // NOLINT
   }
 
   /** Destruct and delete the object held.  */
@@ -192,7 +192,7 @@ public:
   auto_ptr& operator=(detail::auto_ptr_ref<X> r) throw()
   {
     this->reset(r.p_);
-    return *this;
+    return *this; // NOLINT
   }
 
   /** Convert to an auto_ptr_ref.  This is used when a function