From 79d212d577305dfcc7c99db279876a8de947b5ea Mon Sep 17 00:00:00 2001
From: Harriet Brown <harriet.brown@stfc.ac.uk>
Date: Fri, 6 Mar 2020 13:02:47 +0000
Subject: [PATCH] Replace header guards in LiveData with pragma once

This commit replaces all header guards in LiveData with #pragma once
---
 Framework/LiveData/inc/MantidLiveData/ADARA/ADARA.h    |  5 +----
 .../LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h   |  5 +----
 .../LiveData/inc/MantidLiveData/ADARA/ADARAParser.h    |  5 +----
 Framework/LiveData/inc/MantidLiveData/Exception.h      |  5 +----
 .../inc/MantidLiveData/FakeEventDataListener.h         |  5 +----
 .../inc/MantidLiveData/FileEventDataListener.h         |  5 +----
 .../inc/MantidLiveData/ISIS/FakeISISEventDAE.h         |  5 +----
 .../inc/MantidLiveData/ISIS/FakeISISHistoDAE.h         |  5 +----
 .../inc/MantidLiveData/ISIS/ISISHistoDataListener.h    |  5 +----
 .../MantidLiveData/ISIS/ISISLiveEventDataListener.h    |  5 +----
 .../inc/MantidLiveData/ISIS/TCPEventStreamDefs.h       |  6 ++----
 .../LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h   |  5 +----
 .../inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h     |  6 ++----
 .../inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h  |  5 +----
 .../LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h    |  5 +----
 .../inc/MantidLiveData/Kafka/KafkaEventListener.h      |  5 +----
 .../inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h |  5 +----
 .../inc/MantidLiveData/Kafka/KafkaHistoListener.h      |  5 +----
 .../inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h |  5 +----
 .../inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h    |  5 +----
 .../LiveData/inc/MantidLiveData/LiveDataAlgorithm.h    |  5 +----
 Framework/LiveData/inc/MantidLiveData/LoadLiveData.h   |  5 +----
 .../LiveData/inc/MantidLiveData/MonitorLiveData.h      |  5 +----
 .../LiveData/inc/MantidLiveData/PrecompiledHeader.h    |  5 +----
 .../inc/MantidLiveData/SNSLiveEventDataListener.h      |  5 +----
 Framework/LiveData/inc/MantidLiveData/StartLiveData.h  |  5 +----
 Framework/LiveData/src/ISIS/DAE/idc.h                  |  5 +----
 Framework/LiveData/src/ISIS/DAE/isisds_command.h       |  5 +----
 .../Kafka/private/Schema/ai34_det_counts_generated.h   |  5 +----
 .../Kafka/private/Schema/df12_det_spec_map_generated.h |  5 +----
 .../private/Schema/dtdb_adc_pulse_debug_generated.h    |  5 +----
 .../src/Kafka/private/Schema/ev42_events_generated.h   |  5 +----
 .../src/Kafka/private/Schema/f142_logdata_generated.h  |  5 +----
 .../src/Kafka/private/Schema/flatbuffers/base.h        |  6 ++----
 .../src/Kafka/private/Schema/flatbuffers/flatbuffers.h |  5 +----
 .../Kafka/private/Schema/flatbuffers/stl_emulation.h   |  5 +----
 .../private/Schema/fwdi_forwarder_internal_generated.h |  5 +----
 .../private/Schema/hs00_event_histogram_generated.h    |  5 +----
 .../Kafka/private/Schema/is84_isis_events_generated.h  |  5 +----
 .../Kafka/private/Schema/tdct_timestamps_generated.h   |  5 +----
 .../src/Kafka/private/Schema/y2gw_run_info_generated.h |  5 +----
 Framework/LiveData/test/ADARAPacketTest.h              |  5 +----
 Framework/LiveData/test/ADARAPackets.h                 | 10 +---------
 Framework/LiveData/test/FakeEventDataListenerTest.h    |  5 +----
 Framework/LiveData/test/FileEventDataListenerTest.h    |  5 +----
 Framework/LiveData/test/ISISHistoDataListenerTest.h    |  5 +----
 Framework/LiveData/test/KafkaEventStreamDecoderTest.h  |  5 +----
 Framework/LiveData/test/KafkaHistoStreamDecoderTest.h  |  5 +----
 Framework/LiveData/test/KafkaTesting.h                 |  5 +----
 Framework/LiveData/test/KafkaTopicSubscriberTest.h     |  5 +----
 Framework/LiveData/test/LiveDataAlgorithmTest.h        |  5 +----
 Framework/LiveData/test/LoadLiveDataTest.h             |  5 +----
 Framework/LiveData/test/MonitorLiveDataTest.h          |  5 +----
 Framework/LiveData/test/SNSLiveEventDataListenerTest.h |  5 +----
 Framework/LiveData/test/StartLiveDataTest.h            |  5 +----
 Framework/LiveData/test/TestDataListener.h             |  5 +----
 Framework/LiveData/test/TestGroupDataListener.h        |  5 +----
 57 files changed, 60 insertions(+), 233 deletions(-)

