From 447130c004559b26bfa0f92ede883e0c433718d7 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Wed, 2 Dec 2020 15:06:19 -0800
Subject: [PATCH] Fix: Windows and/or includes (iso646)

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

Seen with Clang 11.0.0 on x64 Windows with Visual Studio 2017 on
conda-forge during a WarpX build.
---
 Src/Base/AMReX_Extension.H        | 2 +-
 Src/Base/AMReX_Vector.H           | 1 +
 Src/Particle/AMReX_ParticleTile.H | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Src/Base/AMReX_Extension.H b/Src/Base/AMReX_Extension.H
index 6521330a123..a8ccfa5aac3 100644
--- a/Src/Base/AMReX_Extension.H
+++ b/Src/Base/AMReX_Extension.H
@@ -137,7 +137,7 @@
 #endif
 
 #if defined(__cplusplus) && defined(_WIN32)
-#include <iso646.h>
+#include <ciso646>
 #endif
 
 #if (__cplusplus >= 201703L)
diff --git a/Src/Base/AMReX_Vector.H b/Src/Base/AMReX_Vector.H
index 9ba42c8a29e..e8cbbc5a121 100644
--- a/Src/Base/AMReX_Vector.H
+++ b/Src/Base/AMReX_Vector.H
@@ -5,6 +5,7 @@
 #include <vector>
 #include <memory>
 #include <AMReX_BLassert.H>
+#include <AMReX_Extension.H>
 #include <AMReX_INT.H>
 #ifdef AMREX_SPACEDIM
 #include <AMReX_Array.H>
diff --git a/Src/Particle/AMReX_ParticleTile.H b/Src/Particle/AMReX_ParticleTile.H
index b565931e995..ea47e9f9200 100644
--- a/Src/Particle/AMReX_ParticleTile.H
+++ b/Src/Particle/AMReX_ParticleTile.H
@@ -1,6 +1,7 @@
 #ifndef AMREX_PARTICLETILE_H_
 #define AMREX_PARTICLETILE_H_
 
+#include <AMReX_Extension.H>
 #include <AMReX_Particle.H>
 #include <AMReX_ArrayOfStructs.H>
 #include <AMReX_StructOfArrays.H>