Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clang-Tidy 17: cppcoreguidelines-rvalue-reference-param-not-moved #3825

Merged
merged 1 commit into from
Mar 25, 2024
+91 −90
Merged

Clang-Tidy 17: cppcoreguidelines-rvalue-reference-param-not-moved #3825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Src/Base/AMReX_Any.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private:
struct innards final : innards_base // NOLINT(cppcoreguidelines-special-member-functions)
{
innards (MF && mf)
: m_mf(std::forward<MF>(mf))
: m_mf(std::move(mf))
{}

~innards () final = default;
Expand Down
4 changes: 2 additions & 2 deletions Src/Base/AMReX_BoxArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ BARef::BARef (const BoxList& bl)
}

BARef::BARef (BoxList&& bl) noexcept
: m_abox(std::move(bl.data()))
: m_abox(std::move(std::move(bl).data()))
{
#ifdef AMREX_MEM_PROFILING
updateMemoryUsage_box(1);
Expand Down Expand Up @@ -170,7 +170,7 @@ BARef::define (BoxList&& bl) noexcept
#ifdef AMREX_MEM_PROFILING
updateMemoryUsage_box(-1);
#endif
m_abox = std::move(bl.data());
m_abox = std::move(std::move(bl).data());
#ifdef AMREX_MEM_PROFILING
updateMemoryUsage_box(1);
#endif
Expand Down
2 changes: 1 addition & 1 deletion Src/Base/AMReX_GpuElixir.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public:
return *this;
}

