Sorting of includes and special case handling of preprocessor macros

Author: Twon

libraries/application/src/morpheus/application/po/adapters/enum.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "morpheus/core/meta/concepts/enum.hpp"
 #include "morpheus/core/conversion/adapters/enum.hpp"
+#include "morpheus/core/meta/concepts/enum.hpp"
 
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>

libraries/application/tests/po/adapters/scannable.tests.cpp

@@ -1,5 +1,5 @@
-#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/po/adapters/scannable.hpp"
+#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/version.hpp"
 #include "morpheus/core/conformance/scan.hpp"
 #include "morpheus/logging.hpp"
@@ -70,7 +70,7 @@ TEST_CASE_METHOD(LoggingFixture, "Test parsing of scannable as options", "[morph
             return location.coordinates;
         };
 
-        REQUIRE(getCoordinates("[1, 97]") == Coordinates {1.0, 97.0});
+        REQUIRE(getCoordinates("[1, 97]") == Coordinates{1.0, 97.0});
     }
     SECTION("Ensure invalid value parse correctly")
     {

libraries/application/tests/po/adapters/std/chrono.tests.cpp

@@ -1,5 +1,5 @@
-#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/po/adapters/std/chrono.hpp"
+#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/version.hpp"
 #include "morpheus/core/conformance/date.hpp"
 #include "morpheus/core/serialisation/adapters/std/chrono.hpp"
@@ -14,8 +14,8 @@
 #include <functional>
 #include <optional>
 #include <ostream>
-#include <string_view>
 #include <string>
+#include <string_view>
 
 namespace morpheus::application::po
 {

libraries/application/tests/po/adapters/std/optional.tests.cpp

@@ -1,5 +1,5 @@
-#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/po/adapters/std/optional.hpp" // IWYU pragma: keep
+#include "morpheus/application/po/options.hpp"
 #include "morpheus/application/version.hpp"
 #include "morpheus/logging.hpp"
 

libraries/core/mocking/morpheus/core/serialisation/mock/reader.hpp

@@ -4,12 +4,12 @@
 
 #include <gmock/gmock.h>
 
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 #include <optional>
 #include <span>
-#include <string_view>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace morpheus::serialisation::mock
@@ -70,14 +70,15 @@ class Reader
     /// Reads a std::string type from the serialisation.
     MOCK_METHOD(std::string, read, (std::string), ());
     /// Reads a string literal type from the serialisation.
-    MOCK_METHOD(std::string, read, (char const * const), ());
+    MOCK_METHOD(std::string, read, (char const* const), ());
     /// Reads a blob of bytes from the serialisation.
     MOCK_METHOD(std::vector<std::byte>, read, (std::vector<std::byte>), ());
     ///@}
 
     /// Template wrapper around read which dispatches to the correct concrete read method based on the type T.
-    template<typename T>
-    T read() requires requires(Reader r) { r.read(T{}); }
+    template <typename T>
+    T read()
+    requires requires(Reader r) { r.read(T{}); }
     {
         return read(T{});
     }

libraries/core/mocking/morpheus/core/serialisation/mock/serialisers.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "morpheus/core/serialisation/mock/writer.hpp"
 #include "morpheus/core/serialisation/mock/reader.hpp"
+#include "morpheus/core/serialisation/mock/writer.hpp"
 #include "morpheus/core/serialisation/read_serialiser.hpp"
 #include "morpheus/core/serialisation/write_serialiser.hpp"
 
@@ -11,4 +11,4 @@ namespace morpheus::serialisation
 using MockedWriteSerialiser = WriteSerialiser<mock::Writer>;
 using MockedReadSerialiser = ReadSerialiser<mock::Reader>;
 
-}
+} // namespace morpheus::serialisation

libraries/core/src/morpheus/core/base/compiler.hpp

@@ -5,7 +5,7 @@
         and version.
     @{
 */
-
+// clang-format off
 #if !defined(MORPHEUS_COMPILER)
 
     /*! \def MORPHEUS_CLANG_COMPILER
@@ -120,4 +120,5 @@
         (MORPHEUS_COMPILER == MORPHEUS_VISUALSTUDIO_COMPILER) || (MORPHEUS_INTEL_COMPILER_FOR_WINDOWS)
 
 #endif // !defined ( MORPHEUS_COMPILER )
+// clang-format on
 /// @}

libraries/core/src/morpheus/core/base/platform.hpp

@@ -10,6 +10,7 @@
     \def MORPHEUS_BUILD_PLATFORM
         Macro describing the current build platform of the build.
 */
+// clang-format off
 #if !defined(MORPHEUS_BUILD_PLATFORM)
 
     /*! \def MORPHEUS_TARGET_PLATFORM_PC_WINDOWS
@@ -46,12 +47,12 @@
 
     #endif
 #endif
+// clang-format on
 /// @}
 
 /*! \def MORPHEUS_COMPILER_DEAD_CODE_ELIMINATION
         Macro present when dead code elimination is enabled in the build.
 */
-#if (MORPHEUS_IS_GCC_COMPATIBLE_COMPILER && __OPTIMIZE__) ||                                                           \
-    (MORPHEUS_IS_VISUALSTUDIO_COMPATIBLE_COMPILER && !defined __MSVC_RUNTIME_CHECKS && defined NDEBUG)
+#if (MORPHEUS_IS_GCC_COMPATIBLE_COMPILER && __OPTIMIZE__) || (MORPHEUS_IS_VISUALSTUDIO_COMPATIBLE_COMPILER && !defined __MSVC_RUNTIME_CHECKS && defined NDEBUG)
     #define MORPHEUS_COMPILER_DEAD_CODE_ELIMINATION
 #endif

libraries/core/src/morpheus/core/cpu.hpp

@@ -34,7 +34,8 @@ using CpuidLeafs = std::vector<CpuidResults>;
 ///     This type stores information about the capabilities of the central processing unit of the current target
 ///     system.
 ///
-class MORPHEUSCORE_EXPORT Cpu {
+class MORPHEUSCORE_EXPORT Cpu
+{
 public:
     //! Default constructor.
     Cpu();
@@ -46,10 +47,10 @@ class MORPHEUSCORE_EXPORT Cpu {
     [[nodiscard]] auto const& getBrandId() const noexcept { return mBrandId; }
 
 private:
-    std::uint32_t mMaxLeaf;          //!< Maximum available leaf function for the cpuid instruction.
+    std::uint32_t mMaxLeaf;         //!< Maximum available leaf function for the cpuid instruction.
     std::uint32_t mMaxExtendedLeaf; //!< Maximum available extended leaf function for the cpuid instruction.
-    CpuidLeafs mLeafs;          //!< Cached results of executing the standard cpuid leaf functions.
-    CpuidLeafs mExtendedLeafs; //!< Cached results of executing the extended cpuid leaf functions.
+    CpuidLeafs mLeafs;              //!< Cached results of executing the standard cpuid leaf functions.
+    CpuidLeafs mExtendedLeafs;      //!< Cached results of executing the extended cpuid leaf functions.
     std::string mVendorId;
     std::string mBrandId;
 };