From d9a84c33d373770be692dc1a98a51608cbf4f9f5 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczepkowicz <arek.szczepkowicz@ng-analytics.com>
Date: Tue, 4 Jun 2024 14:29:35 +0200
Subject: [PATCH] #341: Update old header guards

---
 src/checkpoint/detector.h                    | 2 +-
 tests/unit/test_commons.h                    | 7 ++++---
 tests/unit/test_harness.h                    | 6 +++---
 tests/unit/test_kokkos_0d_commons.h          | 7 ++++---
 tests/unit/test_kokkos_1d_commons.h          | 7 ++++---
 tests/unit/test_kokkos_2d_commons.h          | 7 ++++---
 tests/unit/test_kokkos_3d_commons.h          | 7 ++++---
 tests/unit/test_kokkos_integration_commons.h | 7 ++++---
 tests/unit/tests_mpi/mpi-init.h              | 7 ++++---
 tests/unit/tests_mpi/test_commons_mpi.h      | 7 ++++---
 10 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/checkpoint/detector.h b/src/checkpoint/detector.h
index 128c651f..dad2855a 100644
--- a/src/checkpoint/detector.h
+++ b/src/checkpoint/detector.h
@@ -91,4 +91,4 @@ using is_detected_convertible = std::is_convertible<detected_t<Op, Args...>, T>;
 
 }  // end detection
 
-#endif /* INCLUDED_CHECKPOINT_DETECTOR_H */
+#endif /*INCLUDED_CHECKPOINT_DETECTOR_H*/
diff --git a/tests/unit/test_commons.h b/tests/unit/test_commons.h
index 568d6d03..41792e6f 100644
--- a/tests/unit/test_commons.h
+++ b/tests/unit/test_commons.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_COMMONS_H
-#define TEST_COMMONS_H
+
+#if !defined INCLUDED_UNIT_TEST_COMMONS_H
+#define INCLUDED_UNIT_TEST_COMMONS_H
 
 #include "test_harness.h"
 
@@ -179,4 +180,4 @@ std::unique_ptr<T> serializeAny(
 }
 } //end namespace
 
-#endif // TEST_COMMONS_H
+#endif /*INCLUDED_UNIT_TEST_COMMONS_H*/
diff --git a/tests/unit/test_harness.h b/tests/unit/test_harness.h
index 14aa4b11..61bee244 100644
--- a/tests/unit/test_harness.h
+++ b/tests/unit/test_harness.h
@@ -41,8 +41,8 @@
 //@HEADER
 */
 
-#if !defined INCLUDED_CHECKPOINT_TEST_HARNESS
-#define INCLUDED_CHECKPOINT_TEST_HARNESS
+#if !defined INCLUDED_UNIT_TEST_HARNESS_H
+#define INCLUDED_UNIT_TEST_HARNESS_H
 
 #include <gtest/gtest.h>
 
@@ -89,4 +89,4 @@ using TestHarness = TestHarnessAny<testing::Test>;
 
 }}} // end namespace checkpoint::tests::unit
 
-#endif /*INCLUDED_CHECKPOINT_TEST_HARNESS*/
+#endif /*INCLUDED_UNIT_TEST_HARNESS_H*/
diff --git a/tests/unit/test_kokkos_0d_commons.h b/tests/unit/test_kokkos_0d_commons.h
index 57db761f..79491099 100644
--- a/tests/unit/test_kokkos_0d_commons.h
+++ b/tests/unit/test_kokkos_0d_commons.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_KOKKOS_0D_COMMONS_H
-#define TEST_KOKKOS_0D_COMMONS_H
+
+#if !defined INCLUDED_UNIT_TEST_KOKKOS_0D_COMMONS_H
+#define INCLUDED_UNIT_TEST_KOKKOS_0D_COMMONS_H
 
 #include "test_commons.h"
 
@@ -76,4 +77,4 @@ using Test0DTypes = testing::Types<
 
 #endif
 
-#endif // TEST_KOKKOS_0D_COMMONS_H
+#endif /*INCLUDED_UNIT_TEST_KOKKOS_0D_COMMONS_H*/
diff --git a/tests/unit/test_kokkos_1d_commons.h b/tests/unit/test_kokkos_1d_commons.h
index bc8227e0..22c52a92 100644
--- a/tests/unit/test_kokkos_1d_commons.h
+++ b/tests/unit/test_kokkos_1d_commons.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_KOKKOS_1D_COMMONS_H
-#define TEST_KOKKOS_1D_COMMONS_H
+
+#if !defined INCLUDED_UNIT_TEST_KOKKOS_1D_COMMONS_H
+#define INCLUDED_UNIT_TEST_KOKKOS_1D_COMMONS_H
 
 #include "test_commons.h"
 
@@ -185,4 +186,4 @@ using DynRankViewTestTypes = testing::Types<
 
 #endif
 