void append (Elixir && rhs) noexcept
void append (Elixir rhs) noexcept
{
m_pa.insert(m_pa.end(), rhs.m_pa.begin(), rhs.m_pa.end());
rhs.m_pa.clear();
Expand Down
2 changes: 1 addition & 1 deletion Src/Base/AMReX_PODVector.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ namespace amrex
iterator insert (const_iterator a_pos, T&& a_item)
{
// This is *POD* vector after all
return insert(a_pos, 1, a_item);
return insert(a_pos, 1, std::move(a_item));
}

iterator insert (const_iterator a_pos,
Expand Down
76 changes: 38 additions & 38 deletions Src/Base/AMReX_ParallelDescriptor.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ while ( false )
ReduceRealSum (T* rvar, int cnt);

// Having this for backward compatibility
void ReduceRealSum (Vector<std::reference_wrapper<Real> >&& rvar);
void ReduceRealSum (Vector<std::reference_wrapper<Real> > const& rvar);
//
template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealSum (Vector<std::reference_wrapper<T> >&& rvar);
ReduceRealSum (Vector<std::reference_wrapper<T> > const& rvar);

//! Real sum reduction to specified cpu.
template <typename T>
Expand All @@ -471,11 +471,11 @@ while ( false )
ReduceRealSum (T* rvar, int cnt, int cpu);

// Having this for backward compatibility
void ReduceRealSum (Vector<std::reference_wrapper<Real> >&& rvar, int cpu);
void ReduceRealSum (Vector<std::reference_wrapper<Real> > const& rvar, int cpu);
//
template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealSum (Vector<std::reference_wrapper<T> >&& rvar, int cpu);
ReduceRealSum (Vector<std::reference_wrapper<T> > const& rvar, int cpu);

//! Real max reduction.
template <typename T>
Expand All @@ -487,11 +487,11 @@ while ( false )
ReduceRealMax (T* rvar, int cnt);

// Having this for backward compatibility
void ReduceRealMax (Vector<std::reference_wrapper<Real> >&& rvar);
void ReduceRealMax (Vector<std::reference_wrapper<Real> > const& rvar);
//
template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMax (Vector<std::reference_wrapper<T> >&& rvar);
ReduceRealMax (Vector<std::reference_wrapper<T> > const& rvar);

//! Real max reduction to specified cpu.
template <typename T>
Expand All @@ -503,11 +503,11 @@ while ( false )
ReduceRealMax (T* rvar, int cnt, int cpu);

// Having this for backward compatibility
void ReduceRealMax (Vector<std::reference_wrapper<Real> >&& rvar, int cpu);
void ReduceRealMax (Vector<std::reference_wrapper<Real> > const& rvar, int cpu);
//
template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMax (Vector<std::reference_wrapper<T> >&& rvar, int cpu);
ReduceRealMax (Vector<std::reference_wrapper<T> > const& rvar, int cpu);

//! Real min reduction.
template <typename T>
Expand All @@ -519,11 +519,11 @@ while ( false )
ReduceRealMin (T* rvar, int cnt);

// Having this for backward compatibility
void ReduceRealMin (Vector<std::reference_wrapper<Real> >&& rvar);
void ReduceRealMin (Vector<std::reference_wrapper<Real> > const& rvar);
//
template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMin (Vector<std::reference_wrapper<T> >&& rvar);
ReduceRealMin (Vector<std::reference_wrapper<T> > const& rvar);

//! Real min reduction to specified cpu.
template <typename T>
Expand All @@ -535,74 +535,74 @@ while ( false )
ReduceRealMin (T* rvar, int cnt, int cpu);

// Having this for backward compatibility
void ReduceRealMin (Vector<std::reference_wrapper<Real> >&& rvar, int cpu);
void ReduceRealMin (Vector<std::reference_wrapper<Real> > const& rvar, int cpu);
//
template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMin (Vector<std::reference_wrapper<T> >&& rvar, int cpu);
ReduceRealMin (Vector<std::reference_wrapper<T> > const& rvar, int cpu);

//! Integer sum reduction.
void ReduceIntSum (int& rvar);
void ReduceIntSum (int* rvar, int cnt);
void ReduceIntSum (Vector<std::reference_wrapper<int> >&& rvar);
void ReduceIntSum (Vector<std::reference_wrapper<int> > const& rvar);
//! Integer sum reduction to specified cpu.
void ReduceIntSum (int& rvar, int cpu);
void ReduceIntSum (int* rvar, int cnt, int cpu);
void ReduceIntSum (Vector<std::reference_wrapper<int> >&& rvar, int cpu);
void ReduceIntSum (Vector<std::reference_wrapper<int> > const& rvar, int cpu);

//! Integer max reduction.
void ReduceIntMax (int& rvar);
void ReduceIntMax (int* rvar, int cnt);
void ReduceIntMax (Vector<std::reference_wrapper<int> >&& rvar);
void ReduceIntMax (Vector<std::reference_wrapper<int> > const& rvar);
//! Integer max reduction to specified cpu.
void ReduceIntMax (int& rvar, int cpu);
void ReduceIntMax (int* rvar, int cnt, int cpu);
void ReduceIntMax (Vector<std::reference_wrapper<int> >&& rvar, int cpu);
void ReduceIntMax (Vector<std::reference_wrapper<int> > const& rvar, int cpu);

//! Integer min reduction.
void ReduceIntMin (int& rvar);
void ReduceIntMin (int* rvar, int cnt);
void ReduceIntMin (Vector<std::reference_wrapper<int> >&& rvar);
void ReduceIntMin (Vector<std::reference_wrapper<int> > const& rvar);
//! Integer min reduction to specified cpu.
void ReduceIntMin (int& rvar, int cpu);
void ReduceIntMin (int* rvar, int cnt, int cpu);
void ReduceIntMin (Vector<std::reference_wrapper<int> >&& rvar, int cpu);
void ReduceIntMin (Vector<std::reference_wrapper<int> > const& rvar, int cpu);

//! Long sum reduction.
void ReduceLongSum (Long& rvar);
void ReduceLongSum (Long* rvar, int cnt);
void ReduceLongSum (Vector<std::reference_wrapper<Long> >&& rvar);
void ReduceLongSum (Vector<std::reference_wrapper<Long> > const& rvar);
//! Long sum reduction to specified cpu.
void ReduceLongSum (Long& rvar, int cpu);
void ReduceLongSum (Long* rvar, int cnt, int cpu);
void ReduceLongSum (Vector<std::reference_wrapper<Long> >&& rvar, int cpu);
void ReduceLongSum (Vector<std::reference_wrapper<Long> > const& rvar, int cpu);

//! Long max reduction.
void ReduceLongMax (Long& rvar);
void ReduceLongMax (Long* rvar, int cnt);
void ReduceLongMax (Vector<std::reference_wrapper<Long> >&& rvar);
void ReduceLongMax (Vector<std::reference_wrapper<Long> > const& rvar);
//! Long max reduction to specified cpu.
void ReduceLongMax (Long& rvar, int cpu);
void ReduceLongMax (Long* rvar, int cnt, int cpu);
void ReduceLongMax (Vector<std::reference_wrapper<Long> >&& rvar, int cpu);
void ReduceLongMax (Vector<std::reference_wrapper<Long> > const& rvar, int cpu);

//! Long min reduction.
void ReduceLongMin (Long& rvar);
void ReduceLongMin (Long* rvar, int cnt);
void ReduceLongMin (Vector<std::reference_wrapper<Long> >&& rvar);
void ReduceLongMin (Vector<std::reference_wrapper<Long> > const& rvar);
//! Long min reduction to specified cpu.
void ReduceLongMin (Long& rvar, int cpu);
void ReduceLongMin (Long* rvar, int cnt, int cpu);
void ReduceLongMin (Vector<std::reference_wrapper<Long> >&& rvar, int cpu);
void ReduceLongMin (Vector<std::reference_wrapper<Long> > const& rvar, int cpu);

//! Long and-wise reduction.
void ReduceLongAnd (Long& rvar);
void ReduceLongAnd (Long* rvar, int cnt);
void ReduceLongAnd (Vector<std::reference_wrapper<Long> >&& rvar);
void ReduceLongAnd (Vector<std::reference_wrapper<Long> > const& rvar);
//! Long and-wise reduction to specified cpu.
void ReduceLongAnd (Long& rvar, int cpu);
void ReduceLongAnd (Long* rvar, int cnt, int cpu);
void ReduceLongAnd (Vector<std::reference_wrapper<Long> >&& rvar, int cpu);
void ReduceLongAnd (Vector<std::reference_wrapper<Long> > const& rvar, int cpu);

//! Parallel gather.
void Gather (Real const* sendbuf, int nsend, Real* recvbuf, int root);
Expand Down Expand Up @@ -1284,7 +1284,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealSum (Vector<std::reference_wrapper<T> >&& rvar)
ReduceRealSum (Vector<std::reference_wrapper<T> > const& rvar)
{
int cnt = rvar.size();
Vector<T> tmp{std::begin(rvar), std::end(rvar)};
Expand All @@ -1309,7 +1309,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealSum (Vector<std::reference_wrapper<T> >&& rvar, int cpu)
ReduceRealSum (Vector<std::reference_wrapper<T> > const& rvar, int cpu)
{
int cnt = rvar.size();
Vector<T> tmp{std::begin(rvar), std::end(rvar)};
Expand All @@ -1334,7 +1334,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMax (Vector<std::reference_wrapper<T> >&& rvar)
ReduceRealMax (Vector<std::reference_wrapper<T> > const& rvar)
{
int cnt = rvar.size();
Vector<T> tmp{std::begin(rvar), std::end(rvar)};
Expand All @@ -1359,7 +1359,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMax (Vector<std::reference_wrapper<T> >&& rvar, int cpu)
ReduceRealMax (Vector<std::reference_wrapper<T> > const& rvar, int cpu)
{
int cnt = rvar.size();
Vector<T> tmp{std::begin(rvar), std::end(rvar)};
Expand All @@ -1384,7 +1384,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMin (Vector<std::reference_wrapper<T> >&& rvar)
ReduceRealMin (Vector<std::reference_wrapper<T> > const& rvar)
{
int cnt = rvar.size();
Vector<T> tmp{std::begin(rvar), std::end(rvar)};
Expand All @@ -1409,7 +1409,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMin (Vector<std::reference_wrapper<T> >&& rvar, int cpu)
ReduceRealMin (Vector<std::reference_wrapper<T> > const& rvar, int cpu)
{
int cnt = rvar.size();
Vector<T> tmp{std::begin(rvar), std::end(rvar)};
Expand All @@ -1432,7 +1432,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealSum (Vector<std::reference_wrapper<T> >&&) {}
ReduceRealSum (Vector<std::reference_wrapper<T> > const&) {}

//! Real sum reduction to specified cpu.
template <typename T>
Expand All @@ -1445,7 +1445,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealSum (Vector<std::reference_wrapper<T> >&&, int) {}
ReduceRealSum (Vector<std::reference_wrapper<T> > const&, int) {}

//! Real max reduction.
template <typename T>
Expand All @@ -1458,7 +1458,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMax (Vector<std::reference_wrapper<T> >&&) {}
ReduceRealMax (Vector<std::reference_wrapper<T> > const&) {}

//! Real max reduction to specified cpu.
template <typename T>
Expand All @@ -1471,7 +1471,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMax (Vector<std::reference_wrapper<T> >&&, int) {}
ReduceRealMax (Vector<std::reference_wrapper<T> > const&, int) {}

//! Real min reduction.
template <typename T>
Expand All @@ -1484,7 +1484,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMin (Vector<std::reference_wrapper<T> >&&) {}
ReduceRealMin (Vector<std::reference_wrapper<T> > const&) {}

//! Real min reduction to specified cpu.
template <typename T>
Expand All @@ -1497,7 +1497,7 @@ void DoReduce (T* r, MPI_Op op, int cnt, int cpu)

template <typename T>
typename std::enable_if<std::is_floating_point<T>::value>::type
ReduceRealMin (Vector<std::reference_wrapper<T> >&&, int) {}
ReduceRealMin (Vector<std::reference_wrapper<T> > const&, int) {}

#endif
}
Expand Down
Loading
Loading