diff --git a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARA.h b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARA.h
index a8bec6329f9..9e7ffa447ea 100644
--- a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARA.h
+++ b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARA.h
@@ -1,5 +1,4 @@
-#ifndef __ADARA_H
-#define __ADARA_H
+#pragma once
 
 //
 // SNS ADARA SYSTEM - Common Library
@@ -205,5 +204,3 @@ public:
 enum { EPICS_EPOCH_OFFSET = 631152000 };
 
 } /* namespace ADARA */
-
-#endif /* __ADARA_H */
diff --git a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
index 7b118d6c300..fbe9f0cd19a 100644
--- a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
+++ b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef __ADARA_PACKETS_H
-#define __ADARA_PACKETS_H
+#pragma once
 
 #include <cstdint>
 #include <cstring>
@@ -752,5 +751,3 @@ private:
 };
 
 } // namespace ADARA
-
-#endif /* __ADARA_PACKETS_H */
diff --git a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h
index f25b91e9d14..b1a2b2d3dc3 100644
--- a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h
+++ b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAParser.h
@@ -1,5 +1,4 @@
-#ifndef __ADARA_PARSER_H
-#define __ADARA_PARSER_H
+#pragma once
 
 #include <cstdint>
 #include <map>
@@ -196,5 +195,3 @@ private:
 };
 
 } // namespace ADARA
-
-#endif /* __ADARA_PARSER_H */
diff --git a/Framework/LiveData/inc/MantidLiveData/Exception.h b/Framework/LiveData/inc/MantidLiveData/Exception.h
index 6194ad05161..6201c01339b 100644
--- a/Framework/LiveData/inc/MantidLiveData/Exception.h
+++ b/Framework/LiveData/inc/MantidLiveData/Exception.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_EXCEPTION_H_
-#define MANTID_LIVEDATA_EXCEPTION_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -34,5 +33,3 @@ public:
 } // namespace Exception
 } // namespace LiveData
 } // namespace Mantid
-
-#endif // MANTID_LIVEDATA_EXCEPTION_H_
diff --git a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
index 608aeefa423..25580388434 100644
--- a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_FAKEEVENTDATALISTENER_H_
-#define MANTID_LIVEDATA_FAKEEVENTDATALISTENER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -71,5 +70,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_FAKEEVENTDATALISTENER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
index fbc2d60623f..1b4610cff7e 100644
--- a/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_FILEEVENTDATALISTENER_H_
-#define MANTID_LIVEDATA_FILEEVENTDATALISTENER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -70,5 +69,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_FILEEVENTDATALISTENER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISEventDAE.h b/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISEventDAE.h
index c2ab438c1f1..f69ecf450db 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISEventDAE.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISEventDAE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_FAKEISISEVENTDAE_H_
-#define MANTID_LIVEDATA_FAKEISISEVENTDAE_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -44,5 +43,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /*MANTID_LIVEDATA_FAKEEventSHISTODAE_H_*/
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h b/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h
index 7e69bb37866..1c82f0d4a65 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/FakeISISHistoDAE.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_FAKEISISHISTODAE_H_
-#define MANTID_LIVEDATA_FAKEISISHISTODAE_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -51,5 +50,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /*MANTID_LIVEDATA_FAKEISISHISTODAE_H_*/
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h
index 2d74f087bf3..f4166f1ad92 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ISISHISTODATALISTENER_H_
-#define MANTID_LIVEDATA_ISISHISTODATALISTENER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -127,5 +126,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_ISISHISTODATALISTENER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h
index 9c16f05a281..d632e08f2e3 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ISISLIVEEVENTDATALISTENER_H_
-#define MANTID_LIVEDATA_ISISLIVEEVENTDATALISTENER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -218,5 +217,3 @@ protected:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /*MANTID_LIVEDATA_ISISLIVEEVENTDATALISTENER_H_*/
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h b/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
index a958d442084..ec3e2c6a63c 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef TCP_EVENT_STREAM_DEFS_H
-#define TCP_EVENT_STREAM_DEFS_H
+#pragma once
 
 #include "MantidKernel/WarningSuppressions.h"
 
@@ -195,5 +194,4 @@ struct TCPStreamEventDataSE {
 } // namespace LiveData
 } // namespace Mantid
 
-GNU_DIAG_ON("type-limits")
-#endif /* TCP_EVENT_STREAM_DEFS_H */
+GNU_DIAG_ON("type-limits")
\ No newline at end of file
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h
index 56d30af5967..5224cd0526f 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaBroker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_IKAFKABROKER_H_
-#define MANTID_LIVEDATA_IKAFKABROKER_H_
+#pragma once
 
 #include "MantidLiveData/Kafka/IKafkaStreamSubscriber.h"
 #include <memory>