-#endif // TEST_KOKKOS_1D_COMMONS_H
+#endif /*INCLUDED_UNIT_TEST_KOKKOS_1D_COMMONS_H*/
diff --git a/tests/unit/test_kokkos_2d_commons.h b/tests/unit/test_kokkos_2d_commons.h
index 9de9e68a..95e48c3b 100644
--- a/tests/unit/test_kokkos_2d_commons.h
+++ b/tests/unit/test_kokkos_2d_commons.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_KOKKOS_2D_COMMONS_H
-#define TEST_KOKKOS_2D_COMMONS_H
+
+#if !defined INCLUDED_UNIT_TEST_KOKKOS_2D_COMMONS_H
+#define INCLUDED_UNIT_TEST_KOKKOS_2D_COMMONS_H
 
 #include "test_commons.h"
 
@@ -154,4 +155,4 @@ using Test2DConstTypesStride =
 
 #endif
 
-#endif // TEST_KOKKOS_2D_COMMONS_H
+#endif /*INCLUDED_UNIT_TEST_KOKKOS_2D_COMMONS_H*/
diff --git a/tests/unit/test_kokkos_3d_commons.h b/tests/unit/test_kokkos_3d_commons.h
index fd61fba4..f4710445 100644
--- a/tests/unit/test_kokkos_3d_commons.h
+++ b/tests/unit/test_kokkos_3d_commons.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_KOKKOS_3D_COMMONS_H
-#define TEST_KOKKOS_3D_COMMONS_H
+
+#if !defined INCLUDED_UNIT_TEST_KOKKOS_3D_COMMONS_H
+#define INCLUDED_UNIT_TEST_KOKKOS_3D_COMMONS_H
 
 #include "test_commons.h"
 
@@ -191,4 +192,4 @@ TYPED_TEST_P(KokkosViewTest3D, test_3d_any) {
   }
 }
 
-#endif // TEST_KOKKOS_3D_COMMONS_H
+#endif /*INCLUDED_UNIT_TEST_KOKKOS_3D_COMMONS_H*/
diff --git a/tests/unit/test_kokkos_integration_commons.h b/tests/unit/test_kokkos_integration_commons.h
index a97243fa..39bfe427 100644
--- a/tests/unit/test_kokkos_integration_commons.h
+++ b/tests/unit/test_kokkos_integration_commons.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_KOKKOS_INTEGRATION_COMMONS_H
-#define TEST_KOKKOS_INTEGRATION_COMMONS_H
+
+#if !defined INCLUDED_UNIT_TEST_KOKKOS_INTEGRATION_COMMONS_H
+#define INCLUDED_UNIT_TEST_KOKKOS_INTEGRATION_COMMONS_H
 
 #include "test_harness.h"
 #include "test_commons.h"
@@ -272,4 +273,4 @@ struct Data : BaseData {
 
 struct KokkosBaseTest : virtual testing::Test { };
 
-#endif // TEST_KOKKOS_INTEGRATION_COMMONS_H
+#endif /*INCLUDED_UNIT_TEST_KOKKOS_INTEGRATION_COMMONS_H*/
diff --git a/tests/unit/tests_mpi/mpi-init.h b/tests/unit/tests_mpi/mpi-init.h
index 6917f573..10d26d51 100644
--- a/tests/unit/tests_mpi/mpi-init.h
+++ b/tests/unit/tests_mpi/mpi-init.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef MPIINIT_H
-#define MPIINIT_H
+
+#if !defined INCLUDED_UNIT_TESTS_MPI_MPI_INIT_H
+#define INCLUDED_UNIT_TESTS_MPI_MPI_INIT_H
 
 #include <gtest/gtest.h>
 #include <test_harness.h>
@@ -94,4 +95,4 @@ class MPIEnvironment : public ::testing::Environment
 
 };
 
-#endif // MPIINIT_H
+#endif /*INCLUDED_UNIT_TESTS_MPI_MPI_INIT_H*/
diff --git a/tests/unit/tests_mpi/test_commons_mpi.h b/tests/unit/tests_mpi/test_commons_mpi.h
index e5324a58..a48173ed 100644
--- a/tests/unit/tests_mpi/test_commons_mpi.h
+++ b/tests/unit/tests_mpi/test_commons_mpi.h
@@ -40,8 +40,9 @@
 // *****************************************************************************
 //@HEADER
 */
-#ifndef TEST_COMMONS_MPI_H
-#define TEST_COMMONS_MPI_H
+
+#if !defined INCLUDED_UNIT_TESTS_MPI_TEST_COMMONS_MPI_H
+#define INCLUDED_UNIT_TESTS_MPI_TEST_COMMONS_MPI_H
 
 #include "test_commons.h"
 #include "test_kokkos_0d_commons.h"
@@ -88,4 +89,4 @@ void serializeAnyMPI(T& view, std::function<void(T const&,T const&)> compare) {
 }
 } // end namespace
 
-#endif // TEST_COMMONS_MPI_H
+#endif /*INCLUDED_UNIT_TESTS_MPI_TEST_COMMONS_MPI_H*/