Skip to content

Commit

Permalink
Minor formatting reversions
Browse files Browse the repository at this point in the history
  • Loading branch information
nickbianco committed Dec 14, 2023
1 parent ab7f849 commit d6769f8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion OpenSim/Common/Object.h
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,8 @@ ObjectProperty<T>::readFromXMLElement
// property element.
template <class T> inline void
ObjectProperty<T>::writeToXMLElement
(SimTK::Xml::Element& propertyElement) const {
(SimTK::Xml::Element& propertyElement) const
{
for (int i=0; i < objects.size(); ++i)
(objects[i])->updateXMLNode(propertyElement);
}
Expand Down
10 changes: 5 additions & 5 deletions OpenSim/Common/Test/testComponentInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,10 @@ class CompoundFoo : public Foo {
//=============================================================================
OpenSim_DECLARE_PROPERTY(Foo1, Foo, "1st Foo of CompoundFoo");
OpenSim_DECLARE_PROPERTY(Foo2, Foo, "2nd Foo of CompoundFoo");
OpenSim_DECLARE_PROPERTY(Foo3, Foo, "3rd Foo of CompoundFoo")
OpenSim_DECLARE_PROPERTY(Foo3, Foo, "3rd Foo of CompoundFoo");
OpenSim_DECLARE_PROPERTY(scale1, double, "Scale factor for 1st Foo");
OpenSim_DECLARE_PROPERTY(scale2, double, "Scale factor for 2nd Foo");
OpenSim_DECLARE_PROPERTY(scale3, double, "Scale factor for 3rd Foo")
OpenSim_DECLARE_PROPERTY(scale3, double, "Scale factor for 3rd Foo");

CompoundFoo() : Foo() {
constructProperties();
Expand Down Expand Up @@ -1179,11 +1179,11 @@ TEST_CASE("Component Interface Component Path Names")
top.printOutputInfo();

std::string fFoo1AbsPath =
F->getComponent<Foo>("Foo1").getAbsolutePathString();
F->getComponent<Foo>("Foo1").getAbsolutePathString();
std::string aBar2AbsPath =
A->getComponent<Bar>("Bar2").getAbsolutePathString();
A->getComponent<Bar>("Bar2").getAbsolutePathString();
auto bar2FromBarFoo =
bar2->getRelativePathString(F->getComponent<Foo>("Foo1"));
bar2->getRelativePathString(F->getComponent<Foo>("Foo1"));

// Verify deep copy of subcomponents
const Foo& foo1inA = top.getComponent<Foo>("/A/Foo1");
Expand Down

0 comments on commit d6769f8

Please sign in to comment.