[clang-tidy] fix about 31、32、34、41、45 (#62129)

enkilee · web-flow · commit 180c596fb497 · 2024-02-29T23:49:13.000+08:00
diff --git a/paddle/fluid/framework/io/crypto/aes_cipher.cc b/paddle/fluid/framework/io/crypto/aes_cipher.cc
@@ -65,7 +65,7 @@ std::string AESCipher::EncryptInternal(const std::string& plaintext,
   std::string ciphertext;
   m_filter->Attach(new CryptoPP::StringSink(ciphertext));
   CryptoPP::Redirector* filter_redirector = new CryptoPP::Redirector(*m_filter);
-  CryptoPP::StringSource(plaintext, true, filter_redirector);
+  CryptoPP::StringSource ss(plaintext, true, filter_redirector);
   if (need_iv) {
     return iv_ + ciphertext;
   }
@@ -96,7 +96,7 @@ std::string AESCipher::DecryptInternal(const std::string& ciphertext,
   std::string plaintext;
   m_filter->Attach(new CryptoPP::StringSink(plaintext));
   CryptoPP::Redirector* filter_redirector = new CryptoPP::Redirector(*m_filter);
-  CryptoPP::StringSource(
+  CryptoPP::StringSource ss(
       ciphertext.substr(ciphertext_beg), true, filter_redirector);
 
   return plaintext;
@@ -124,7 +124,7 @@ std::string AESCipher::AuthenticatedEncryptInternal(
   std::string ciphertext;
   m_filter->Attach(new CryptoPP::StringSink(ciphertext));
   CryptoPP::Redirector* filter_redirector = new CryptoPP::Redirector(*m_filter);
-  CryptoPP::StringSource(plaintext, true, filter_redirector);
+  CryptoPP::StringSource ss(plaintext, true, filter_redirector);
   if (need_iv) {
     ciphertext = iv_.append(ciphertext);
   }
@@ -155,7 +155,7 @@ std::string AESCipher::AuthenticatedDecryptInternal(
   std::string plaintext;
   m_filter->Attach(new CryptoPP::StringSink(plaintext));
   CryptoPP::Redirector* filter_redirector = new CryptoPP::Redirector(*m_filter);
-  CryptoPP::StringSource(
+  CryptoPP::StringSource ss(
       ciphertext.substr(ciphertext_beg), true, filter_redirector);
   PADDLE_ENFORCE_EQ(
       m_filter->GetLastResult(),
diff --git a/paddle/fluid/memory/allocation/naive_best_fit_allocator.cc b/paddle/fluid/memory/allocation/naive_best_fit_allocator.cc
@@ -298,7 +298,7 @@ void *Alloc<platform::CUDAPlace>(const platform::CUDAPlace &place,
   auto *buddy_allocator = GetGPUBuddyAllocator(place.device);
   auto *ptr = buddy_allocator->Alloc(size);
   if (ptr == nullptr) {
-    platform::CUDADeviceGuard(place.device);
+    platform::CUDADeviceGuard guard(place.device);
     size_t avail, total;
     platform::GpuMemoryUsage(&avail, &total);
     PADDLE_THROW(platform::errors::ResourceExhausted(
diff --git a/paddle/fluid/platform/enforce_test.cc b/paddle/fluid/platform/enforce_test.cc
@@ -594,7 +594,7 @@ TEST(enforce, cannot_to_string_type) {
 }
 
 TEST(GET_DATA_SAFELY_MACRO, SUCCESS) {
-  int* a = new int(10);
+  int* a = new int(10);  // NOLINT
   GET_DATA_SAFELY(a, "Input", "X", "dummy");
 }
 
diff --git a/paddle/phi/core/dense_tensor.cc b/paddle/phi/core/dense_tensor.cc
@@ -53,7 +53,7 @@ DenseTensor::DenseTensor(const std::shared_ptr<phi::Allocation>& holder,
                          const DenseTensorMeta& meta)
     : meta_(meta), holder_(holder) {}
 
-DenseTensor::DenseTensor(const DenseTensor& other) {
+DenseTensor::DenseTensor(const DenseTensor& other) {  // NOLINT
   this->meta_ = other.meta();
   holder_ = other.holder_;
   storage_properties_ =
diff --git a/paddle/phi/core/sparse_coo_tensor.cc b/paddle/phi/core/sparse_coo_tensor.cc
@@ -51,7 +51,7 @@ SparseCooTensor::SparseCooTensor(DenseTensor&& non_zero_indices,
   meta_.dtype = non_zero_elements.dtype();
 }
 
-SparseCooTensor::SparseCooTensor(const SparseCooTensor& other) {
+SparseCooTensor::SparseCooTensor(const SparseCooTensor& other) {  // NOLINT
   this->non_zero_indices_ = other.non_zero_indices_;
   this->non_zero_elements_ = other.non_zero_elements_;
   this->coalesced_ = other.coalesced_;
diff --git a/paddle/phi/core/sparse_csr_tensor.cc b/paddle/phi/core/sparse_csr_tensor.cc
@@ -66,7 +66,7 @@ SparseCsrTensor::SparseCsrTensor(const DenseTensor& non_zero_crows,
   meta_.dtype = non_zero_elements.dtype();
 }
 
-SparseCsrTensor::SparseCsrTensor(const SparseCsrTensor& other) {
+SparseCsrTensor::SparseCsrTensor(const SparseCsrTensor& other) {  // NOLINT
   this->non_zero_crows_ = other.non_zero_crows_;
   this->non_zero_cols_ = other.non_zero_cols_;
   this->non_zero_elements_ = other.non_zero_elements_;
diff --git a/paddle/phi/core/string_tensor.cc b/paddle/phi/core/string_tensor.cc
@@ -37,7 +37,7 @@ StringTensor::StringTensor(const std::shared_ptr<phi::Allocation>& holder,
                            const StringTensorMeta& meta)
     : meta_(meta), holder_(holder) {}
 
-StringTensor::StringTensor(const StringTensor& other) {
+StringTensor::StringTensor(const StringTensor& other) {  // NOLINT
   this->meta_ = other.meta();
   holder_ = other.holder_;
 }
diff --git a/paddle/phi/core/utils/intrusive_ref_counter.h b/paddle/phi/core/utils/intrusive_ref_counter.h
@@ -57,7 +57,7 @@ inline void intrusive_ptr_release(
     const intrusive_ref_counter<DerivedT>* p) noexcept {
   if (p->ref_.load(std::memory_order_acquire) == 0 ||
       p->ref_.fetch_sub(1) == 0) {
-    delete static_cast<const DerivedT*>(p);
+    delete static_cast<const DerivedT*>(p);  // NOLINT
   }
 }
 
diff --git a/paddle/phi/infermeta/spmd_rules/unsqueeze.cc b/paddle/phi/infermeta/spmd_rules/unsqueeze.cc
@@ -74,7 +74,7 @@ std::vector<std::shared_ptr<DimTrans>> MakeUnsqueezeDimTransReverse(
   ret.resize(x_ndim);
   fill(ret.begin(), ret.end(), std::make_shared<Singleton>());
 
-  for (int64_t i = 0, j = 0; i < out_ndim; i++) {
+  for (int64_t i = 0, j = 0; i < out_ndim; i++) {  // NOLINT
     auto it = find(axis.begin(), axis.end(), i);
 
     if (it == axis.end()) {
diff --git a/paddle/pir/src/core/builtin_type_interfaces.cc b/paddle/pir/src/core/builtin_type_interfaces.cc
@@ -18,11 +18,11 @@
 namespace pir {
 
 Type ShapedTypeInterface::GetElementType() const {
-  return impl_->get_element_type(*this);
+  return impl_->get_element_type(*this);  // NOLINT
 }
 
 pir::DDim ShapedTypeInterface::GetShape() const {
-  return impl_->get_shape(*this);
+  return impl_->get_shape(*this);  // NOLINT
 }
 
 }  // namespace pir

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ TEST(enforce, cannot_to_string_type) {`
`594`	`594`	`}`
`595`	`595`
`596`	`596`	`TEST(GET_DATA_SAFELY_MACRO, SUCCESS) {`
`597`		`- int* a = new int(10);`
	`597`	`+ int* a = new int(10); // NOLINT`
`598`	`598`	`GET_DATA_SAFELY(a, "Input", "X", "dummy");`
`599`	`599`	`}`
`600`	`600`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ SparseCooTensor::SparseCooTensor(DenseTensor&& non_zero_indices,`
`51`	`51`	`meta_.dtype = non_zero_elements.dtype();`
`52`	`52`	`}`
`53`	`53`
`54`		`-SparseCooTensor::SparseCooTensor(const SparseCooTensor& other) {`
	`54`	`+SparseCooTensor::SparseCooTensor(const SparseCooTensor& other) { // NOLINT`
`55`	`55`	`this->non_zero_indices_ = other.non_zero_indices_;`
`56`	`56`	`this->non_zero_elements_ = other.non_zero_elements_;`
`57`	`57`	`this->coalesced_ = other.coalesced_;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ SparseCsrTensor::SparseCsrTensor(const DenseTensor& non_zero_crows,`
`66`	`66`	`meta_.dtype = non_zero_elements.dtype();`
`67`	`67`	`}`
`68`	`68`
`69`		`-SparseCsrTensor::SparseCsrTensor(const SparseCsrTensor& other) {`
	`69`	`+SparseCsrTensor::SparseCsrTensor(const SparseCsrTensor& other) { // NOLINT`
`70`	`70`	`this->non_zero_crows_ = other.non_zero_crows_;`
`71`	`71`	`this->non_zero_cols_ = other.non_zero_cols_;`
`72`	`72`	`this->non_zero_elements_ = other.non_zero_elements_;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ StringTensor::StringTensor(const std::shared_ptr<phi::Allocation>& holder,`
`37`	`37`	`const StringTensorMeta& meta)`
`38`	`38`	`: meta_(meta), holder_(holder) {}`
`39`	`39`
`40`		`-StringTensor::StringTensor(const StringTensor& other) {`
	`40`	`+StringTensor::StringTensor(const StringTensor& other) { // NOLINT`
`41`	`41`	`this->meta_ = other.meta();`
`42`	`42`	`holder_ = other.holder_;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ inline void intrusive_ptr_release(`
`57`	`57`	`const intrusive_ref_counter<DerivedT>* p) noexcept {`
`58`	`58`	`if (p->ref_.load(std::memory_order_acquire) == 0 \|\|`
`59`	`59`	`p->ref_.fetch_sub(1) == 0) {`
`60`		`- delete static_cast<const DerivedT*>(p);`
	`60`	`+ delete static_cast<const DerivedT*>(p); // NOLINT`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@`
`18`	`18`	`namespace pir {`
`19`	`19`
`20`	`20`	`Type ShapedTypeInterface::GetElementType() const {`
`21`		`- return impl_->get_element_type(*this);`
	`21`	`+ return impl_->get_element_type(*this); // NOLINT`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`pir::DDim ShapedTypeInterface::GetShape() const {`
`25`		`- return impl_->get_shape(*this);`
	`25`	`+ return impl_->get_shape(*this); // NOLINT`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`} // namespace pir`