@@ -32,5 +31,3 @@ public:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_IKAFKABROKER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h
index 722981f8d7c..53526b8efe9 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamDecoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_IKAFKASTREAMDECODER_H_
-#define MANTID_LIVEDATA_IKAFKASTREAMDECODER_H_
+#pragma once
 
 #include "MantidAPI/SpectraDetectorTypes.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -242,5 +241,4 @@ protected:
   std::string getDetSpecMapForRun(const RunStartStruct &runStartStruct);
 };
 } // namespace LiveData
-} // namespace Mantid
-#endif // MANTID_LIVEDATA_IKAFKASTREAMDECODER_H_
+} // namespace Mantid
\ No newline at end of file
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h
index 9543b15db08..65cae78fb72 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/IKafkaStreamSubscriber.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_IKAFKASTREAMSUBSCRIBER_H_
-#define MANTID_LIVEDATA_IKAFKASTREAMSUBSCRIBER_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include <string>
@@ -45,5 +44,3 @@ public:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_IKAFKASTREAMSUBSCRIBER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h
index 12fb4b74e1b..37af94fa1fd 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaBroker.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKABROKER_H_
-#define MANTID_LIVEDATA_KAFKABROKER_H_
+#pragma once
 
 #include "MantidLiveData/Kafka/IKafkaBroker.h"
 
@@ -32,5 +31,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_KAFKABROKER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
index 59f4a3b5060..773d3f55076 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKAEVENTLISTENER_H_
-#define MANTID_LIVEDATA_KAFKAEVENTLISTENER_H_
+#pragma once
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
@@ -71,5 +70,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /*MANTID_LIVEDATA_KAFKAEVENTLISTENER_H_*/
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
index dad15c81599..bc9166bb94a 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKAEVENTSTREAMDECODER_H_
-#define MANTID_LIVEDATA_KAFKAEVENTSTREAMDECODER_H_
+#pragma once
 
 #include "MantidAPI/SpectraDetectorTypes.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -90,5 +89,3 @@ DLLExport std::vector<size_t> computeGroupBoundaries(
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_KAFKAEVENTSTREAMDECODER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h
index b87aa173543..f7c6b0f0c15 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ISISKAFKAHISTOLISTENER_H_
-#define MANTID_LIVEDATA_ISISKAFKAHISTOLISTENER_H_
+#pragma once
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
@@ -63,5 +62,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /*MANTID_LIVEDATA_ISISKAFKAHISTOLISTENER_H_*/
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h
index 2608a036f6e..b21c992a042 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaHistoStreamDecoder.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ISISKAFKAHISTOSTREAMDECODER_H_
-#define MANTID_LIVEDATA_ISISKAFKAHISTOSTREAMDECODER_H_
+#pragma once
 
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidLiveData/Kafka/IKafkaBroker.h"
@@ -54,5 +53,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_ISISKAFKAHISTOSTREAMDECODER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h
index 4d74fa43b5b..554d04fe95c 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaTopicSubscriber.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKAEVENTSUBSCRIBER_H_
-#define MANTID_LIVEDATA_KAFKAEVENTSUBSCRIBER_H_
+#pragma once
 
 #include "MantidLiveData/Kafka/IKafkaStreamSubscriber.h"
 #include <librdkafka/rdkafkacpp.h>
@@ -73,5 +72,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_KAFKAEVENTSUBSCRIBER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
index 0a83ec81188..bbc978fd02c 100644
--- a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
+++ b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_LIVEDATAALGORITHM_H_
-#define MANTID_LIVEDATA_LIVEDATAALGORITHM_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/ILiveListener.h"
@@ -51,5 +50,3 @@ protected:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_LIVEDATAALGORITHM_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h b/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
index 45b8ee4c719..d4ef9927e3c 100644
--- a/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
+++ b/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_LOADLIVEDATA_H_
-#define MANTID_LIVEDATA_LOADLIVEDATA_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/Workspace_fwd.h"
@@ -62,5 +61,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_LOADLIVEDATA_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h b/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
index 74697c2c271..c90bb568f97 100644
--- a/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
+++ b/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_MONITORLIVEDATA_H_
-#define MANTID_LIVEDATA_MONITORLIVEDATA_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidLiveData/DllConfig.h"
@@ -44,5 +43,3 @@ public:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_MONITORLIVEDATA_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/PrecompiledHeader.h b/Framework/LiveData/inc/MantidLiveData/PrecompiledHeader.h
index 29063241b26..7bbfdd105f0 100644
--- a/Framework/LiveData/inc/MantidLiveData/PrecompiledHeader.h
+++ b/Framework/LiveData/inc/MantidLiveData/PrecompiledHeader.h
@@ -4,10 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_PRECOMPILEDHEADER_H_
-#define MANTID_LIVEDATA_PRECOMPILEDHEADER_H_
+#pragma once
 
 // Algorithm
 #include "MantidAPI/Algorithm.h"
