From a957d6acc5a31b01ef32a14328b4a56ce60467c8 Mon Sep 17 00:00:00 2001
From: Antony Peacock <ant.peacock@gmail.com>
Date: Sun, 6 Oct 2024 17:27:19 +0100
Subject: [PATCH] Various minor corrections

---
 libraries/core/src/morpheus/core/base/assert.hpp          | 1 -
 libraries/core/src/morpheus/core/conformance/scan.hpp     | 1 +
 libraries/core/testing/morpheus/catch2/adapters/gmock.hpp | 2 +-
 libraries/gfx/d3d12/src/morpheus/gfx/d3d12/adapter.hpp    | 2 +-
 libraries/gfx/metal/src/morpheus/gfx/metal/adapter.cpp    | 6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/core/src/morpheus/core/base/assert.hpp b/libraries/core/src/morpheus/core/base/assert.hpp
index c33b4497..29d2992c 100644
--- a/libraries/core/src/morpheus/core/base/assert.hpp
+++ b/libraries/core/src/morpheus/core/base/assert.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <morpheus/core/base/assert.hpp>
 #include <morpheus/core/base/platform.hpp>
 #include <morpheus/core/base/verify.hpp>
 #include <morpheus/core/conformance/source_location.hpp>
diff --git a/libraries/core/src/morpheus/core/conformance/scan.hpp b/libraries/core/src/morpheus/core/conformance/scan.hpp
index 6a5604c8..a1c46310 100644
--- a/libraries/core/src/morpheus/core/conformance/scan.hpp
+++ b/libraries/core/src/morpheus/core/conformance/scan.hpp
@@ -7,6 +7,7 @@
 #endif
 
 // clang-format off
+#include <utility>
 #include <scn/scan.h>
 namespace morpheus { namespace scan_ns = scn; }
 
diff --git a/libraries/core/testing/morpheus/catch2/adapters/gmock.hpp b/libraries/core/testing/morpheus/catch2/adapters/gmock.hpp
index cf1fe3e1..814d5d21 100644
--- a/libraries/core/testing/morpheus/catch2/adapters/gmock.hpp
+++ b/libraries/core/testing/morpheus/catch2/adapters/gmock.hpp
@@ -3,7 +3,7 @@
 namespace morpheus
 {
 
-/// Enable integration of GMock error reporting into the Catch2 test framework>
+/// Enable integration of GMock error reporting into the Catch2 test framework.
 /// \param[in] argv Pass through commandline parameters for initialising GMock.
 void enableGmockAdapter(char* argv[]);
 
diff --git a/libraries/gfx/d3d12/src/morpheus/gfx/d3d12/adapter.hpp b/libraries/gfx/d3d12/src/morpheus/gfx/d3d12/adapter.hpp
index b3259930..dab7fbb6 100644
--- a/libraries/gfx/d3d12/src/morpheus/gfx/d3d12/adapter.hpp
+++ b/libraries/gfx/d3d12/src/morpheus/gfx/d3d12/adapter.hpp
@@ -29,7 +29,7 @@ class Adapter {
     /// Default construction an empty adapter.
     constexpr Adapter() noexcept = default;
     /// Constructs an adapter with the specified parameters.
-    ///     \param[in] dxgiAdapter The DXGI adapter object.
+    /// \param[in] dxgiAdapter The DXGI adapter object.
     Adapter(DXGIAdapter dxgiAdapter);
 
     ///@}
diff --git a/libraries/gfx/metal/src/morpheus/gfx/metal/adapter.cpp b/libraries/gfx/metal/src/morpheus/gfx/metal/adapter.cpp
index 0eaa9546..fc59bfcf 100644
--- a/libraries/gfx/metal/src/morpheus/gfx/metal/adapter.cpp
+++ b/libraries/gfx/metal/src/morpheus/gfx/metal/adapter.cpp
@@ -18,9 +18,9 @@ Adapter::~Adapter() = default;
 //---------------------------------------------------------------------------------------------------------------------
 
 Adapter::Adapter(
-    std::uint32_t const width,
-    std::uint32_t const height,
-    std::uint32_t const colourDepth
+    std::uint32_t const /*width*/,
+    std::uint32_t const /*height*/,
+    std::uint32_t const /*colourDepth*/
 )
 {
 }