fix build

Signed-off-by: Ian Chen <[email protected]>
gazebosim · Sep 3, 2020 · 694720c · 694720c
1 parent d2a9481
commit 694720c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tpe/lib/src/Model.cc b/tpe/lib/src/Model.cc
@@ -38,14 +38,14 @@ using namespace physics;
 using namespace tpelib;
 
 //////////////////////////////////////////////////
-Model::Model() : Entity()
-  : dataPtr(new ModelPrivate)
+Model::Model()
+    : Entity(), dataPtr(new ModelPrivate)
 {
 }
 
 //////////////////////////////////////////////////
-Model::Model(std::size_t _id) : Entity(_id)
-  : dataPtr(new ModelPrivate)
+Model::Model(std::size_t _id)
+    : Entity(_id), dataPtr(new ModelPrivate)
 {
 }
 
@@ -62,7 +62,7 @@ Entity &Model::AddLink()
   std::size_t linkId = Entity::GetNextId();
 
   // first link added is the canonical link
-  if (this->children.empty())
+  if (this->GetChildren().empty())
     this->dataPtr->canonicalLinkId = linkId;
 
   const auto[it, success]  = this->GetChildren().insert(
@@ -90,8 +90,8 @@ Entity &Model::GetCanonicalLink()
 {
   // return canonical link but make sure it exists
   // todo(anyone) Prevent removal of canonical link in a model?
-  Entity linkEnt = this->GetChildById(this->dataPtr->canonicalLinkId);
-  if (linkEnt != kNullEntity)
+  Entity &linkEnt = this->GetChildById(this->dataPtr->canonicalLinkId);
+  if (linkEnt.GetId() != kNullEntityId)
     return linkEnt;
 
   std::set<Model *> models;

diff --git a/tpe/lib/src/Model.hh b/tpe/lib/src/Model.hh
@@ -42,7 +42,7 @@ class IGNITION_PHYSICS_TPELIB_VISIBLE Model : public Entity
   public: explicit Model(std::size_t _id);
 
   /// \brief Destructor
-  public: ~Model() = default;
+  public: ~Model();
 
   /// \brief Add a link
   /// \return Newly created Link