Add macOS build support

zer011b · Sep 21, 2023 · 82c0016 · 82c0016
1 parent 411cd0b
commit 82c0016
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 28 deletions.
diff --git a/Source/Coordinate/GridCoordinate.cpp b/Source/Coordinate/GridCoordinate.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "GridCoordinate3D.h"
-#include "Assert.h"
+#include "PAssert.h"
 
 const char * coordinateTypeNames[] =
 {

diff --git a/Source/File-Management/BMPHelper.cpp b/Source/File-Management/BMPHelper.cpp
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "BMPHelper.h"
 
 int BMPHelper::bitDepth = 24;

diff --git a/Source/File-Management/BMPHelper.h b/Source/File-Management/BMPHelper.h
@@ -23,7 +23,7 @@
 
 #include "EasyBMP.h"
 #include "FieldValue.h"
-#include "Assert.h"
+#include "PAssert.h"
 #include "Settings.h"
 
 /**

diff --git a/Source/File-Management/Commons.h b/Source/File-Management/Commons.h
@@ -23,7 +23,7 @@
 
 #include <string>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "GridInterface.h"
 
 extern std::string int64_to_string(int64_t value);

diff --git a/Source/Grid/Clock.h b/Source/Grid/Clock.h
@@ -21,7 +21,7 @@
 #ifndef CLOCK_H
 #define CLOCK_H
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "Settings.h"
 
 #ifdef MPI_CLOCK

diff --git a/Source/Grid/CudaGrid.h b/Source/Grid/CudaGrid.h
@@ -21,7 +21,7 @@
 #ifndef CUDA_GRID_H
 #define CUDA_GRID_H
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "FieldValue.h"
 #include "GridCoordinate3D.h"
 #include "Settings.h"

diff --git a/Source/Grid/DynamicGrid.h b/Source/Grid/DynamicGrid.h
@@ -26,7 +26,7 @@
 
 #include <map>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "FieldValue.h"
 #include "Settings.h"
 #include "Clock.h"

diff --git a/Source/Grid/Grid.h b/Source/Grid/Grid.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <cstring>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "FieldValue.h"
 #include "GridCoordinate3D.h"
 #include "Settings.h"

diff --git a/Source/Helpers/Assert.cpp → Source/Helpers/PAssert.cpp b/Source/Helpers/Assert.cpp → Source/Helpers/PAssert.cpp
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "Assert.h"
+#include "PAssert.h"
 
 #include <cstdlib>
 #include <execinfo.h>

diff --git a/Source/Helpers/Assert.h → Source/Helpers/PAssert.h b/Source/Helpers/Assert.h → Source/Helpers/PAssert.h
@@ -18,11 +18,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef ASSERT_H
-#define ASSERT_H
+#ifndef PASSERT_H
+#define PASSERT_H
 
 #include <cstdio>
-#include <assert.h>
+#include <cassert>
 
 /*
  * CUDA notes.
@@ -217,4 +217,4 @@ typedef double DOUBLE;
 
 #include "CudaInclude.h"
 
-#endif /* ASSERT_H */
+#endif /* PASSERT_H */
diff --git a/Source/Kernels/Complex.h b/Source/Kernels/Complex.h
@@ -21,7 +21,7 @@
 #ifndef COMPLEX_H
 #define COMPLEX_H
 
-#include "Assert.h"
+#include "PAssert.h"
 
 #include <cmath>
 

diff --git a/Source/Kernels/FieldValue.h b/Source/Kernels/FieldValue.h
@@ -21,7 +21,7 @@
 #ifndef FIELD_VALUES_H
 #define FIELD_VALUES_H
 
-#include "Assert.h"
+#include "PAssert.h"
 
 /**
  * Type of floating point values

diff --git a/Source/Layout/Approximation.cpp b/Source/Layout/Approximation.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "Approximation.h"
-#include "Assert.h"
+#include "PAssert.h"
 #include "PhysicsConst.h"
 
 #include <cmath>

diff --git a/Source/Layout/YeeGridLayout.h b/Source/Layout/YeeGridLayout.h
@@ -22,7 +22,7 @@
 #define YEE_GRID_LAYOUT_H
 
 #include "Approximation.h"
-#include "Assert.h"
+#include "PAssert.h"
 #include "GridLayout.h"
 #include "PhysicsConst.h"
 

diff --git a/Source/Settings/Settings.h b/Source/Settings/Settings.h
@@ -23,7 +23,7 @@
 
 #include <string>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "FieldValue.h"
 #include "PhysicsConst.h"
 

diff --git a/Source/UnitTests/perf-test-parallel-grid.cpp b/Source/UnitTests/perf-test-parallel-grid.cpp
@@ -20,7 +20,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "Settings.h"
 
 #include <ctime>

diff --git a/Source/UnitTests/unit-test-clock.cpp b/Source/UnitTests/unit-test-clock.cpp
@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "Clock.h"
 
 #ifdef PARALLEL_GRID

diff --git a/Source/UnitTests/unit-test-complex.cpp b/Source/UnitTests/unit-test-complex.cpp
@@ -27,7 +27,7 @@
 #include <complex>
 #include <cassert>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "Complex.h"
 
 #ifndef CXX11_ENABLED

diff --git a/Source/UnitTests/unit-test-coordinate.cpp b/Source/UnitTests/unit-test-coordinate.cpp
@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "GridCoordinate3D.h"
 
 #ifndef CXX11_ENABLED

diff --git a/Source/UnitTests/unit-test-cuda-grid.cu b/Source/UnitTests/unit-test-cuda-grid.cu
@@ -25,7 +25,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "GridCoordinate3D.h"
 #include "CudaGrid.h"
 

diff --git a/Source/UnitTests/unit-test-dumpers-loaders.cpp b/Source/UnitTests/unit-test-dumpers-loaders.cpp
@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "GridCoordinate3D.h"
 #include "Grid.h"
 

diff --git a/Source/UnitTests/unit-test-grid.cpp b/Source/UnitTests/unit-test-grid.cpp
@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "GridCoordinate3D.h"
 #include "Grid.h"
 

diff --git a/Source/UnitTests/unit-test-layout.cpp b/Source/UnitTests/unit-test-layout.cpp
@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "YeeGridLayout.h"
 
 #ifndef CXX11_ENABLED

diff --git a/Source/UnitTests/unit-test-parallel-grid.cpp b/Source/UnitTests/unit-test-parallel-grid.cpp
@@ -34,7 +34,7 @@
 
 #include <iostream>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "Settings.h"
 
 #ifndef PARALLEL_GRID

diff --git a/Source/UnitTests/unit-test-settings.cpp b/Source/UnitTests/unit-test-settings.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <string>
 
-#include "Assert.h"
+#include "PAssert.h"
 #include "Settings.h"
 
 #ifndef DEBUG_INFO