-
-#endif // MANTID_LIVEDATA_PRECOMPILEDHEADER_H_
diff --git a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
index 71ba12e70bb..24d4dc44806 100644
--- a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_SNSLIVEEVENTDATALISTENER_H_
-#define MANTID_LIVEDATA_SNSLIVEEVENTDATALISTENER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -213,5 +212,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_FAKEEVENTDATALISTENER_H_ */
diff --git a/Framework/LiveData/inc/MantidLiveData/StartLiveData.h b/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
index 00a7664d0d4..2445616c116 100644
--- a/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
+++ b/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_STARTLIVEDATA_H_
-#define MANTID_LIVEDATA_STARTLIVEDATA_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidLiveData/DllConfig.h"
@@ -50,5 +49,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_STARTLIVEDATA_H_ */
diff --git a/Framework/LiveData/src/ISIS/DAE/idc.h b/Framework/LiveData/src/ISIS/DAE/idc.h
index c55552a1fde..5d3c15ac9fc 100644
--- a/Framework/LiveData/src/ISIS/DAE/idc.h
+++ b/Framework/LiveData/src/ISIS/DAE/idc.h
@@ -1,5 +1,4 @@
-#ifndef IDC_H
-#define IDC_H
+#pragma once
 /**
 
     @file idc.h
@@ -118,5 +117,3 @@ int IDCreport(int status, int code, const char *format, ...);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* IDC_H */
diff --git a/Framework/LiveData/src/ISIS/DAE/isisds_command.h b/Framework/LiveData/src/ISIS/DAE/isisds_command.h
index 145e9493c93..ec93de920c1 100644
--- a/Framework/LiveData/src/ISIS/DAE/isisds_command.h
+++ b/Framework/LiveData/src/ISIS/DAE/isisds_command.h
@@ -17,8 +17,7 @@
 
 ///@cond nodoc
 
-#ifndef ISISDS_COMMAND_H
-#define ISISDS_COMMAND_H
+#pragma once
 
 using isisds_error_report_t = void (*)(int, int, const char *);
 
@@ -71,5 +70,3 @@ int isisds_report(int status, int code, const char *format, ...);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif /* ISISDS_COMMAND_H */
diff --git a/Framework/LiveData/src/Kafka/private/Schema/ai34_det_counts_generated.h b/Framework/LiveData/src/Kafka/private/Schema/ai34_det_counts_generated.h
index a5113b2b2db..155bbc15a42 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/ai34_det_counts_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/ai34_det_counts_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_AI34DETCOUNTS_H_
-#define FLATBUFFERS_GENERATED_AI34DETCOUNTS_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -137,5 +136,3 @@ inline void FinishSizePrefixedPulseImageBuffer(
     flatbuffers::Offset<PulseImage> root) {
   fbb.FinishSizePrefixed(root, PulseImageIdentifier());
 }
-
-#endif  // FLATBUFFERS_GENERATED_AI34DETCOUNTS_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/df12_det_spec_map_generated.h b/Framework/LiveData/src/Kafka/private/Schema/df12_det_spec_map_generated.h
index 653d64c75b3..0756ea4a7b3 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/df12_det_spec_map_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/df12_det_spec_map_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_DF12DETSPECMAP_H_
-#define FLATBUFFERS_GENERATED_DF12DETSPECMAP_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -137,5 +136,3 @@ inline void FinishSizePrefixedSpectraDetectorMappingBuffer(
     flatbuffers::Offset<SpectraDetectorMapping> root) {
   fbb.FinishSizePrefixed(root, SpectraDetectorMappingIdentifier());
 }
-
-#endif  // FLATBUFFERS_GENERATED_DF12DETSPECMAP_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/dtdb_adc_pulse_debug_generated.h b/Framework/LiveData/src/Kafka/private/Schema/dtdb_adc_pulse_debug_generated.h
index 919ce08b6b3..ef160b9d01f 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/dtdb_adc_pulse_debug_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/dtdb_adc_pulse_debug_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_DTDBADCPULSEDEBUG_H_
-#define FLATBUFFERS_GENERATED_DTDBADCPULSEDEBUG_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -127,5 +126,3 @@ inline flatbuffers::Offset<AdcPulseDebug> CreateAdcPulseDebugDirect(
       threshold_time ? _fbb.CreateVector<uint64_t>(*threshold_time) : 0,
       peak_time ? _fbb.CreateVector<uint64_t>(*peak_time) : 0);
 }
