Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various minor corrections #329

Merged
merged 1 commit into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libraries/core/src/morpheus/core/base/assert.hpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 1 addition & 0 deletions libraries/core/src/morpheus/core/conformance/scan.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#endif

// clang-format off
#include <utility>
#include <scn/scan.h>
namespace morpheus { namespace scan_ns = scn; }

Expand Down
2 changes: 1 addition & 1 deletion libraries/core/testing/morpheus/catch2/adapters/gmock.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[]);

Expand Down
2 changes: 1 addition & 1 deletion libraries/gfx/d3d12/src/morpheus/gfx/d3d12/adapter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

///@}
Expand Down
6 changes: 3 additions & 3 deletions libraries/gfx/metal/src/morpheus/gfx/metal/adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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*/
)
{
}
Expand Down
Loading