diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-05 13:47:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-05 13:47:19 (GMT) |
| commit | 053c0f1e44cc6900bb215b8eb2866f68211ebfe5 (patch) | |
| tree | 791ffe8230f72ea58f56ee0576a988d0c1c5f9c6 /Source | |
| parent | 718f0c24f7c0ea9170c8843e17d88fb8eee70235 (diff) | |
| parent | d0c3e47d806ea3a25be2e7d190e479a6ccd8faa0 (diff) | |
| download | CMake-053c0f1e44cc6900bb215b8eb2866f68211ebfe5.zip CMake-053c0f1e44cc6900bb215b8eb2866f68211ebfe5.tar.gz CMake-053c0f1e44cc6900bb215b8eb2866f68211ebfe5.tar.bz2 | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cm_auto_ptr.hxx | 10 |
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 |