-
-#endif  // FLATBUFFERS_GENERATED_DTDBADCPULSEDEBUG_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/ev42_events_generated.h b/Framework/LiveData/src/Kafka/private/Schema/ev42_events_generated.h
index eb82e270f8b..9f3d6b611c5 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/ev42_events_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/ev42_events_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_EV42EVENTS_H_
-#define FLATBUFFERS_GENERATED_EV42EVENTS_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -293,5 +292,3 @@ inline void FinishSizePrefixedEventMessageBuffer(
     flatbuffers::Offset<EventMessage> root) {
   fbb.FinishSizePrefixed(root, EventMessageIdentifier());
 }
-
-#endif  // FLATBUFFERS_GENERATED_EV42EVENTS_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/f142_logdata_generated.h b/Framework/LiveData/src/Kafka/private/Schema/f142_logdata_generated.h
index 70ab14ed2d8..e27a36d05d4 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/f142_logdata_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/f142_logdata_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_F142LOGDATA_H_
-#define FLATBUFFERS_GENERATED_F142LOGDATA_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -1811,5 +1810,3 @@ inline void FinishSizePrefixedLogDataBuffer(
   fbb.FinishSizePrefixed(root, LogDataIdentifier());
 }
 }
-
-#endif  // FLATBUFFERS_GENERATED_F142LOGDATA_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/base.h b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/base.h
index 3045bc9db94..3e194f3bca4 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/base.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/base.h
@@ -1,5 +1,4 @@
-#ifndef FLATBUFFERS_BASE_H_
-#define FLATBUFFERS_BASE_H_
+#pragma once
 
 // clang-format off
 #if defined(FLATBUFFERS_MEMORY_LEAK_TRACKING) && \
@@ -277,5 +276,4 @@ inline size_t PaddingBytes(size_t buf_size, size_t scalar_size) {
   return ((~buf_size) + 1) & (scalar_size - 1);
 }
 
-}  // namespace flatbuffers
-#endif  // FLATBUFFERS_BASE_H_
+}  // namespace flatbuffers
\ No newline at end of file
diff --git a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h
index 36f71c57d77..ca05b405e0b 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/flatbuffers.h
@@ -16,8 +16,7 @@
 
 // clang-format off
 
-#ifndef FLATBUFFERS_H_
-#define FLATBUFFERS_H_
+#pragma once
 
 #include "base.h"
 
@@ -2483,5 +2482,3 @@ volatile __attribute__((weak)) const char *flatbuffer_version_string =
 }  // namespace flatbuffers
 
 // clang-format on
-
-#endif // FLATBUFFERS_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/stl_emulation.h b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/stl_emulation.h
index 59666122a9a..f3bfb93fe20 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/stl_emulation.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/flatbuffers/stl_emulation.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef FLATBUFFERS_STL_EMULATION_H_
-#define FLATBUFFERS_STL_EMULATION_H_
+#pragma once
 
 // clang-format off
 
@@ -234,5 +233,3 @@ inline void vector_emplace_back(std::vector<T> *vector, V &&data) {
 #endif  // !FLATBUFFERS_CPP98_STL
 
 }  // namespace flatbuffers
-
-#endif  // FLATBUFFERS_STL_EMULATION_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/fwdi_forwarder_internal_generated.h b/Framework/LiveData/src/Kafka/private/Schema/fwdi_forwarder_internal_generated.h
index 47352549e8d..b3768219368 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/fwdi_forwarder_internal_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/fwdi_forwarder_internal_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_FWDIFORWARDERINTERNAL_H_
-#define FLATBUFFERS_GENERATED_FWDIFORWARDERINTERNAL_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -184,5 +183,3 @@ inline bool Verifyforwarder_internalVector(flatbuffers::Verifier &verifier, cons
   }
   return true;
 }
-
-#endif  // FLATBUFFERS_GENERATED_FWDIFORWARDERINTERNAL_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/hs00_event_histogram_generated.h b/Framework/LiveData/src/Kafka/private/Schema/hs00_event_histogram_generated.h
index cb2b43fef9e..6c493177734 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/hs00_event_histogram_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/hs00_event_histogram_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_HS00EVENTHISTOGRAM_H_
-#define FLATBUFFERS_GENERATED_HS00EVENTHISTOGRAM_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -799,5 +798,3 @@ inline void FinishSizePrefixedEventHistogramBuffer(
   fbb.FinishSizePrefixed(root, EventHistogramIdentifier());
 }
 }
-
-#endif  // FLATBUFFERS_GENERATED_HS00EVENTHISTOGRAM_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/is84_isis_events_generated.h b/Framework/LiveData/src/Kafka/private/Schema/is84_isis_events_generated.h
index 9c590c7e825..df79562d5c0 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/is84_isis_events_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/is84_isis_events_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_IS84ISISEVENTS_H_
-#define FLATBUFFERS_GENERATED_IS84ISISEVENTS_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -109,5 +108,3 @@ inline flatbuffers::Offset<ISISData> CreateISISData(
   builder_.add_run_state(run_state);
   return builder_.Finish();
 }
