Skip to content

Commit 22003da

Browse files
authored
Format code with clang-format-14 (#1966)
1 parent 324ad37 commit 22003da

26 files changed

+263
-259
lines changed

dart/collision/CollisionDetector.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ class CollisionDetector : public std::enable_shared_from_this<CollisionDetector>
8585
/// \brief Create a clone of this CollisionDetector. All the properties will
8686
/// be copied over, but not collision objects.
8787
virtual std::shared_ptr<CollisionDetector> cloneWithoutCollisionObjects()
88-
const
89-
= 0;
88+
const = 0;
9089

9190
/// Return collision detection engine type as a std::string
9291
virtual const std::string& getType() const = 0;

dart/collision/CollisionFilter.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ class CollisionFilter
6565
/// Returns true if the given two CollisionObjects should be checked by the
6666
/// collision detector, false otherwise.
6767
virtual bool ignoresCollision(
68-
const CollisionObject* object1, const CollisionObject* object2) const
69-
= 0;
68+
const CollisionObject* object1, const CollisionObject* object2) const = 0;
7069
};
7170

7271
class CompositeCollisionFilter : public CollisionFilter

dart/collision/DistanceFilter.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ class CollisionObject;
4646
struct DistanceFilter
4747
{
4848
virtual bool needDistance(
49-
const CollisionObject* object1, const CollisionObject* object2) const
50-
= 0;
49+
const CollisionObject* object1, const CollisionObject* object2) const = 0;
5150
};
5251

5352
struct BodyNodeDistanceFilter : DistanceFilter

dart/common/Aspect.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ class CompositeTrackingAspect : public Aspect
163163
ClassName(const ClassName&) = delete; \
164164
inline ClassName(const PropertiesData& properties = PropertiesData()) \
165165
: AspectWithVersionedProperties< \
166-
Base, \
167-
Derived, \
168-
PropertiesData, \
169-
CompositeType, \
170-
UpdatePropertiesMacro>(properties) \
166+
Base, \
167+
Derived, \
168+
PropertiesData, \
169+
CompositeType, \
170+
UpdatePropertiesMacro>(properties) \
171171
{ \
172172
}
173173

dart/common/detail/Aspect.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace common {
4646
template <class CompositeType>
4747
CompositeTrackingAspect<CompositeType>::CompositeTrackingAspect()
4848
: mComposite(
49-
nullptr) // This will be set later when the Composite calls setComposite
49+
nullptr) // This will be set later when the Composite calls setComposite
5050
{
5151
// Do nothing
5252
}

dart/common/detail/CompositeData.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ using CompositeProperties
180180
//==============================================================================
181181
template <
182182
class CompositeType,
183-
template <class> class GetData,
183+
template <class>
184+
class GetData,
184185
typename... Aspects>
185186
class ComposeData
186187
{
@@ -209,7 +210,8 @@ class ComposeData
209210
//==============================================================================
210211
template <
211212
class CompositeType,
212-
template <class> class GetData,
213+
template <class>
214+
class GetData,
213215
class AspectT,
214216
typename... Remainder>
215217
struct ComposeData<CompositeType, GetData, AspectT, Remainder...>
@@ -257,9 +259,9 @@ struct ComposeData<CompositeType, GetData, AspectT, Remainder...>
257259
template <typename Arg1, typename... Args>
258260
ComposeData(const Arg1& arg1, const Args&... args)
259261
: ComposeData(
260-
Delegate,
261-
static_cast<const typename ConvertIfData<Arg1>::Type&>(arg1),
262-
args...)
262+
Delegate,
263+
static_cast<const typename ConvertIfData<Arg1>::Type&>(arg1),
264+
args...)
263265
{
264266
// This constructor delegates
265267
}

dart/common/detail/CompositeJoiner.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ template <class Base1, class Base2, class... OtherBases>
117117
template <typename... Args>
118118
CompositeJoiner<Base1, Base2, OtherBases...>::CompositeJoiner(Args&&... args)
119119
: CompositeJoiner<Base1, CompositeJoiner<Base2, OtherBases...>>(
120-
std::forward<Args>(args)...)
120+
std::forward<Args>(args)...)
121121
{
122122
// Do nothing
123123
}

dart/common/detail/EmbeddedAspect.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ class EmbeddedStateAspect : public BaseT
132132
template <typename T, typename... RemainingArgs>
133133
EmbeddedStateAspect(const T& arg1, RemainingArgs&&... remainingArgs)
134134
: EmbeddedStateAspect(
135-
Delegate,
136-
static_cast<const typename ConvertIfState<T>::type&>(arg1),
137-
std::forward<RemainingArgs>(remainingArgs)...)
135+
Delegate,
136+
static_cast<const typename ConvertIfState<T>::type&>(arg1),
137+
std::forward<RemainingArgs>(remainingArgs)...)
138138
{
139139
// Do nothing
140140
}
@@ -302,9 +302,9 @@ class EmbeddedPropertiesAspect : public BaseT
302302
template <typename T, typename... RemainingArgs>
303303
EmbeddedPropertiesAspect(const T& arg1, RemainingArgs&&... remainingArgs)
304304
: EmbeddedPropertiesAspect(
305-
Delegate,
306-
static_cast<const typename ConvertIfProperties<T>::type&>(arg1),
307-
std::forward<RemainingArgs>(remainingArgs)...)
305+
Delegate,
306+
static_cast<const typename ConvertIfProperties<T>::type&>(arg1),
307+
std::forward<RemainingArgs>(remainingArgs)...)
308308
{
309309
// Do nothing
310310
}

dart/constraint/BoxedLcpConstraintSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ BoxedLcpConstraintSolver::BoxedLcpConstraintSolver(
5555
BoxedLcpSolverPtr boxedLcpSolver,
5656
BoxedLcpSolverPtr secondaryBoxedLcpSolver)
5757
: BoxedLcpConstraintSolver(
58-
std::move(boxedLcpSolver), std::move(secondaryBoxedLcpSolver))
58+
std::move(boxedLcpSolver), std::move(secondaryBoxedLcpSolver))
5959
{
6060
setTimeStep(timeStep);
6161
}
@@ -71,7 +71,7 @@ BoxedLcpConstraintSolver::BoxedLcpConstraintSolver()
7171
BoxedLcpConstraintSolver::BoxedLcpConstraintSolver(
7272
BoxedLcpSolverPtr boxedLcpSolver)
7373
: BoxedLcpConstraintSolver(
74-
std::move(boxedLcpSolver), std::make_shared<PgsBoxedLcpSolver>())
74+
std::move(boxedLcpSolver), std::make_shared<PgsBoxedLcpSolver>())
7575
{
7676
// Do nothing
7777
}

dart/constraint/ContactConstraint.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ double ContactConstraint::mConstraintForceMixing = DART_CFM;
6060
ContactConstraint::ContactConstraint(
6161
collision::Contact& contact, double timeStep)
6262
: ContactConstraint(
63-
contact,
64-
timeStep,
65-
DefaultContactSurfaceHandler().createParams(contact, 1u))
63+
contact,
64+
timeStep,
65+
DefaultContactSurfaceHandler().createParams(contact, 1u))
6666
{
6767
// Do nothing
6868
}

0 commit comments

Comments
 (0)