Skip to content

Commit

Permalink
Fix: Windows and/or includes (iso646) (#1593)
Browse files Browse the repository at this point in the history
## Summary

Add missing includes to `AMReX_Extension.H`, which pulls the `<iso646.h>` include on Windows for support for `and`/`or`.

## Additional background

Seen with Clang 11.0.0 on x64 Windows with Visual Studio 2017 on conda-forge during a WarpX build.

See also #947

## Checklist

The proposed changes:
- [x] fix a bug or incorrect behavior in AMReX
- [ ] add new capabilities to AMReX
- [ ] changes answers in the test suite to more than roundoff level
- [ ] are likely to significantly affect the results of downstream AMReX users
- [ ] are described in the proposed changes to the AMReX documentation, if appropriate
  • Loading branch information
ax3l authored Dec 3, 2020
1 parent 5c1addc commit ef665e2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Src/Base/AMReX_Extension.H
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
#endif

#if defined(__cplusplus) && defined(_WIN32)
#include <iso646.h>
#include <ciso646>
#endif

#if (__cplusplus >= 201703L)
Expand Down
1 change: 1 addition & 0 deletions Src/Base/AMReX_Vector.H
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <vector>
#include <memory>
#include <AMReX_BLassert.H>
#include <AMReX_Extension.H>
#include <AMReX_INT.H>
#ifdef AMREX_SPACEDIM
#include <AMReX_Array.H>
Expand Down
1 change: 1 addition & 0 deletions Src/Particle/AMReX_ParticleTile.H
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define AMREX_PARTICLETILE_H_
#include <AMReX_Config.H>

#include <AMReX_Extension.H>
#include <AMReX_Particle.H>
#include <AMReX_ArrayOfStructs.H>
#include <AMReX_StructOfArrays.H>
Expand Down

0 comments on commit ef665e2

Please sign in to comment.