-
-#endif  // FLATBUFFERS_GENERATED_IS84ISISEVENTS_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/tdct_timestamps_generated.h b/Framework/LiveData/src/Kafka/private/Schema/tdct_timestamps_generated.h
index b94f5e5816d..fcdc732224b 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/tdct_timestamps_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/tdct_timestamps_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_TDCTTIMESTAMPS_H_
-#define FLATBUFFERS_GENERATED_TDCTTIMESTAMPS_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -139,5 +138,3 @@ inline void FinishSizePrefixedtimestampBuffer(
     flatbuffers::Offset<timestamp> root) {
   fbb.FinishSizePrefixed(root, timestampIdentifier());
 }
-
-#endif  // FLATBUFFERS_GENERATED_TDCTTIMESTAMPS_H_
diff --git a/Framework/LiveData/src/Kafka/private/Schema/y2gw_run_info_generated.h b/Framework/LiveData/src/Kafka/private/Schema/y2gw_run_info_generated.h
index 73c52edc0b4..9ddc3e27a75 100644
--- a/Framework/LiveData/src/Kafka/private/Schema/y2gw_run_info_generated.h
+++ b/Framework/LiveData/src/Kafka/private/Schema/y2gw_run_info_generated.h
@@ -2,8 +2,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 
-#ifndef FLATBUFFERS_GENERATED_Y2GWRUNINFO_H_
-#define FLATBUFFERS_GENERATED_Y2GWRUNINFO_H_
+#pragma once
 
 #include "flatbuffers/flatbuffers.h"
 
@@ -393,5 +392,3 @@ inline void FinishSizePrefixedRunInfoBuffer(
     flatbuffers::Offset<RunInfo> root) {
   fbb.FinishSizePrefixed(root, RunInfoIdentifier());
 }
-
-#endif  // FLATBUFFERS_GENERATED_Y2GWRUNINFO_H_
diff --git a/Framework/LiveData/test/ADARAPacketTest.h b/Framework/LiveData/test/ADARAPacketTest.h
index 27662f4d980..3fad6ea8865 100644
--- a/Framework/LiveData/test/ADARAPacketTest.h
+++ b/Framework/LiveData/test/ADARAPacketTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ADARAPACKETTEST_H_
-#define MANTID_LIVEDATA_ADARAPACKETTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -288,5 +287,3 @@ private:
     return (((pulseId >> 32) == high) && ((pulseId & 0xFFFFFFFF) == low));
   }
 };
-
-#endif /* MANTID_LIVEDATA_ADARAPACKETTEST_H_ */
diff --git a/Framework/LiveData/test/ADARAPackets.h b/Framework/LiveData/test/ADARAPackets.h
index d3c3646d1e0..c1411a7a545 100644
--- a/Framework/LiveData/test/ADARAPackets.h
+++ b/Framework/LiveData/test/ADARAPackets.h
@@ -4,13 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ADARAPACKETS_H_
-#define MANTID_LIVEDATA_ADARAPACKETS_H_
-
-#ifndef MANTID_LIVEDATA_ADARAPACKETTEST_H_
-#error                                                                         \
-    "This file should only be included by MantidLiveData/test/AdaraPacketTest.h"
-#endif
+#pragma once
 
 // This file includes sample packets for the AdaraPacketTest unit test. It's
 // intended to be included by ADARAPacketTest.h (but outside of the class
@@ -310,5 +304,3 @@ const unsigned char devDesPacket[2600] = {
     0x2f, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x76, 0x61, 0x72,
     0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x3e, 0x0a, 0x3c, 0x2f, 0x64, 0x65,
     0x76, 0x69, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00};
-
-#endif /* MANTID_LIVEDATA_ADARAPACKETS_H_ */
diff --git a/Framework/LiveData/test/FakeEventDataListenerTest.h b/Framework/LiveData/test/FakeEventDataListenerTest.h
index 94217ce7cfc..fa488d9a96b 100644
--- a/Framework/LiveData/test/FakeEventDataListenerTest.h
+++ b/Framework/LiveData/test/FakeEventDataListenerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_FAKEEVENTDATALISTENERTEST_H_
-#define MANTID_LIVEDATA_FAKEEVENTDATALISTENERTEST_H_
+#pragma once
 
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -103,5 +102,3 @@ public:
 private:
   boost::shared_ptr<ILiveListener> fakel;
 };
-
-#endif /* MANTID_LIVEDATA_FAKEEVENTDATALISTENERTEST_H_ */
diff --git a/Framework/LiveData/test/FileEventDataListenerTest.h b/Framework/LiveData/test/FileEventDataListenerTest.h
index 1499b59d57a..b44ef382185 100644
--- a/Framework/LiveData/test/FileEventDataListenerTest.h
+++ b/Framework/LiveData/test/FileEventDataListenerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_FILEEVENTDATALISTENERTEST_H_
-#define MANTID_LIVEDATA_FILEEVENTDATALISTENERTEST_H_
+#pragma once
 
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidDataObjects/EventWorkspace.h"
@@ -78,5 +77,3 @@ public:
     TS_ASSERT_THROWS(listener->extractData(), const std::runtime_error &)
   }
 };
