Skip to content

Commit

Permalink
Fix circular header file dependency (AMReX-Codes#3725)
Browse files Browse the repository at this point in the history
AMReX_GpuContainers.H included AMReX_Scan.H, which in turn includes
AMReX_Gpu.H, which in turn includes AMReX_GpuContainers.H.

In this PR, AMReX_Scan.H is removed from AMReX_GpuContainers.H, because
it does not need it.

Thanks to @zingale and clang-tidy.
  • Loading branch information
WeiqunZhang authored Jan 26, 2024
1 parent d5cc579 commit 41397e2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions Src/Base/AMReX_BaseFab.H
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <AMReX_Utility.H>
#include <AMReX_Reduce.H>
#include <AMReX_Gpu.H>
#include <AMReX_Scan.H>
#include <AMReX_Math.H>
#include <AMReX_OpenMP.H>
#include <AMReX_MemPool.H>
Expand Down
1 change: 0 additions & 1 deletion Src/Base/AMReX_GpuContainers.H
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <AMReX_Vector.H>
#include <AMReX_PODVector.H>
#include <AMReX_GpuAllocators.H>
#include <AMReX_Scan.H>
#include <type_traits>

#include <numeric>
Expand Down
1 change: 1 addition & 0 deletions Src/Particle/AMReX_DenseBins.H
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <AMReX_Config.H>

#include <AMReX_Gpu.H>
#include <AMReX_Scan.H>
#include <AMReX_IntVect.H>
#include <AMReX_BLProfiler.H>
#include <AMReX_BinIterator.H>
Expand Down
4 changes: 2 additions & 2 deletions Src/Particle/AMReX_NeighborList.H
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef NEIGHBOR_LIST_H_
#define NEIGHBOR_LIST_H_
#ifndef AMREX_NEIGHBOR_LIST_H_
#define AMREX_NEIGHBOR_LIST_H_
#include <AMReX_Config.H>

#include <AMReX_Particles.H>
Expand Down
1 change: 1 addition & 0 deletions Src/Particle/AMReX_ParticleCommunication.H
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <AMReX_IntVect.H>
#include <AMReX_ParticleBufferMap.H>
#include <AMReX_MFIter.H>
#include <AMReX_Scan.H>
#include <AMReX_TypeTraits.H>
#include <AMReX_MakeParticle.H>

Expand Down

0 comments on commit 41397e2

Please sign in to comment.