diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-09-03 13:59:05 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-09-03 13:59:05 +0100 |
commit | 4e983552cdae6e4eb063876f263ce984df85b98a (patch) | |
tree | d02daf6df9f315ab7ce7b448f2a35be8b5124958 | |
parent | Remove unnecessary wrapper from xml tests (diff) | |
download | slicer-4e983552cdae6e4eb063876f263ce984df85b98a.tar.bz2 slicer-4e983552cdae6e4eb063876f263ce984df85b98a.tar.xz slicer-4e983552cdae6e4eb063876f263ce984df85b98a.zip |
Replace ifndef/define/endif with pragma once
-rw-r--r-- | slicer/db/sqlBinder.h | 5 | ||||
-rw-r--r-- | slicer/db/sqlCommon.h | 5 | ||||
-rw-r--r-- | slicer/db/sqlInsertSerializer.h | 5 | ||||
-rw-r--r-- | slicer/db/sqlSelectDeserializer.h | 5 | ||||
-rw-r--r-- | slicer/db/sqlSource.h | 5 | ||||
-rw-r--r-- | slicer/db/sqlTablePatchSerializer.h | 5 | ||||
-rw-r--r-- | slicer/db/sqlUpdateSerializer.h | 5 | ||||
-rw-r--r-- | slicer/db/testMockCommon.h | 5 | ||||
-rw-r--r-- | slicer/ice/serializer.h | 5 | ||||
-rw-r--r-- | slicer/json/serializer.h | 5 | ||||
-rw-r--r-- | slicer/slicer/enumMap.h | 5 | ||||
-rw-r--r-- | slicer/slicer/hookMap.h | 5 | ||||
-rw-r--r-- | slicer/slicer/metadata.h | 5 | ||||
-rw-r--r-- | slicer/slicer/modelParts.h | 5 | ||||
-rw-r--r-- | slicer/slicer/modelPartsTraits.h | 5 | ||||
-rw-r--r-- | slicer/slicer/modelPartsTypes.h | 5 | ||||
-rw-r--r-- | slicer/slicer/modelPartsTypes.impl.h | 5 | ||||
-rw-r--r-- | slicer/slicer/serializer.h | 5 | ||||
-rw-r--r-- | slicer/slicer/slicer.h | 5 | ||||
-rw-r--r-- | slicer/test/conversions.h | 5 | ||||
-rw-r--r-- | slicer/test/functionsImpl.h | 5 | ||||
-rw-r--r-- | slicer/test/helpers.h | 5 | ||||
-rw-r--r-- | slicer/test/streams.h | 5 | ||||
-rw-r--r-- | slicer/tool/icemetadata.h | 5 | ||||
-rw-r--r-- | slicer/tool/parser.h | 5 | ||||
-rw-r--r-- | slicer/xml/serializer.h | 5 |
26 files changed, 26 insertions, 104 deletions
diff --git a/slicer/db/sqlBinder.h b/slicer/db/sqlBinder.h index a4a9a93..4453d4d 100644 --- a/slicer/db/sqlBinder.h +++ b/slicer/db/sqlBinder.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLBINDER_H -#define SLICER_DB_SQLBINDER_H +#pragma once #include <Ice/Config.h> #include <boost/date_time/posix_time/posix_time.hpp> @@ -35,5 +34,3 @@ namespace Slicer { const unsigned int idx; }; } - -#endif diff --git a/slicer/db/sqlCommon.h b/slicer/db/sqlCommon.h index 16cefac..4af85c5 100644 --- a/slicer/db/sqlCommon.h +++ b/slicer/db/sqlCommon.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLCOMMON_H -#define SLICER_DB_SQLCOMMON_H +#pragma once namespace Slicer { class HookCommon; @@ -10,5 +9,3 @@ namespace Slicer { [[nodiscard]] bool isBind(const HookCommon *) noexcept; [[nodiscard]] bool isValue(const HookCommon *) noexcept; } - -#endif diff --git a/slicer/db/sqlInsertSerializer.h b/slicer/db/sqlInsertSerializer.h index 36ecac3..b259f7a 100644 --- a/slicer/db/sqlInsertSerializer.h +++ b/slicer/db/sqlInsertSerializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLINSERTSERIALIZER_H -#define SLICER_DB_SQLINSERTSERIALIZER_H +#pragma once #include <command_fwd.h> #include <ostream> @@ -53,5 +52,3 @@ namespace Slicer { void bindObjectAndExecute(ModelPartParam, DB::ModifyCommand *) const override; }; } - -#endif diff --git a/slicer/db/sqlSelectDeserializer.h b/slicer/db/sqlSelectDeserializer.h index b911fb1..68befd2 100644 --- a/slicer/db/sqlSelectDeserializer.h +++ b/slicer/db/sqlSelectDeserializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLSELECTDESERIALIZER_H -#define SLICER_DB_SQLSELECTDESERIALIZER_H +#pragma once #include <optional> #include <slicer/modelParts.h> @@ -36,5 +35,3 @@ namespace Slicer { std::vector<const DB::Column *> orderedColumns; }; } - -#endif diff --git a/slicer/db/sqlSource.h b/slicer/db/sqlSource.h index 78d9909..84e88d4 100644 --- a/slicer/db/sqlSource.h +++ b/slicer/db/sqlSource.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLSOURCE_H -#define SLICER_DB_SQLSOURCE_H +#pragma once #include "slicer/modelParts.h" #include <Ice/Config.h> @@ -39,5 +38,3 @@ namespace Slicer { const DB::Column & column; }; } - -#endif diff --git a/slicer/db/sqlTablePatchSerializer.h b/slicer/db/sqlTablePatchSerializer.h index 1da29a6..b1b6a38 100644 --- a/slicer/db/sqlTablePatchSerializer.h +++ b/slicer/db/sqlTablePatchSerializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLTABLEPATCHSERIALIZER_H -#define SLICER_DB_SQLTABLEPATCHSERIALIZER_H +#pragma once #include <slicer/modelParts.h> #include <slicer/serializer.h> @@ -25,5 +24,3 @@ namespace Slicer { DB::TablePatch & tablePatch; }; } - -#endif diff --git a/slicer/db/sqlUpdateSerializer.h b/slicer/db/sqlUpdateSerializer.h index c634ff5..c8e84c5 100644 --- a/slicer/db/sqlUpdateSerializer.h +++ b/slicer/db/sqlUpdateSerializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_SQLUPDATESERIALIZER_H -#define SLICER_DB_SQLUPDATESERIALIZER_H +#pragma once #include <command_fwd.h> #include <slicer/modelParts.h> @@ -29,5 +28,3 @@ namespace Slicer { const std::string tableName; }; } - -#endif diff --git a/slicer/db/testMockCommon.h b/slicer/db/testMockCommon.h index 891fb74..fd9d4cc 100644 --- a/slicer/db/testMockCommon.h +++ b/slicer/db/testMockCommon.h @@ -1,5 +1,4 @@ -#ifndef SLICER_DB_MOCKDB_H -#define SLICER_DB_MOCKDB_H +#pragma once #include <connection_fwd.h> #include <mockDatabase.h> @@ -23,5 +22,3 @@ public: DB::ConnectionPtr _db; DB::Connection * const db; }; - -#endif diff --git a/slicer/ice/serializer.h b/slicer/ice/serializer.h index 8e8ff03..7c844e6 100644 --- a/slicer/ice/serializer.h +++ b/slicer/ice/serializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_ICE_H -#define SLICER_ICE_H +#pragma once #include <Ice/BuiltinSequences.h> #include <Ice/CommunicatorF.h> @@ -61,5 +60,3 @@ namespace Slicer { Ice::ByteSeq blob; }; } - -#endif diff --git a/slicer/json/serializer.h b/slicer/json/serializer.h index 682ec27..2e54a2d 100644 --- a/slicer/json/serializer.h +++ b/slicer/json/serializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_JSON_H -#define SLICER_JSON_H +#pragma once #include <filesystem> #include <fstream> @@ -71,5 +70,3 @@ namespace Slicer { const json::Value & value; }; } - -#endif diff --git a/slicer/slicer/enumMap.h b/slicer/slicer/enumMap.h index e076a0c..945485b 100644 --- a/slicer/slicer/enumMap.h +++ b/slicer/slicer/enumMap.h @@ -1,5 +1,4 @@ -#ifndef SLICER_ENUM_MAP_H -#define SLICER_ENUM_MAP_H +#pragma once #include <array> #include <cstddef> @@ -56,5 +55,3 @@ namespace Slicer { const Arr<N> arr; }; } - -#endif diff --git a/slicer/slicer/hookMap.h b/slicer/slicer/hookMap.h index 3328ddd..8a69273 100644 --- a/slicer/slicer/hookMap.h +++ b/slicer/slicer/hookMap.h @@ -1,5 +1,4 @@ -#ifndef SLICER_HOOK_MAP_H -#define SLICER_HOOK_MAP_H +#pragma once #include "modelParts.h" #include <array> @@ -153,5 +152,3 @@ namespace Slicer { const Arr<N> arr; }; } - -#endif diff --git a/slicer/slicer/metadata.h b/slicer/slicer/metadata.h index 8f24edb..fac4b9a 100644 --- a/slicer/slicer/metadata.h +++ b/slicer/slicer/metadata.h @@ -1,5 +1,4 @@ -#ifndef SLICER_METADATA_H -#define SLICER_METADATA_H +#pragma once #include <algorithm> #include <array> @@ -126,5 +125,3 @@ namespace Slicer { Arr arr; }; } - -#endif diff --git a/slicer/slicer/modelParts.h b/slicer/slicer/modelParts.h index f86bc92..7e5a732 100644 --- a/slicer/slicer/modelParts.h +++ b/slicer/slicer/modelParts.h @@ -1,5 +1,4 @@ -#ifndef SLICER_MODELPARTS_H -#define SLICER_MODELPARTS_H +#pragma once #include "any_ptr.h" #include "metadata.h" @@ -187,5 +186,3 @@ namespace Slicer { ModelPartParam mp; }; } - -#endif diff --git a/slicer/slicer/modelPartsTraits.h b/slicer/slicer/modelPartsTraits.h index 6b88a57..7e2daa2 100644 --- a/slicer/slicer/modelPartsTraits.h +++ b/slicer/slicer/modelPartsTraits.h @@ -1,5 +1,4 @@ -#ifndef SLICER_MODELPARTSTRAITS_H -#define SLICER_MODELPARTSTRAITS_H +#pragma once #include <Ice/Optional.h> #include <cstddef> @@ -103,5 +102,3 @@ namespace Slicer { } }; } - -#endif diff --git a/slicer/slicer/modelPartsTypes.h b/slicer/slicer/modelPartsTypes.h index 8a49479..b1e28c5 100644 --- a/slicer/slicer/modelPartsTypes.h +++ b/slicer/slicer/modelPartsTypes.h @@ -1,5 +1,4 @@ -#ifndef SLICER_MODELPARTSTYPES_H -#define SLICER_MODELPARTSTYPES_H +#pragma once #include "modelParts.h" #include <Ice/Optional.h> @@ -361,5 +360,3 @@ namespace Slicer { const std::string & GetRootName() const override; }; } - -#endif diff --git a/slicer/slicer/modelPartsTypes.impl.h b/slicer/slicer/modelPartsTypes.impl.h index c5651b6..03ac8c8 100644 --- a/slicer/slicer/modelPartsTypes.impl.h +++ b/slicer/slicer/modelPartsTypes.impl.h @@ -1,5 +1,4 @@ -#ifndef SLICER_MODELPARTSTYPES_IMPL_H -#define SLICER_MODELPARTSTYPES_IMPL_H +#pragma once #include "common.h" #include "enumMap.h" // IWYU pragma: keep @@ -746,5 +745,3 @@ namespace Slicer { #ifdef __clang__ # pragma clang diagnostic pop #endif - -#endif diff --git a/slicer/slicer/serializer.h b/slicer/slicer/serializer.h index 653e61a..4b73fcd 100644 --- a/slicer/slicer/serializer.h +++ b/slicer/slicer/serializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_SERIALIZER_H -#define SLICER_SERIALIZER_H +#pragma once #include <c++11Helpers.h> #include <factory.h> // IWYU pragma: keep @@ -41,5 +40,3 @@ namespace Slicer { using FileSerializerFactory = AdHoc::Factory<Serializer, const std::filesystem::path &>; using FileDeserializerFactory = AdHoc::Factory<Deserializer, const std::filesystem::path &>; } - -#endif diff --git a/slicer/slicer/slicer.h b/slicer/slicer/slicer.h index cb15af2..f669024 100644 --- a/slicer/slicer/slicer.h +++ b/slicer/slicer/slicer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_H -#define SLICER_H +#pragma once #include <memory> #include <slicer/modelParts.h> @@ -40,5 +39,3 @@ namespace Slicer { SerializeAnyWith(object, Serializer(std::forward<SerializerParams>(sp)...)); } } - -#endif diff --git a/slicer/test/conversions.h b/slicer/test/conversions.h index bfa1c4b..f503f97 100644 --- a/slicer/test/conversions.h +++ b/slicer/test/conversions.h @@ -1,5 +1,4 @@ -#ifndef SLICER_TEST_CONVERSIONS_H -#define SLICER_TEST_CONVERSIONS_H +#pragma once #include "classtype.h" #include "structs.h" @@ -43,5 +42,3 @@ namespace Slicer { DLL_PUBLIC boost::posix_time::ptime stringToPtime(const std::string &); } - -#endif diff --git a/slicer/test/functionsImpl.h b/slicer/test/functionsImpl.h index e46f28e..5c4d67e 100644 --- a/slicer/test/functionsImpl.h +++ b/slicer/test/functionsImpl.h @@ -1,5 +1,4 @@ -#ifndef SLICER_TEST_FUNCITONSIMPL_H -#define SLICER_TEST_FUNCITONSIMPL_H +#pragma once #include <functions.h> @@ -9,5 +8,3 @@ namespace Functions { void func() override; }; } - -#endif diff --git a/slicer/test/helpers.h b/slicer/test/helpers.h index 576a481..37e9cd1 100644 --- a/slicer/test/helpers.h +++ b/slicer/test/helpers.h @@ -1,5 +1,4 @@ -#ifndef SLICER_TEST_HELPERS_H -#define SLICER_TEST_HELPERS_H +#pragma once #include <filesystem> #include <visibility.h> @@ -7,5 +6,3 @@ // These are just thin wrappers that throw exceptions DLL_PUBLIC void diff(const std::filesystem::path & left, const std::filesystem::path & right); - -#endif diff --git a/slicer/test/streams.h b/slicer/test/streams.h index 8d3a79f..ec44d29 100644 --- a/slicer/test/streams.h +++ b/slicer/test/streams.h @@ -1,5 +1,4 @@ -#ifndef SLICER_TEST_STREAMS_H -#define SLICER_TEST_STREAMS_H +#pragma once #include <slicer/modelPartsTypes.h> #include <string> @@ -8,5 +7,3 @@ class TestStream : public Slicer::Stream<std::string> { public: void Produce(const Consumer & c) override; }; - -#endif diff --git a/slicer/tool/icemetadata.h b/slicer/tool/icemetadata.h index f9f10fd..87d34f2 100644 --- a/slicer/tool/icemetadata.h +++ b/slicer/tool/icemetadata.h @@ -1,5 +1,4 @@ -#ifndef SLICER_TOOL_METADATA_H -#define SLICER_TOOL_METADATA_H +#pragma once #include <Slice/Parser.h> #include <c++11Helpers.h> @@ -42,5 +41,3 @@ namespace Slicer { ContainerBase<> arr; }; } - -#endif diff --git a/slicer/tool/parser.h b/slicer/tool/parser.h index e56c90a..17a3b02 100644 --- a/slicer/tool/parser.h +++ b/slicer/tool/parser.h @@ -1,5 +1,4 @@ -#ifndef SLICER_PARSER_H -#define SLICER_PARSER_H +#pragma once #include "icemetadata.h" #include <Slice/Parser.h> @@ -97,5 +96,3 @@ namespace Slicer { unsigned int classNo; }; } - -#endif diff --git a/slicer/xml/serializer.h b/slicer/xml/serializer.h index 9c6e1ae..6ee0bff 100644 --- a/slicer/xml/serializer.h +++ b/slicer/xml/serializer.h @@ -1,5 +1,4 @@ -#ifndef SLICER_XML_H -#define SLICER_XML_H +#pragma once #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" @@ -77,5 +76,3 @@ namespace Slicer { const xmlpp::Document * doc; }; } - -#endif |