-
-#endif /* MANTID_LIVEDATA_FILEEVENTDATALISTENERTEST_H_ */
diff --git a/Framework/LiveData/test/ISISHistoDataListenerTest.h b/Framework/LiveData/test/ISISHistoDataListenerTest.h
index 1aab075aa0e..d2bf6a15161 100644
--- a/Framework/LiveData/test/ISISHistoDataListenerTest.h
+++ b/Framework/LiveData/test/ISISHistoDataListenerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ISISHISTODATALISTENERTEST_H_
-#define MANTID_LIVEDATA_ISISHISTODATALISTENERTEST_H_
+#pragma once
 
 #include "MantidAPI/Algorithm.h"
 #include "MantidAPI/AnalysisDataService.h"
@@ -426,5 +425,3 @@ public:
 #endif
   }
 };
-
-#endif /* MANTID_LIVEDATA_ISISHISTODATALISTENERTEST_H_ */
diff --git a/Framework/LiveData/test/KafkaEventStreamDecoderTest.h b/Framework/LiveData/test/KafkaEventStreamDecoderTest.h
index ccee694011b..6868ba59a28 100644
--- a/Framework/LiveData/test/KafkaEventStreamDecoderTest.h
+++ b/Framework/LiveData/test/KafkaEventStreamDecoderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKAEVENTSTREAMDECODERTEST_H_
-#define MANTID_LIVEDATA_KAFKAEVENTSTREAMDECODERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -599,5 +598,3 @@ private:
   std::condition_variable m_callbackCondition;
   uint8_t m_niterations = 0;
 };
-
-#endif /* MANTID_LIVEDATA_KAFKAEVENTSTREAMDECODERTEST_H_ */
diff --git a/Framework/LiveData/test/KafkaHistoStreamDecoderTest.h b/Framework/LiveData/test/KafkaHistoStreamDecoderTest.h
index 4ebf592ae84..bfe8bb97fec 100644
--- a/Framework/LiveData/test/KafkaHistoStreamDecoderTest.h
+++ b/Framework/LiveData/test/KafkaHistoStreamDecoderTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKAHISTOSTREAMDECODERTEST_H_
-#define MANTID_LIVEDATA_KAFKAHISTOSTREAMDECODERTEST_H_
+#pragma once
 
 #include <cxxtest/TestSuite.h>
 
@@ -185,5 +184,3 @@ private:
   std::condition_variable m_callbackCondition;
   uint8_t m_niterations = 0;
 };
-
-#endif /* MANTID_LIVEDATA_KAFKAHISTOSTREAMDECODERTEST_H_ */
diff --git a/Framework/LiveData/test/KafkaTesting.h b/Framework/LiveData/test/KafkaTesting.h
index a214d0c3e38..b13d76a6108 100644
--- a/Framework/LiveData/test/KafkaTesting.h
+++ b/Framework/LiveData/test/KafkaTesting.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_ISISKAFKATESTING_H_
-#define MANTID_LIVEDATA_ISISKAFKATESTING_H_
+#pragma once
 
 #include "MantidKernel/DateAndTimeHelpers.h"
 #include "MantidKernel/WarningSuppressions.h"
@@ -756,5 +755,3 @@ private:
   std::vector<int32_t> m_detid = {1001, 1002, 1100, 901000, 10100};
 };
 } // namespace KafkaTesting
-
-#endif // MANTID_LIVEDATA_ISISKAFKAEVENTSTREAMDECODERTESTMOCKS_H_
diff --git a/Framework/LiveData/test/KafkaTopicSubscriberTest.h b/Framework/LiveData/test/KafkaTopicSubscriberTest.h
index 4342a153431..4f01924026f 100644
--- a/Framework/LiveData/test/KafkaTopicSubscriberTest.h
+++ b/Framework/LiveData/test/KafkaTopicSubscriberTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_KAFKATOPICSUBSCRIBERTEST_H_
-#define MANTID_LIVEDATA_KAFKATOPICSUBSCRIBERTEST_H_
+#pragma once
 
 #include "MantidLiveData/Kafka/KafkaTopicSubscriber.h"
 #include <cxxtest/TestSuite.h>
@@ -36,5 +35,3 @@ public:
     TS_ASSERT_EQUALS(topic, subscriber->topics()[0]);
   }
 };
