Use guards instead of pragma once

covid-sim.vcxproj

@@ -119,6 +119,7 @@
     <ClInclude Include="src\Country.h" />
     <ClInclude Include="src\Dist.h" />
     <ClInclude Include="src\Error.h" />
+    <ClInclude Include="src\IndexList.h" />
     <ClInclude Include="src\InfStat.h" />
     <ClInclude Include="src\Kernels.h" />
     <ClInclude Include="src\Memory.h" />

include/geometry/BoundingBox.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_GEOMETRY_BOUNDING_BOX_H_INCLUDED_
+#define COVIDSIM_GEOMETRY_BOUNDING_BOX_H_INCLUDED_
 
 // Local headers
 #include "Vector2.h"
@@ -191,3 +192,5 @@ namespace CovidSim { namespace Geometry {
     }
   };
 }}
+
+#endif

include/geometry/Size.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_GEOMETRY_SIZE_H_INCLUDED_
+#define COVIDSIM_GEOMETRY_SIZE_H_INCLUDED_
 
 #include <cmath>
 #include "Vector2.h"
@@ -110,3 +111,5 @@ namespace CovidSim { namespace Geometry {
 		return Vector2<U>((U)this->width, (U)this->height);
 	}
 }}
+
+#endif

include/geometry/Vector2.h

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef COVIDSIM_GEOMETRY_VECTOR2_H_INCLUDED_
+#define COVIDSIM_GEOMETRY_VECTOR2_H_INCLUDED_
+
 
 #include <cmath>
 
@@ -150,3 +152,5 @@ namespace CovidSim { namespace Geometry {
 	Vector2d operator-(const Vector2d &left, const Vector2i &right);
 	Vector2d operator-(const Vector2i &left, const Vector2d &right);
 }}
+
+#endif

src/Direction.hpp

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_DIRECTION_HPP_INCLUDED_
+#define COVIDSIM_DIRECTION_HPP_INCLUDED_
 
 enum Direction {
 	Right = 0,
@@ -7,4 +8,6 @@ enum Direction {
 	Down    = 3
 };
 
-Direction rotate_left(Direction direction);
+Direction rotate_left(Direction direction);
+
+#endif

src/IndexList.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_INDEXLIST_H_INCLUDED_
+#define COVIDSIM_INDEXLIST_H_INCLUDED_
 
 /**
  * @brief Used for computing spatial interactions more efficiently.
@@ -7,4 +8,5 @@ struct IndexList
 {
 	int id;
 	float prob;
-};
+};
+#endif

src/InverseCdf.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_INVERSE_CDF_H_INCLUDED_
+#define COVIDSIM_INVERSE_CDF_H_INCLUDED_
 
 #include "Constants.h"
 
@@ -29,6 +30,4 @@ class InverseCdf
 	}
 };
 
-
-
-
+#endif

src/MicroCellPosition.hpp

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_MICRO_CELL_POSITION_HPP_INCLUDED_
+#define COVIDSIM_MICRO_CELL_POSITION_HPP_INCLUDED_
 
 #include "Direction.hpp"
 #include "Error.h"
@@ -20,3 +21,5 @@ struct MicroCellPosition
 		return *this;
 	}
 };
+
+#endif

src/Models/Cell.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_MODELS_CELL_H_INCLUDED_
+#define COVIDSIM_MODELS_CELL_H_INCLUDED_
 
 /**
  * @brief Holds microcells.
@@ -15,3 +16,5 @@ struct Cell
 	float tot_prob, *cum_trans, *max_trans;
 	short int CurInterv[MAX_INTERVENTION_TYPES];
 };
+
+#endif

src/Models/Household.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_MODELS_HOUSEHOLD_H_INCLUDED_
+#define COVIDSIM_MODELS_HOUSEHOLD_H_INCLUDED_
 
 #include "geometry/Vector2.h"
 
@@ -9,3 +10,5 @@ struct Household
 	unsigned short int nhr;
 	CovidSim::Geometry::Vector2f loc;
 };
+
+#endif

src/Models/Microcell.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_MODELS_MICRO_CELL_H_INCLUDED_
+#define COVIDSIM_MODELS_MICRO_CELL_H_INCLUDED_
 
 #include "../IndexList.h"
 
@@ -27,3 +28,5 @@ struct Microcell
 	unsigned short int vacc_start_time;
 	IndexList* AirportList;
 };
+
+#endif

src/Models/Person.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef COVIDSIM_MODELS_PERSON_H_INCLUDED_
+#define COVIDSIM_MODELS_PERSON_H_INCLUDED_
 
 #include <cstdint>
 #include <limits>
@@ -57,3 +58,5 @@ struct PersonQuarantine
 	// because it conflicts with the max() preprocessor macro in MSVC builds
 	PersonQuarantine() : comply(2), start_time((std::numeric_limits<uint16_t>::max)()-1) {} 
 };
+
+#endif