Skip to content

Commit

Permalink
Workaround for compile error in clang 13 on macOS (#1485)
Browse files Browse the repository at this point in the history
Fixes #1482
  • Loading branch information
jrouwe authored Jan 29, 2025
1 parent 15561f8 commit 294c228
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Jolt/Core/Color.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Color;
using ColorArg = Color;

/// Class that holds an RGBA color with 8-bits per component
class [[nodiscard]] JPH_EXPORT_GCC_BUG_WORKAROUND Color
class JPH_EXPORT_GCC_BUG_WORKAROUND [[nodiscard]] Color
{
public:
/// Constructors
Expand Down
2 changes: 1 addition & 1 deletion Jolt/Geometry/OrientedBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ JPH_NAMESPACE_BEGIN
class AABox;

/// Oriented box
class [[nodiscard]] JPH_EXPORT_GCC_BUG_WORKAROUND OrientedBox
class JPH_EXPORT_GCC_BUG_WORKAROUND [[nodiscard]] OrientedBox
{
public:
JPH_OVERRIDE_NEW_DELETE
Expand Down
2 changes: 1 addition & 1 deletion Jolt/Physics/Body/Body.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SoftBodyCreationSettings;
/// The functions that get/set the position of the body all indicate if they are relative to the center of mass or to the original position in which the shape was created.
///
/// The linear velocity is also velocity of the center of mass, to correct for this: \f$VelocityCOM = Velocity - AngularVelocity \times ShapeCOM\f$.
class alignas(JPH_RVECTOR_ALIGNMENT) JPH_EXPORT_GCC_BUG_WORKAROUND Body : public NonCopyable
class JPH_EXPORT_GCC_BUG_WORKAROUND alignas(JPH_RVECTOR_ALIGNMENT) Body : public NonCopyable
{
public:
JPH_OVERRIDE_NEW_DELETE
Expand Down

0 comments on commit 294c228

Please sign in to comment.