-
-#endif /* MANTID_LIVEDATA_KAFKATOPICSUBSCRIBERTEST_H_ */
diff --git a/Framework/LiveData/test/LiveDataAlgorithmTest.h b/Framework/LiveData/test/LiveDataAlgorithmTest.h
index 629fd22dd07..b4f761f06a6 100644
--- a/Framework/LiveData/test/LiveDataAlgorithmTest.h
+++ b/Framework/LiveData/test/LiveDataAlgorithmTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_LIVEDATAALGORITHMTEST_H_
-#define MANTID_LIVEDATA_LIVEDATAALGORITHMTEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -137,5 +136,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_LIVEDATA_LIVEDATAALGORITHMTEST_H_ */
diff --git a/Framework/LiveData/test/LoadLiveDataTest.h b/Framework/LiveData/test/LoadLiveDataTest.h
index 95aedb8bf47..7e20e02bbb5 100644
--- a/Framework/LiveData/test/LoadLiveDataTest.h
+++ b/Framework/LiveData/test/LoadLiveDataTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_LOADLIVEDATATEST_H_
-#define MANTID_LIVEDATA_LOADLIVEDATATEST_H_
+#pragma once
 
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/LiveListenerFactory.h"
@@ -516,5 +515,3 @@ public:
     AnalysisDataService::Instance().clear();
   }
 };
-
-#endif /* MANTID_LIVEDATA_LOADLIVEDATATEST_H_ */
diff --git a/Framework/LiveData/test/MonitorLiveDataTest.h b/Framework/LiveData/test/MonitorLiveDataTest.h
index fe9ae438547..c1be650ab50 100644
--- a/Framework/LiveData/test/MonitorLiveDataTest.h
+++ b/Framework/LiveData/test/MonitorLiveDataTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_MONITORLIVEDATATEST_H_
-#define MANTID_LIVEDATA_MONITORLIVEDATATEST_H_
+#pragma once
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"
@@ -247,5 +246,3 @@ public:
     }
   }
 };
-
-#endif /* MANTID_LIVEDATA_MONITORLIVEDATATEST_H_ */
diff --git a/Framework/LiveData/test/SNSLiveEventDataListenerTest.h b/Framework/LiveData/test/SNSLiveEventDataListenerTest.h
index b2c98086c51..19e08de1481 100644
--- a/Framework/LiveData/test/SNSLiveEventDataListenerTest.h
+++ b/Framework/LiveData/test/SNSLiveEventDataListenerTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_SNSLIVEEVENTDATALISTENERTEST_H_
-#define MANTID_LIVEDATA_SNSLIVEEVENTDATALISTENERTEST_H_
+#pragma once
 
 /* This code is largely based on Russell Taylor's test for the
  * FakeEventDataLister class. */
@@ -105,5 +104,3 @@ public:
 private:
   boost::shared_ptr<ILiveListener> sns_l;
 };
-
-#endif /* MANTID_LIVEDATA_SNSLIVEEVENTDATALISTENERTEST_H_ */
diff --git a/Framework/LiveData/test/StartLiveDataTest.h b/Framework/LiveData/test/StartLiveDataTest.h
index 61ec3723be8..2e4299377f8 100644
--- a/Framework/LiveData/test/StartLiveDataTest.h
+++ b/Framework/LiveData/test/StartLiveDataTest.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_STARTLIVEDATATEST_H_
-#define MANTID_LIVEDATA_STARTLIVEDATATEST_H_
+#pragma once
 
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/FrameworkManager.h"
@@ -161,5 +160,3 @@ public:
 private:
   StartLiveData alg;
 };
-
-#endif /* MANTID_LIVEDATA_STARTLIVEDATATEST_H_ */
diff --git a/Framework/LiveData/test/TestDataListener.h b/Framework/LiveData/test/TestDataListener.h
index 88931547be9..5949fa4ed81 100644
--- a/Framework/LiveData/test/TestDataListener.h
+++ b/Framework/LiveData/test/TestDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_TESTDATALISTENER_H_
-#define MANTID_LIVEDATA_TESTDATALISTENER_H_
+#pragma once
 
 #include "MantidAPI/LiveListener.h"
 #include "MantidAPI/Run.h"
@@ -60,5 +59,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_TESTDATALISTENER_H_ */
diff --git a/Framework/LiveData/test/TestGroupDataListener.h b/Framework/LiveData/test/TestGroupDataListener.h
index 3dbe24d0f4f..e8d84dcc378 100644
--- a/Framework/LiveData/test/TestGroupDataListener.h
+++ b/Framework/LiveData/test/TestGroupDataListener.h
@@ -4,8 +4,7 @@
 //     NScD Oak Ridge National Laboratory, European Spallation Source
 //     & Institut Laue - Langevin
 // SPDX - License - Identifier: GPL - 3.0 +
-#ifndef MANTID_LIVEDATA_TESTGROUPDATALISTENER_H_
-#define MANTID_LIVEDATA_TESTGROUPDATALISTENER_H_
+#pragma once
 
 //----------------------------------------------------------------------
 // Includes
@@ -49,5 +48,3 @@ private:
 
 } // namespace LiveData
 } // namespace Mantid
-
-#endif /* MANTID_LIVEDATA_TESTGROUPDATALISTENER_H_ */
-- 
GitLab